Merge pull request #2207 from scribam/ninja

cmake: Fix format for Ninja generator
This commit is contained in:
PatrickvL 2021-04-26 22:01:02 +02:00 committed by GitHub
commit b6d4c76b42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 48 deletions

View File

@ -117,19 +117,19 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
# Reference: https://docs.microsoft.com/en-us/cpp/build/reference/linker-options
set_target_properties(cxbx PROPERTIES
LINK_FLAGS "
/INCREMENTAL:NO
/LARGEADDRESSAWARE
/FIXED
/SAFESEH:NO
/DYNAMICBASE:NO
/BASE:0x10000
/STACK:65536,65536
/NODEFAULTLIB:libcmt
/DELAYLOAD:wpcap.dll
/INCREMENTAL:NO \
/LARGEADDRESSAWARE \
/FIXED \
/SAFESEH:NO \
/DYNAMICBASE:NO \
/BASE:0x10000 \
/STACK:65536,65536 \
/NODEFAULTLIB:libcmt \
/DELAYLOAD:wpcap.dll \
"
LINK_FLAGS_RELEASE "
/LTCG
/DEBUG
/LTCG \
/DEBUG \
"
)
@ -144,16 +144,16 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
# /Qpar = Enable automatic parallelize loops in the code
# Set optimization options for release build
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}
/Zi
/Ob2
/Oi
/Ot
/GL
/GS-
/Gy
/Qpar
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} \
/Zi \
/Ob2 \
/Oi \
/Ot \
/GL \
\
/GS- \
/Gy \
/Qpar \
"
)

View File

@ -111,30 +111,30 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
set_target_properties(cxbxr-emu PROPERTIES
LINK_FLAGS "
/INCREMENTAL:NO
/LARGEADDRESSAWARE
/SAFESEH:NO
/STACK:65536,65536
/NODEFAULTLIB:libcmt
/DELAYLOAD:wpcap.dll
/INCREMENTAL:NO \
/LARGEADDRESSAWARE \
/SAFESEH:NO \
/STACK:65536,65536 \
/NODEFAULTLIB:libcmt \
/DELAYLOAD:wpcap.dll \
"
LINK_FLAGS_RELEASE "
/LTCG
/DEBUG
/LTCG \
/DEBUG \
"
)
# Set optimization options for release build
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}
/Zi
/Ob2
/Oi
/Ot
/GL
/GS-
/Gy
/Qpar
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} \
/Zi \
/Ob2 \
/Oi \
/Ot \
/GL \
\
/GS- \
/Gy \
/Qpar \
"
)
endif()

View File

@ -47,19 +47,19 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
set_target_properties(cxbxr-ldr PROPERTIES
LINK_FLAGS "
/LARGEADDRESSAWARE
/FIXED
/DYNAMICBASE:NO
/BASE:0x10000
/STACK:65536,65536
/NODEFAULTLIB
/ENTRY:rawMain
/LARGEADDRESSAWARE \
/FIXED \
/DYNAMICBASE:NO \
/BASE:0x10000 \
/STACK:65536,65536 \
/NODEFAULTLIB \
/ENTRY:rawMain \
"
)
# Set optimization options for release build
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}
/Oi
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} \
/Oi \
"
)
endif()