mirror of
https://github.com/RetroDECK/ES-DE.git
synced 2024-11-25 15:45:38 +00:00
(Windows) Suppressed some compiler warnings when building the external dependencies using MSVC
This commit is contained in:
parent
07637a0885
commit
b218c4806b
24
external/CMakeLists.txt
vendored
24
external/CMakeLists.txt
vendored
|
@ -24,14 +24,9 @@ endif()
|
|||
unset(CMAKE_CXX_FLAGS)
|
||||
unset(CMAKE_EXE_LINKER_FLAGS)
|
||||
|
||||
if(WIN32)
|
||||
if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
|
||||
# Disable DLL interface warnings.
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251")
|
||||
else()
|
||||
# Strip the DLL files when building with MinGW.
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s")
|
||||
endif()
|
||||
# Strip the DLL files when building with MinGW.
|
||||
if(WIN32 AND NOT CMAKE_CXX_COMPILER_ID MATCHES MSVC)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s")
|
||||
endif()
|
||||
|
||||
if (WIN32)
|
||||
|
@ -42,6 +37,11 @@ endif()
|
|||
|
||||
add_subdirectory(lunasvg EXCLUDE_FROM_ALL)
|
||||
|
||||
# Disable LunaSVG DLL interface warnings and narrowing conversion warnings.
|
||||
if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
|
||||
target_compile_options(lunasvg PRIVATE "/wd4251" "/wd4267")
|
||||
endif()
|
||||
|
||||
# Disable threading support for rlottie as this functionality actually leads to far worse
|
||||
# performance. As well there is a bug on Windows that makes rlottie hang forever on application
|
||||
# shutdown if compiled using MinGW with threading support enabled.
|
||||
|
@ -53,14 +53,14 @@ if(EMSCRIPTEN)
|
|||
set(CMAKE_CXX_FLAGS -pthread)
|
||||
endif()
|
||||
|
||||
add_subdirectory(rlottie EXCLUDE_FROM_ALL)
|
||||
|
||||
# rlottie generates a lot of annoying compiler warnings that we don't need to show.
|
||||
if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4267 /wd4530 /wd4996")
|
||||
target_compile_options(rlottie PRIVATE "/wd4244" "/wd4251" "/wd4263" "/wd4334" "/wd4267" "/wd4530" "/wd4996")
|
||||
else()
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
|
||||
target_compile_options(rlottie PRIVATE "-w")
|
||||
endif()
|
||||
|
||||
add_subdirectory(rlottie EXCLUDE_FROM_ALL)
|
||||
|
||||
# Build LunaSVG before rlottie.
|
||||
add_dependencies(rlottie lunasvg)
|
||||
|
|
Loading…
Reference in a new issue