mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixup MSVC CMake targets (#10100)

This commit is contained in:
Michał Janiszewski 2019-10-15 23:14:00 +02:00 committed by GitHub
parent 6c4f63ba58
commit bf18bb8161
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -181,8 +181,10 @@ if (MSVC)
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
add_definitions(-D_SCL_SECURE_NO_WARNINGS)
add_definitions(-D__SSE4_1__)
add_definitions(-D__AVX2__)
if ((CMAKE_VS_PLATFORM_NAME STREQUAL "Win32") OR (CMAKE_VS_PLATFORM_NAME STREQUAL "x64"))
add_definitions(-D__SSE4_1__)
add_definitions(-D__AVX2__)
endif ()
add_definitions(-DNOMINMAX)
else ()
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_NULL_DEREFERENCE -Wnull-dereference)

3
src/openrct2/CMakeLists.txt
View File

@ -85,7 +85,8 @@ endif ()
# Third party libraries
if (MSVC)
find_package(jansson 2.5 REQUIRED)
find_package(jansson CONFIG REQUIRED)
set(JANSSON_LIBRARIES "jansson::jansson")
find_package(png 1.6 REQUIRED)
find_package(zlib REQUIRED)