Skip to content

Commit 7a97e91

Browse files
schombertschombert
authored
Merge pull request #2207 from ZombieFreak115/cross-platform-scenario-save
Cross platform scenarios, saves and multiplayer
2 parents 6b5dfa3 + 712805f commit 7a97e91

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1456
-524
lines changed

‎CMakeLists.txt‎

Lines changed: 57 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -221,51 +221,82 @@ if(WIN32)
221221
set(CMAKE_CXX_FLAGS_DEBUG "")
222222
set(CMAKE_CXX_FLAGS_RELEASE "")
223223
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
224+
# All common flags for all Clang Windows builds
225+
set(CommonClangWinFlags /bigobj /wd4100 /wd4189 /wd4065 /wd4201 /wd4324 /GR- /W4 /permissive- /WX /GF /w34388 /w34389 -Wno-unused-macros -Wno-zero-length-array -Wno-switch-default -Wno-reserved-identifier -Wno-unused-parameter -Wno-unused-variable -Wno-unused-private-field /Z7 -Wno-invalid-offsetof -Wno-deprecated-volatile -Wno-missing-prototypes -Wno-implicit-int-float-conversion -Wno-unsafe-buffer-usage -Wno-float-equal -Wno-shadow-field-in-constructor -Wno-gnu-anonymous-struct -Wno-nested-anon-types -Wno-double-promotion -Wno-shadow-uncaptured-local -Wno-nonportable-system-include-path -Wno-format-nonliteral -Wno-shorten-64-to-32 -Wno-ctad-maybe-unsupported -Wno-implicit-int-conversion -Wno-disabled-macro-expansion -Wno-comma -Wno-cast-function-type-strict -Wno-cast-function-type -Wno-invalid-offsetof -Wno-microsoft-cast -Wno-unused-but-set-variable -Wno-padded -Wno-unique-object-duplication -Wno-nrvo -Wno-declaration-after-statement -Wno-undefined-func-template -Wno-bad-function-cast -Wno-unused-function -Wno-cast-qual -Wno-format-security -Wno-overriding-option)
224226
if(OPTIMIZE_MODE STREQUAL "On")
225227
message(STATUS "Optimizing with PGO data")
226228
target_compile_options(AliceCommon INTERFACE
227-
/bigobj /wd4100 /wd4189 /wd4065 /wd4201 /wd4324 /GR- /W4 /permissive- /WX /arch:AVX2 /GF /w34388 /w34389 -Wno-unused-macros -Wno-zero-length-array -Wno-switch-default -Wno-reserved-identifier -Wno-unused-parameter -Wno-unused-variable -Wno-unused-private-field /Z7 -Wno-invalid-offsetof -Wno-deprecated-volatile -Wno-missing-prototypes -Wno-reserved-identifier -Wno-implicit-int-float-conversion -Wno-unsafe-buffer-usage -Wno-float-equal -Wno-shadow-field-in-constructor -Wno-gnu-anonymous-struct -Wno-nested-anon-types -Wno-double-promotion -Wno-shadow-uncaptured-local -Wno-nonportable-system-include-path -Wno-format-nonliteral -Wno-shorten-64-to-32 -Wno-ctad-maybe-unsupported -Wno-implicit-int-conversion -Wno-disabled-macro-expansion -Wno-comma -Wno-cast-function-type-strict -Wno-cast-function-type -Wno-invalid-offsetof -Wno-microsoft-cast -Wno-reserved-identifier -Wno-unused-but-set-variable -Wno-padded -Wno-unique-object-duplication -Wno-declaration-after-statement -Wno-undefined-func-template -Wno-bad-function-cast /DNDEBUG /wd4530 /MT /O2 /Oi /sdl- /GS- /Gy /Gw /Zc:inline -Wno-profile-instr-missing -Wno-profile-instr-out-of-date -Wno-nrvo -Wno-unused-function -Wno-cast-qual -Wno-format-security -fprofile-instr-use=code.profdata)
229+
${CommonClangWinFlags} /DNDEBUG /wd4530 /MT /O2 /Oi /sdl- /GS- /Gy /Gw /Zc:inline -Wno-profile-instr-missing -Wno-profile-instr-out-of-date -fprofile-instr-use=code.profdata)
228230
target_link_options(AliceCommon INTERFACE /OPT:REF /OPT:ICF /LTCG -fprofile-instr-use=code.profdata)
229231
elseif(PROFILE_MODE STREQUAL "On")
230232
message(STATUS "Compiling for PGO instrumentation")
231233
target_compile_options(AliceCommon INTERFACE
232-
/bigobj /wd4100 /wd4189 /wd4065 /wd4201 /wd4324 /GR- /W4 /permissive- /WX /arch:AVX2 /GF /w34388 /w34389 -Wno-unused-macros -Wno-zero-length-array -Wno-switch-default -Wno-reserved-identifier -Wno-unused-parameter -Wno-unused-variable -Wno-unused-private-field /Z7 -Wno-invalid-offsetof -Wno-deprecated-volatile -Wno-missing-prototypes -Wno-reserved-identifier -Wno-implicit-int-float-conversion -Wno-unsafe-buffer-usage -Wno-float-equal -Wno-shadow-field-in-constructor -Wno-gnu-anonymous-struct -Wno-nested-anon-types -Wno-double-promotion -Wno-shadow-uncaptured-local -Wno-nonportable-system-include-path -Wno-format-nonliteral -Wno-shorten-64-to-32 -Wno-ctad-maybe-unsupported -Wno-implicit-int-conversion -Wno-disabled-macro-expansion -Wno-comma -Wno-cast-function-type-strict -Wno-cast-function-type -Wno-invalid-offsetof -Wno-microsoft-cast -Wno-reserved-identifier -Wno-unused-but-set-variable -Wno-padded -Wno-unique-object-duplication -Wno-nrvo -Wno-declaration-after-statement -Wno-undefined-func-template -Wno-bad-function-cast -Wno-unused-function -Wno-cast-qual -Wno-format-security /DNDEBUG /wd4530 /MT /O2 /Oi /sdl- /GS- /Gy /Gw /Zc:inline -fprofile-instr-generate)
234+
${CommonClangWinFlags} /DNDEBUG /wd4530 /MT /O2 /Oi /sdl- /GS- /Gy /Gw /Zc:inline -fprofile-instr-generate)
233235
target_link_options(AliceCommon INTERFACE /DEBUG:FULL /OPT:REF /OPT:ICF /LTCG -fprofile-instr-generate)
234236
else()
235237
target_compile_options(AliceCommon INTERFACE
236-
/bigobj /wd4100 /wd4189 /wd4065 /wd4201 /wd4324 /GR- /W4 /permissive- /WX /GF /w34388 /w34389 -Wno-unused-macros -Wno-unused-parameter -Wno-unused-variable -Wno-unused-private-field /Z7 -Wno-invalid-offsetof -Wno-deprecated-volatile -Wno-missing-prototypes -Wno-reserved-identifier -Wno-implicit-int-float-conversion -Wno-unsafe-buffer-usage -Wno-float-equal -Wno-shadow-field-in-constructor -Wno-gnu-anonymous-struct -Wno-nested-anon-types -Wno-double-promotion -Wno-shadow-uncaptured-local -Wno-nonportable-system-include-path -Wno-format-nonliteral -Wno-shorten-64-to-32 -Wno-ctad-maybe-unsupported -Wno-implicit-int-conversion -Wno-disabled-macro-expansion -Wno-comma -Wno-cast-function-type-strict -Wno-cast-function-type -Wno-invalid-offsetof -Wno-switch-default -Wno-zero-length-array -Wno-microsoft-cast -Wno-reserved-identifier -Wno-unused-but-set-variable -Wno-padded -Wno-unique-object-duplication -Wno-nrvo -Wno-declaration-after-statement -Wno-undefined-func-template -Wno-cast-qual -Wno-bad-function-cast -Wno-unused-function -Wno-format-security -Wno-nontrivial-memcall /arch:AVX2
238+
${CommonClangWinFlags} -Wno-nontrivial-memcall
237239
$<$<CONFIG:Debug>: /RTC1 /EHsc /MTd /Od>
238240
$<$<NOT:$<CONFIG:Debug>>: /DNDEBUG /wd4530 /MT /O2 /Oi /sdl- /GS- /Gy /Gw /Zc:inline>)
239241
target_link_options(AliceCommon INTERFACE
240242
$<$<CONFIG:Debug>: /DEBUG:FULL >
241243
$<$<NOT:$<CONFIG:Debug>>: /OPT:REF /OPT:ICF /LTCG>)
242244
endif()
245+
if(VECTOR_MODE STREQUAL "AVX512")
246+
target_compile_options(AliceCommon INTERFACE
247+
/arch:AVX512 )
248+
elseif(VECTOR_MODE STREQUAL "AVX2")
249+
target_compile_options(AliceCommon INTERFACE
250+
/arch:AVX2 )
251+
else()
252+
target_compile_options(AliceCommon INTERFACE
253+
-march=nehalem /clang:-fno-fast-math /clang:-ffp-model=precise /clang:-ffp-contract=off )
254+
endif()
255+
243256
else()
244257
set_target_properties(AliceCommon PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR})
245-
258+
# common MSVC flags for all builds
259+
set(CommonMSVCFlags /bigobj /wd4100 /wd4189 /wd4065 /wd4201 /wd4324 /GR- /W4 /permissive- /Zc:preprocessor /GF /w34388 /w34389 /WX)
246260
# /arch:AVX512
247261
# /d2archSSE42
248262
if(OPTIMIZE_MODE STREQUAL "On")
249263
message(STATUS "Optimizing with PGO data")
250264
target_compile_options(AliceCommon INTERFACE
251-
/bigobj /wd4100 /wd4189 /wd4065 /wd4201 /wd4324 /wd4723 /GR- /W4 /permissive- /Zc:preprocessor /WX /d2archSSE42 /GF /w34388 /w34389 /DNDEBUG /wd4530 /MT /O2 /Oi /GL /sdl- /GS- /Gy /Gw /Zc:preprocessor /Zc:inline)
265+
${CommonMSVCFlags} /wd4723 /d2archSSE42 /DNDEBUG /wd4530 /MT /O2 /Oi /GL /sdl- /GS- /Gy /Gw /Zc:inline)
252266
target_link_options(AliceCommon INTERFACE /OPT:REF /OPT:ICF /LTCG /USEPROFILE)
253267
elseif(PROFILE_MODE STREQUAL "On")
254268
message(STATUS "Compiling for PGO instrumentation")
255269
target_compile_options(AliceCommon INTERFACE
256-
/bigobj /wd4100 /wd4189 /wd4065 /wd4201 /wd4324 /wd4723 /GR- /W4 /permissive- /Zc:preprocessor /WX /d2archSSE42 /GF /w34388 /w34389 /Z7 /DNDEBUG /wd4530 /MT /O2 /Oi /GL /sdl- /GS- /Gy /Gw /Zc:preprocessor /Zc:inline)
270+
${CommonMSVCFlags} /wd4723 /d2archSSE42 /Z7 /DNDEBUG /wd4530 /MT /O2 /Oi /GL /sdl- /GS- /Gy /Gw /Zc:inline)
257271
target_link_options(AliceCommon INTERFACE /DEBUG:FULL /OPT:REF /OPT:ICF /LTCG /GENPROFILE)
258272
else()
259273
message(STATUS "Normal, not PGO, build")
260274
target_compile_options(AliceCommon INTERFACE
261-
/bigobj /wd4100 /wd4189 /wd4065 /wd4201 /wd4324 /GR- /W4 /permissive- /Zc:preprocessor /WX /d2archSSE42 /GF /w34388 /w34389 /Z7
275+
${CommonMSVCFlags} /Z7
262276
$<$<CONFIG:Debug>: /EHsc /MTd /RTC1 /Od>
263277
# for faster debug builds, replace /RTC1 /Od with /O1 -- should be able to use /Ox, but for some reason that crashes ZSTD
264-
$<$<NOT:$<CONFIG:Debug>>: /DNDEBUG /wd4530 /MT /O2 /Oi /GL /sdl- /GS- /Gy /Gw /Zc:preprocessor /Zc:inline>)
278+
$<$<NOT:$<CONFIG:Debug>>: /DNDEBUG /wd4530 /MT /O2 /Oi /GL /sdl- /GS- /Gy /Gw /Zc:inline>)
265279
target_link_options(AliceCommon INTERFACE
266280
$<$<CONFIG:Debug>: /DEBUG:FULL >
267281
$<$<NOT:$<CONFIG:Debug>>: /DEBUG:FULL /OPT:REF /OPT:ICF /LTCG>)
268282
endif()
283+
284+
if(VECTOR_MODE STREQUAL "AVX512")
285+
target_compile_options(AliceCommon INTERFACE
286+
/arch:AVX512 )
287+
elseif(VECTOR_MODE STREQUAL "AVX2")
288+
target_compile_options(AliceCommon INTERFACE
289+
/arch:AVX2 )
290+
else()
291+
# No /fp:precise here since from my testing, seperate executables generated with Clang and MSVC will not be deterministic between eachother anyway no matter the flags. Both builds must be compiled with clang to get some level of float determinism
292+
target_compile_options(AliceCommon INTERFACE
293+
/d2archSSE42 )
294+
endif()
295+
296+
297+
298+
299+
269300
endif()
270301
else() # GCC or CLANG
271302
target_link_options(Alice INTERFACE -rdynamic -Wl,-E)
@@ -274,15 +305,28 @@ else() # GCC or CLANG
274305
# See for FMA support: https://stackoverflow.com/questions/21001388/fma3-in-gcc-how-to-enable
275306
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
276307
target_compile_options(AliceCommon INTERFACE
277-
-Wall -Wextra -Wpedantic -Wno-unused-parameter -Wno-unused-variable -Wno-switch -Wdangling-else -Wno-unused-private-field -Wno-invalid-offsetof -Wno-unused-but-set-variable -Wno-microsoft-cast -Wno-declaration-after-statement #-Werror
278-
$<$<CONFIG:Debug>: -mfpmath=sse -mavx2 -mfma -g -pipe>
279-
$<$<NOT:$<CONFIG:Debug>>: -mfpmath=sse -mavx2 -mfma -O3 -pipe -fno-rtti -DNDEBUG>)
308+
-Wall -Wextra -Wpedantic -Wno-unused-parameter -Wno-unused-variable -Wno-switch -Wdangling-else -Wno-unused-private-field -Wno-invalid-offsetof -Wno-unused-but-set-variable -Wno-microsoft-cast -Wno-declaration-after-statement #-Werror
309+
$<$<CONFIG:Debug>: -g -pipe>
310+
$<$<NOT:$<CONFIG:Debug>>: -O3 -pipe -fno-rtti -DNDEBUG>)
280311
else()
281312
target_compile_options(AliceCommon INTERFACE
282313
# -Wall -Wextra -Wpedantic -Werror -Wno-unused-parameter -Wno-unused-variable -Wno-switch -Wno-unused-private-field -Wno-unused-but-set-variable -Wno-parentheses
283-
$<$<CONFIG:Debug>: -mfpmath=sse -mavx2 -mfma -g -pipe>
284-
$<$<NOT:$<CONFIG:Debug>>: -mfpmath=sse -mavx2 -mfma -O3 -pipe -fno-rtti -DNDEBUG>)
314+
$<$<CONFIG:Debug>: -g -pipe>
315+
$<$<NOT:$<CONFIG:Debug>>: -O3 -pipe -fno-rtti -DNDEBUG>)
285316
endif()
317+
318+
if(VECTOR_MODE STREQUAL "AVX512")
319+
target_compile_options(AliceCommon INTERFACE
320+
-mavx512f -mavx512cd -mavx512bw -mavx512dq -mavx512vl -mfma )
321+
elseif(VECTOR_MODE STREQUAL "AVX2")
322+
target_compile_options(AliceCommon INTERFACE
323+
-mavx2 -mfma )
324+
else()
325+
target_compile_options(AliceCommon INTERFACE
326+
-march=nehalem -fno-fast-math -ffp-model=precise -ffp-contract=off )
327+
endif()
328+
329+
286330
target_link_libraries(AliceCommon INTERFACE dl)
287331
endif()
288332
target_link_libraries(AliceCommon INTERFACE dependency_DataContainer)

‎CMakePresets.json‎

Lines changed: 162 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -60,55 +60,177 @@
6060
}
6161
},
6262
{
63-
"name": "x64-release-windows",
64-
"displayName": "x64 Release",
63+
"name": "x64-release-windows-sse",
64+
"displayName": "x64 Release (SSE)",
6565
"inherits": "windows-base",
6666
"cacheVariables": {
67-
"CMAKE_BUILD_TYPE": "Release"
67+
"CMAKE_BUILD_TYPE": "Release",
68+
"VECTOR_MODE": "SSE"
69+
}
70+
},
71+
{
72+
"name": "x64-release-windows-avx2",
73+
"displayName": "x64 Release (AVX2)",
74+
"inherits": "windows-base",
75+
"cacheVariables": {
76+
"CMAKE_BUILD_TYPE": "Release",
77+
"VECTOR_MODE": "AVX2"
78+
}
79+
},
80+
{
81+
"name": "x64-release-windows-avx512",
82+
"displayName": "x64 Release (AVX512)",
83+
"inherits": "windows-base",
84+
"cacheVariables": {
85+
"CMAKE_BUILD_TYPE": "Release",
86+
"VECTOR_MODE": "AVX512"
87+
}
88+
},
89+
{
90+
"name": "x64-profile-windows-sse",
91+
"displayName": "x64 Release (profile SSE)",
92+
"inherits": "windows-base",
93+
"cacheVariables": {
94+
"CMAKE_BUILD_TYPE": "Release",
95+
"PROFILE_MODE": "On",
96+
"VECTOR_MODE": "SSE"
97+
}
98+
},
99+
{
100+
"name": "x64-profile-windows-avx2",
101+
"displayName": "x64 Release (profile AVX2)",
102+
"inherits": "windows-base",
103+
"cacheVariables": {
104+
"CMAKE_BUILD_TYPE": "Release",
105+
"PROFILE_MODE": "On",
106+
"VECTOR_MODE": "AVX2"
107+
}
108+
},
109+
{
110+
"name": "x64-profile-windows-avx512",
111+
"displayName": "x64 Release (profile AVX512)",
112+
"inherits": "windows-base",
113+
"cacheVariables": {
114+
"CMAKE_BUILD_TYPE": "Release",
115+
"PROFILE_MODE": "On",
116+
"VECTOR_MODE": "AVX512"
117+
}
118+
},
119+
{
120+
"name": "x64-optimize-windows-sse",
121+
"displayName": "x64 Release (optimize SSE)",
122+
"inherits": "windows-base",
123+
"cacheVariables": {
124+
"CMAKE_BUILD_TYPE": "Release",
125+
"OPTIMIZE_MODE": "On",
126+
"VECTOR_MODE": "SSE"
68127
}
69128
},
70129
{
71-
"name": "x64-profile-windows",
72-
"displayName": "x64 Release (profile)",
130+
"name": "x64-optimize-windows-avx2",
131+
"displayName": "x64 Release (optimize AVX2)",
73132
"inherits": "windows-base",
74133
"cacheVariables": {
75134
"CMAKE_BUILD_TYPE": "Release",
76-
"PROFILE_MODE": "On"
135+
"OPTIMIZE_MODE": "On",
136+
"VECTOR_MODE": "AVX2"
77137
}
78138
},
79139
{
80-
"name": "x64-optimize-windows",
81-
"displayName": "x64 Release (optimize)",
140+
"name": "x64-optimize-windows-avx512",
141+
"displayName": "x64 Release (optimize AVX512)",
82142
"inherits": "windows-base",
83143
"cacheVariables": {
84144
"CMAKE_BUILD_TYPE": "Release",
85-
"OPTIMIZE_MODE": "On"
145+
"OPTIMIZE_MODE": "On",
146+
"VECTOR_MODE": "AVX512"
86147
}
87148
},
88149
{
89-
"name": "x64-release-win-clang",
90-
"displayName": "x64 Release (Clang)",
150+
"name": "x64-release-win-clang-sse",
151+
"displayName": "x64 Release (Clang SSE)",
91152
"inherits": "windows-clang-base",
92153
"cacheVariables": {
93-
"CMAKE_BUILD_TYPE": "Release"
154+
"CMAKE_BUILD_TYPE": "Release",
155+
"VECTOR_MODE": "SSE"
156+
}
157+
},
158+
{
159+
"name": "x64-release-win-clang-avx2",
160+
"displayName": "x64 Release (Clang AVX2)",
161+
"inherits": "windows-clang-base",
162+
"cacheVariables": {
163+
"CMAKE_BUILD_TYPE": "Release",
164+
"VECTOR_MODE": "AVX2"
94165
}
95166
},
96167
{
97-
"name": "x64-release-win-clang-profile",
98-
"displayName": "x64 Release (Clang, profile)",
168+
"name": "x64-release-win-clang-avx512",
169+
"displayName": "x64 Release (Clang AVX512)",
99170
"inherits": "windows-clang-base",
100171
"cacheVariables": {
101172
"CMAKE_BUILD_TYPE": "Release",
102-
"PROFILE_MODE": "On"
173+
"VECTOR_MODE": "AVX512"
103174
}
104175
},
105176
{
106-
"name": "x64-release-win-clang-optimize",
107-
"displayName": "x64 Release (Clang, optimize)",
177+
"name": "x64-release-win-clang-profile-sse",
178+
"displayName": "x64 Release (Clang, profile SSE)",
108179
"inherits": "windows-clang-base",
109180
"cacheVariables": {
110181
"CMAKE_BUILD_TYPE": "Release",
111-
"OPTIMIZE_MODE": "On"
182+
"PROFILE_MODE": "On",
183+
"VECTOR_MODE": "SSE"
184+
}
185+
},
186+
{
187+
"name": "x64-release-win-clang-profile-avx2",
188+
"displayName": "x64 Release (Clang, profile AVX2)",
189+
"inherits": "windows-clang-base",
190+
"cacheVariables": {
191+
"CMAKE_BUILD_TYPE": "Release",
192+
"PROFILE_MODE": "On",
193+
"VECTOR_MODE": "AVX2"
194+
}
195+
},
196+
{
197+
"name": "x64-release-win-clang-profile-avx512",
198+
"displayName": "x64 Release (Clang, profile AVX512)",
199+
"inherits": "windows-clang-base",
200+
"cacheVariables": {
201+
"CMAKE_BUILD_TYPE": "Release",
202+
"PROFILE_MODE": "On",
203+
"VECTOR_MODE": "AVX512"
204+
}
205+
},
206+
{
207+
"name": "x64-release-win-clang-optimize-sse",
208+
"displayName": "x64 Release (Clang, optimize SSE)",
209+
"inherits": "windows-clang-base",
210+
"cacheVariables": {
211+
"CMAKE_BUILD_TYPE": "Release",
212+
"OPTIMIZE_MODE": "On",
213+
"VECTOR_MODE": "SSE"
214+
}
215+
},
216+
{
217+
"name": "x64-release-win-clang-optimize-avx2",
218+
"displayName": "x64 Release (Clang, optimize AVX2)",
219+
"inherits": "windows-clang-base",
220+
"cacheVariables": {
221+
"CMAKE_BUILD_TYPE": "Release",
222+
"OPTIMIZE_MODE": "On",
223+
"VECTOR_MODE": "AVX2"
224+
}
225+
},
226+
{
227+
"name": "x64-release-win-clang-optimize-avx512",
228+
"displayName": "x64 Release (Clang, optimize AVX512)",
229+
"inherits": "windows-clang-base",
230+
"cacheVariables": {
231+
"CMAKE_BUILD_TYPE": "Release",
232+
"OPTIMIZE_MODE": "On",
233+
"VECTOR_MODE": "AVX512"
112234
}
113235
},
114236
{
@@ -135,11 +257,30 @@
135257
}
136258
},
137259
{
138-
"name": "x64-release-linux-clang",
139-
"displayName": "x64 Release",
260+
"name": "x64-release-linux-clang-sse",
261+
"displayName": "x64 Release SSE",
140262
"inherits": "linux-base",
141263
"cacheVariables": {
142-
"CMAKE_BUILD_TYPE": "Release"
264+
"CMAKE_BUILD_TYPE": "Release",
265+
"VECTOR_MODE": "SSE"
266+
}
267+
},
268+
{
269+
"name": "x64-release-linux-clang-avx2",
270+
"displayName": "x64 Release AVX2",
271+
"inherits": "linux-base",
272+
"cacheVariables": {
273+
"CMAKE_BUILD_TYPE": "Release",
274+
"VECTOR_MODE": "AVX2"
275+
}
276+
},
277+
{
278+
"name": "x64-release-linux-clang-avx512",
279+
"displayName": "x64 Release AVX512",
280+
"inherits": "linux-base",
281+
"cacheVariables": {
282+
"CMAKE_BUILD_TYPE": "Release",
283+
"VECTOR_MODE": "AVX512"
143284
}
144285
}
145286
]

‎Launcher/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ set_source_files_properties(${PROJECT_SOURCE_DIR}/src/lunasvg/plutovg-path.c PRO
100100
set_source_files_properties(${PROJECT_SOURCE_DIR}/src/lunasvg/plutovg-rasterize.c PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
101101
set_source_files_properties(${PROJECT_SOURCE_DIR}/src/lunasvg/plutovg-surface.c PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
102102

103-
target_compile_definitions(launch_alice PUBLIC ALICE_NO_ENTRY_POINT)
103+
#target_compile_definitions(launch_alice PUBLIC ALICE_NO_ENTRY_POINT)
104104

105105
if (WIN32)
106106
target_link_libraries(launch_alice PRIVATE ${PROJECT_SOURCE_DIR}/libs/LLVM-C.lib)

‎assets/alice.gui‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3785,24 +3785,6 @@ guiTypes = {
37853785
orientation = "UPPER_LEFT"
37863786
format = left
37873787
}
3788-
3789-
guiButtonType = {
3790-
position = { 370 2 }
3791-
name = "us_button"
3792-
quadTextureSprite = "GFX_alice_message_type"
3793-
}
3794-
3795-
guiButtonType = {
3796-
position = { 490 2 }
3797-
name = "interesting_button"
3798-
quadTextureSprite = "GFX_alice_message_type"
3799-
}
3800-
3801-
guiButtonType = {
3802-
position = { 610 2 }
3803-
name = "other_button"
3804-
quadTextureSprite = "GFX_alice_message_type"
3805-
}
38063788
}
38073789

38083790
windowType = {

0 commit comments

Comments
 (0)