@@ -50,11 +50,20 @@ if(WIN32)
50
50
list (APPEND COMPILER_DEFINES _UNICODE UNICODE)
51
51
endif ()
52
52
53
+ if (MINGW)
54
+ list (APPEND LINKER_SWITCHES -municode)
55
+ endif ()
56
+
53
57
#--- General MSVC-like SDL options
54
58
if (MSVC )
55
59
list (APPEND COMPILER_SWITCHES "$<$<NOT:$<CONFIG:DEBUG>>:/guard:cf>" )
56
60
list (APPEND LINKER_SWITCHES /DYNAMICBASE /NXCOMPAT /INCREMENTAL:NO )
57
61
62
+ if (WINDOWS_STORE)
63
+ list (APPEND COMPILER_SWITCHES /bigobj)
64
+ list (APPEND LINKER_SWITCHES /APPCONTAINER /MANIFEST:NO )
65
+ endif ()
66
+
58
67
if ((${DIRECTX_ARCH} STREQUAL "x86" )
59
68
OR ((CMAKE_SIZEOF_VOID_P EQUAL 4) AND (NOT (${DIRECTX_ARCH} MATCHES "^arm" ))))
60
69
list (APPEND LINKER_SWITCHES /SAFESEH)
@@ -95,11 +104,19 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|IntelLLVM")
95
104
if (MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 16.0))
96
105
list (APPEND COMPILER_SWITCHES /ZH:SHA_256)
97
106
endif ()
107
+
108
+ if (WINDOWS_STORE)
109
+ list (APPEND COMPILER_DEFINES _SILENCE_CLANG_COROUTINE_MESSAGE)
110
+ endif ()
98
111
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Intel" )
99
112
list (APPEND COMPILER_SWITCHES /Zc:__cplusplus /Zc:inline /fp:fast /Qdiag-disable:161)
100
113
elseif (CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )
101
114
list (APPEND COMPILER_SWITCHES /sdl /Zc:inline /fp:fast)
102
115
116
+ if (WINDOWS_STORE)
117
+ list (APPEND COMPILER_SWITCHES /await)
118
+ endif ()
119
+
103
120
if (CMAKE_INTERPROCEDURAL_OPTIMIZATION)
104
121
message (STATUS "Building using Whole Program Optimization" )
105
122
list (APPEND COMPILER_SWITCHES $<$<NOT :$<CONFIG:Debug>>:/Gy /Gw>)
@@ -149,16 +166,17 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
149
166
list (APPEND COMPILER_SWITCHES /Zc:lambda)
150
167
endif ()
151
168
152
- if ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.29)
153
- AND (NOT VCPKG_TOOLCHAIN))
154
- list (APPEND COMPILER_SWITCHES /external:W4)
155
- endif ()
169
+ # GDKX scenarios can't use external:W4
156
170
157
171
if ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.31)
158
172
AND (XBOX_CONSOLE_TARGET STREQUAL "durango" ))
159
173
list (APPEND COMPILER_SWITCHES /Zc:static_assert-)
160
174
endif ()
161
175
176
+ if (WINDOWS_STORE AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.32))
177
+ list (APPEND COMPILER_SWITCHES "/wd5246" )
178
+ endif ()
179
+
162
180
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.35)
163
181
if (CMAKE_INTERPROCEDURAL_OPTIMIZATION)
164
182
list (APPEND COMPILER_SWITCHES $<$<NOT :$<CONFIG:Debug>>:/Zc:checkGwOdr>)
0 commit comments