From 4733b7e1c91b10554a52007903d74dc76c39a230 Mon Sep 17 00:00:00 2001 From: InoriRus Date: Mon, 3 Oct 2022 19:57:05 +1000 Subject: [PATCH] fix compile warning --- source/3rdparty/sdl2/CMakeLists.txt | 5 ++++- source/CMakeLists.txt | 14 +++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/source/3rdparty/sdl2/CMakeLists.txt b/source/3rdparty/sdl2/CMakeLists.txt index 98474ca..c60fb57 100644 --- a/source/3rdparty/sdl2/CMakeLists.txt +++ b/source/3rdparty/sdl2/CMakeLists.txt @@ -5,7 +5,10 @@ set(SDL_TEST OFF CACHE BOOL "" FORCE) add_subdirectory(sdl2 build_sdl2) if (CLANG AND NOT ANDROID) - target_compile_options(SDL2-static PRIVATE -Wno-pragma-pack -Wno-unused-command-line-argument -Wno-unused-function -Wno-incompatible-function-pointer-types -Wno-unused-but-set-variable -Wno-unused-const-variable) + target_compile_options(SDL2-static PRIVATE -Wno-pragma-pack -Wno-unused-command-line-argument -Wno-unused-function -Wno-incompatible-function-pointer-types -Wno-unused-const-variable) + if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0.0) + target_compile_options(SDL2-static PRIVATE -Wno-unused-but-set-variable) + endif() endif() if (MSVC AND NOT CLANG) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index a2c94de..2432499 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -181,13 +181,6 @@ target_link_libraries(fc_script sys) target_link_libraries(fc_script math) target_link_libraries(fc_script scripts) target_link_libraries(fc_script lua) -if (MSVC OR MINGW) -target_link_libraries(fc_script opengl32) -target_link_libraries(fc_script iphlpapi) -target_link_libraries(fc_script setupapi) -target_link_libraries(fc_script ws2_32) -target_link_libraries(fc_script psapi) -endif() target_link_libraries(fc_script SDL2-static) target_link_libraries(fc_script emulator) target_link_libraries(fc_script rijndael) @@ -196,6 +189,13 @@ target_link_libraries(fc_script sqlite) target_link_libraries(fc_script zstd) target_link_libraries(fc_script easy_profiler) target_link_libraries(fc_script cpuinfo) +if (MSVC OR MINGW) +target_link_libraries(fc_script opengl32) +target_link_libraries(fc_script iphlpapi) +target_link_libraries(fc_script setupapi) +target_link_libraries(fc_script ws2_32) +target_link_libraries(fc_script psapi) +endif() if (CLANG AND NOT MSVC) target_link_libraries(fc_script pthread) endif()