Skip to content

Commit 9bd227c

Browse files
CauselessCauseless
committed
Undo LUABIND_NO_ERROR_CHECKING. It's just not safe enough for a game as mod-heavy as this
1 parent c6b8047 commit 9bd227c

File tree

9 files changed

+11
-15
lines changed

9 files changed

+11
-15
lines changed

‎RTEA.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@
625625
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
626626
<WholeProgramOptimization>true</WholeProgramOptimization>
627627
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)\Source;$(ProjectDir)Source\System;$(ProjectDir)Source\Lua;$(ProjectDir)Source\Entities;$(ProjectDir)Source\Activities;$(ProjectDir)Source\Managers;$(ProjectDir)Source\Menus;$(ProjectDir)Source\GUI;$(ProjectDir)Source\GUI\Wrappers;$(ProjectDir)external\include\boost_1_75;$(ProjectDir)external\include\glm-0.9.9.8;$(ProjectDir)external\include\glad-2.0.0-beta;$(ProjectDir)external\include\LZ4-1.9.3\LZ4;$(ProjectDir)external\include\fmod-2.2.13;$(ProjectDir)external\include\thread-pool-3.5.0\include;$(ProjectDir)external\include\hopscotch-map-2.3.1\include;$(ProjectDir)external\sources\libpng-1.6.40\include;$(ProjectDir)external\sources\zlib-ng-2.1.3\include;$(ProjectDir)external\sources\allegro 4.4.3.1-custom\include;$(ProjectDir)external\sources\allegro 4.4.3.1-custom\addons\loadpng;$(ProjectDir)external\sources\SDL2-2.26.3\include;$(ProjectDir)external\sources\LuaJIT-2.1\src;$(ProjectDir)external\sources\luabind-0.7.1\;$(ProjectDir)external\sources\luabind-0.7.1\luabind;$(ProjectDir)external\sources\RakNet\include;$(ProjectDir)external\sources\minizip-ng-4.0.0\include;$(ProjectDir)external\sources\minizip-ng-4.0.0\src;$(ProjectDir)external\sources\tracy\public</AdditionalIncludeDirectories>
628-
<PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;ZLIB_COMPAT;_WINDOWS;WIN32;RELEASE_BUILD;NDEBUG;LUABIND_NO_ERROR_CHECKING;TRACY_ENABLE;TRACY_ON_DEMAND;TRACY_ONLY_LOCALHOST;TRACY_NO_BROADCAST;TARGET_MACHINE_X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
628+
<PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;ZLIB_COMPAT;_WINDOWS;WIN32;RELEASE_BUILD;NDEBUG;TRACY_ENABLE;TRACY_ON_DEMAND;TRACY_ONLY_LOCALHOST;TRACY_NO_BROADCAST;TARGET_MACHINE_X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
629629
<ExceptionHandling>Sync</ExceptionHandling>
630630
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
631631
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -685,7 +685,7 @@
685685
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
686686
<WholeProgramOptimization>true</WholeProgramOptimization>
687687
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)\Source;$(ProjectDir)Source\System;$(ProjectDir)Source\Lua;$(ProjectDir)Source\Entities;$(ProjectDir)Source\Activities;$(ProjectDir)Source\Managers;$(ProjectDir)Source\Menus;$(ProjectDir)Source\GUI;$(ProjectDir)Source\GUI\Wrappers;$(ProjectDir)external\include\boost_1_75;$(ProjectDir)external\include\glm-0.9.9.8;$(ProjectDir)external\include\glad-2.0.0-beta;$(ProjectDir)external\include\LZ4-1.9.3\LZ4;$(ProjectDir)external\include\fmod-2.2.13;$(ProjectDir)external\include\thread-pool-3.5.0\include;$(ProjectDir)external\include\hopscotch-map-2.3.1\include;$(ProjectDir)external\sources\libpng-1.6.40\include;$(ProjectDir)external\sources\zlib-ng-2.1.3\include;$(ProjectDir)external\sources\allegro 4.4.3.1-custom\include;$(ProjectDir)external\sources\allegro 4.4.3.1-custom\addons\loadpng;$(ProjectDir)external\sources\SDL2-2.26.3\include;$(ProjectDir)external\sources\LuaJIT-2.1\src;$(ProjectDir)external\sources\luabind-0.7.1\;$(ProjectDir)external\sources\luabind-0.7.1\luabind;$(ProjectDir)external\sources\RakNet\include;$(ProjectDir)external\sources\minizip-ng-4.0.0\include;$(ProjectDir)external\sources\minizip-ng-4.0.0\src;$(ProjectDir)external\sources\tracy\public</AdditionalIncludeDirectories>
688-
<PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;ZLIB_COMPAT;_WINDOWS;WIN32;RELEASE_BUILD;NDEBUG;LUABIND_NO_ERROR_CHECKING;TRACY_ENABLE;TRACY_ON_DEMAND;TRACY_ONLY_LOCALHOST;TRACY_NO_BROADCAST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
688+
<PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;ZLIB_COMPAT;_WINDOWS;WIN32;RELEASE_BUILD;NDEBUG;TRACY_ENABLE;TRACY_ON_DEMAND;TRACY_ONLY_LOCALHOST;TRACY_NO_BROADCAST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
689689
<ExceptionHandling>Sync</ExceptionHandling>
690690
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
691691
<BufferSecurityCheck>false</BufferSecurityCheck>

‎external/sources/luabind-0.7.1/_Bin/luabind-debug-32.lib

-88.2 KB
Binary file not shown.

‎external/sources/luabind-0.7.1/_Bin/luabind-debug-release-32.lib

-88.1 KB
Binary file not shown.

‎external/sources/luabind-0.7.1/_Bin/luabind-debug-release.lib

-88.1 KB
Binary file not shown.

‎external/sources/luabind-0.7.1/_Bin/luabind-debug.lib

-88.3 KB
Binary file not shown.

‎external/sources/luabind-0.7.1/_Bin/luabind-release-32.lib

44.5 KB
Binary file not shown.

‎external/sources/luabind-0.7.1/_Bin/luabind-release.lib

76.4 KB
Binary file not shown.

‎external/sources/luabind-0.7.1/luabind.vcxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
</PropertyGroup>
112112
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
113113
<ClCompile>
114-
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\;$(SolutionDir)..\LuaJIT-2.1\src;$(SolutionDir)..\..\include\common\boost_1_75;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
114+
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\;$(SolutionDir)..\LuaJIT-2.1\src;$(SolutionDir)..\..\include\boost_1_75;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
115115
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
116116
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
117117
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -135,7 +135,7 @@
135135
</ItemDefinitionGroup>
136136
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
137137
<ClCompile>
138-
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\;$(SolutionDir)..\LuaJIT-2.1\src;$(SolutionDir)..\..\include\common\boost_1_75;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
138+
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\;$(SolutionDir)..\LuaJIT-2.1\src;$(SolutionDir)..\..\include\boost_1_75;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
139139
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
140140
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
141141
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -158,7 +158,7 @@
158158
</ItemDefinitionGroup>
159159
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
160160
<ClCompile>
161-
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\;$(SolutionDir)..\LuaJIT-2.1\src;$(SolutionDir)..\..\include\common\boost_1_75;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
161+
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\;$(SolutionDir)..\LuaJIT-2.1\src;$(SolutionDir)..\..\include\boost_1_75;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
162162
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
163163
<ExceptionHandling>Sync</ExceptionHandling>
164164
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
@@ -168,7 +168,7 @@
168168
<RuntimeTypeInfo>true</RuntimeTypeInfo>
169169
<UseFullPaths>false</UseFullPaths>
170170
<WarningLevel>Level3</WarningLevel>
171-
<PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;WIN32;_WINDOWS;BOOST_BIND_GLOBAL_PLACEHOLDERS=1;NDEBUG;LUABIND_BUILDING;LUABIND_NO_ERROR_CHECKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
171+
<PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;WIN32;_WINDOWS;BOOST_BIND_GLOBAL_PLACEHOLDERS=1;NDEBUG;LUABIND_BUILDING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
172172
<ObjectFileName>$(IntDir)</ObjectFileName>
173173
<DebugInformationFormat>
174174
</DebugInformationFormat>
@@ -182,7 +182,7 @@
182182
</ItemDefinitionGroup>
183183
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
184184
<ClCompile>
185-
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\;$(SolutionDir)..\LuaJIT-2.1\src;$(SolutionDir)..\..\include\common\boost_1_75;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
185+
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\;$(SolutionDir)..\LuaJIT-2.1\src;$(SolutionDir)..\..\include\boost_1_75;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
186186
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
187187
<ExceptionHandling>Sync</ExceptionHandling>
188188
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
@@ -192,7 +192,7 @@
192192
<RuntimeTypeInfo>true</RuntimeTypeInfo>
193193
<UseFullPaths>false</UseFullPaths>
194194
<WarningLevel>Level3</WarningLevel>
195-
<PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;WIN32;_WINDOWS;BOOST_BIND_GLOBAL_PLACEHOLDERS=1;NDEBUG;LUABIND_BUILDING;LUABIND_NO_ERROR_CHECKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
195+
<PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;WIN32;_WINDOWS;BOOST_BIND_GLOBAL_PLACEHOLDERS=1;NDEBUG;LUABIND_BUILDING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
196196
<ObjectFileName>$(IntDir)</ObjectFileName>
197197
<DebugInformationFormat>
198198
</DebugInformationFormat>
@@ -205,7 +205,7 @@
205205
</ItemDefinitionGroup>
206206
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
207207
<ClCompile>
208-
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\;$(SolutionDir)..\LuaJIT-2.1\src;$(SolutionDir)..\..\include\common\boost_1_75;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
208+
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\;$(SolutionDir)..\LuaJIT-2.1\src;$(SolutionDir)..\..\include\boost_1_75;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
209209
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
210210
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
211211
<ExceptionHandling>Sync</ExceptionHandling>
@@ -228,7 +228,7 @@
228228
</ItemDefinitionGroup>
229229
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
230230
<ClCompile>
231-
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\;$(SolutionDir)..\LuaJIT-2.1\src;$(SolutionDir)..\..\include\common\boost_1_75;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
231+
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\;$(SolutionDir)..\LuaJIT-2.1\src;$(SolutionDir)..\..\include\boost_1_75;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
232232
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
233233
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
234234
<ExceptionHandling>Sync</ExceptionHandling>

‎meson.build

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,14 @@ if compiler.get_argument_syntax()== 'gcc' # used for gcc compatible compilers
6767
debug_type = get_option('debug_type')
6868
if debug_type == 'release'
6969
preprocessor_flags += ['-DRELEASE_BUILD'] # enable minimal debug features
70-
add_global_arguments('-DLUABIND_NO_ERROR_CHECKING', language:'cpp')
7170
elif debug_type == 'minimal'
7271
preprocessor_flags += ['-DMIN_DEBUG_BUILD', '-DDEBUGMODE'] # enable some debug features
7372
elif debug_type == 'full'
7473
preprocessor_flags += ['-DDEBUG_BUILD', '-DDEBUGMODE'] # enable all debug features; may slow down game
7574
endif
7675
else
7776
extra_args = ['-w'] # Disable all warnings for release builds
78-
preprocessor_flags += ['-DRELEASE_BUILD', '-DNDEBUG', '-DLUABIND_NO_ERROR_CHECKING'] # disable all debug features
79-
add_global_arguments('-DLUABIND_NO_ERROR_CHECKING', language:'cpp')
77+
preprocessor_flags += ['-DRELEASE_BUILD', '-DNDEBUG'] # disable all debug features
8078
endif
8179
if compiler.get_id() =='gcc' and compiler.version().version_compare('<9')
8280
link_args += ['-lstdc++fs']
@@ -140,7 +138,6 @@ elif compiler.get_argument_syntax()== 'msvc'
140138
if debug_type == 'release'
141139
elfname+='.release'
142140
preprocessor_flags += ['-DDEBUG_RELEASE_BUILD'] # enable minimal debug features
143-
add_global_arguments('-DLUABIND_NO_ERROR_CHECKING', language:'cpp')
144141
elif debug_type == 'minimal'
145142
elfname += '.minimal'
146143
preprocessor_flags += ['-DDEBUGMODE'] # enable some debug features
@@ -150,7 +147,6 @@ elif compiler.get_argument_syntax()== 'msvc'
150147
endif
151148
else
152149
preprocessor_flags += ['-DRELEASE_BUILD', '-DNDEBUG']
153-
add_global_arguments('-DLUABIND_NO_ERROR_CHECKING', language:'cpp')
154150
endif
155151
else
156152
error('Using unknown compiler, please use gcc or msvc compatible compilers')

0 commit comments

Comments
 (0)