mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-01-29 12:40:01 +01:00
Code Issues Projects Releases Wiki Activity

Fix crash on windows when using invalid particle/element property values

Browse Source 
See the comment in meson.build. Reproduce with

	elem.property(elem.DEFAULT_PT_DMND, "Enabled", false)
This commit is contained in:
Tamás Bálint Misius 2024-12-09 20:41:42 +01:00
parent 9233b0036f
commit 860ba13899
No known key found for this signature in database
GPG Key ID: 5B472A12F6ECA9F2
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
meson.build
View File

@ -280,13 +280,22 @@ else
endif endif
endif endif
cpp_eh = 'default'
if cpp_compiler.get_argument_syntax() == 'msvc' if cpp_compiler.get_argument_syntax() == 'msvc'
args_msvc = [ project_cpp_args += [
'/GS', '/GS',
'/D_SCL_SECURE_NO_WARNINGS', '/D_SCL_SECURE_NO_WARNINGS',
] ]
project_cpp_args += args_msvc # https://learn.microsoft.com/en-us/cpp/build/reference/eh-exception-handling-model?view=msvc-170&redirectedfrom=MSDN
# the default exception handling mode is 'sc', which guarantees to the compiler that functions with C linkage never throw
# exceptions. C++-aware Lua throws exceptions, but its functions are designed have C++ linkage, so this is normally not an issue.
# LuaJIT also throws exceptions, but its functions are designed to have C linkage, which is sad >_> not much we can do there.
# further, the functions in our builds of C++-aware Lua actually have C linkage for the sake of simplicity (since the codebase works
# with both kinds of Lua and LuaJIT uses C linkage). the fact that functions with C linkage may throw exceptions means that the
# correct exception handling mode to use is 's'
cpp_eh = 's'
endif endif
target_options += [ 'cpp_eh=@0@'.format(cpp_eh) ]
# clang-cl supports both syntaxes. use the GCC one. # clang-cl supports both syntaxes. use the GCC one.
if cpp_compiler.get_argument_syntax() == 'msvc' and cpp_compiler.get_id() not in [ 'clang-cl' ] if cpp_compiler.get_argument_syntax() == 'msvc' and cpp_compiler.get_id() not in [ 'clang-cl' ]