Просмотр исходного кода

Merge pull request #9379 from liamwhite/cmake-mess

yuzu-cmd: link SDL2 correctly
Narr the Reg 3 лет назад
Родитель
Сommit
919b4acfea
2 измененных файлов с 1 добавлено и 2 удалено
  1. 0 1
      externals/CMakeLists.txt
  2. 1 1
      src/yuzu_cmd/CMakeLists.txt

+ 0 - 1
externals/CMakeLists.txt

@@ -69,7 +69,6 @@ if (YUZU_USE_EXTERNAL_SDL2)
     endif()
 
     add_subdirectory(SDL EXCLUDE_FROM_ALL)
-    target_link_directories(SDL2-static INTERFACE "${SDL2_BINARY_DIR}")
 endif()
 
 # ENet

+ 1 - 1
src/yuzu_cmd/CMakeLists.txt

@@ -38,7 +38,7 @@ target_link_libraries(yuzu-cmd PRIVATE inih glad)
 if (MSVC)
     target_link_libraries(yuzu-cmd PRIVATE getopt)
 endif()
-target_link_libraries(yuzu-cmd PRIVATE ${PLATFORM_LIBRARIES} SDL2 Threads::Threads)
+target_link_libraries(yuzu-cmd PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
 
 create_resource("../../dist/yuzu.bmp" "yuzu_cmd/yuzu_icon.h" "yuzu_icon")
 target_include_directories(yuzu-cmd PRIVATE ${RESOURCES_DIR})