Skip to content

Commit 1ac79d8

Browse files
committed
Updated GoogleTest from 1.6.0 to version 1.17.0
Updated GoogleTest from 1.6.0 to 1.17.0. This also required updating the version of C++ used from 14 to 17.
1 parent a4099fa commit 1ac79d8

File tree

228 files changed

+32219
-106329
lines changed

Some content is hidden

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

228 files changed

+32219
-106329
lines changed

engine/compilers/VisualStudio 2022/Torque 2D.vcxproj

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
<ClCompile>
131131
<Optimization>Disabled</Optimization>
132132
<AdditionalIncludeDirectories>../../Lib/libogg/include;../../Lib/libvorbis/include;../../Lib/LeapSDK/include;../../Lib/zlib;../../Lib/lpng;../../Lib/ljpeg;../../Lib/openal/win32;../../source;../../source/persistence/rapidjson/include;../../source/persistence/libjson;../../source/testing/googleTest;../../source/testing/googleTest/include;../../source/spine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
133-
<PreprocessorDefinitions>TORQUE_DEBUG;TORQUE_DEBUG_GUARD;_CRT_SECURE_NO_DEPRECATE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
133+
<PreprocessorDefinitions>TORQUE_DEBUG;TORQUE_DEBUG_GUARD;_CRT_SECURE_NO_DEPRECATE;UNICODE;_HAS_STD_BYTE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
134134
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
135135
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
136136
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
@@ -148,6 +148,7 @@
148148
<DisableSpecificWarnings>4800;4100;4127;4512</DisableSpecificWarnings>
149149
<ShowIncludes>false</ShowIncludes>
150150
<ConformanceMode>true</ConformanceMode>
151+
<LanguageStandard>stdcpp17</LanguageStandard>
151152
</ClCompile>
152153
<ResourceCompile>
153154
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -179,7 +180,7 @@
179180
<ClCompile>
180181
<Optimization>Disabled</Optimization>
181182
<AdditionalIncludeDirectories>../../Lib/libogg/include;../../Lib/libvorbis/include;../../Lib/LeapSDK/include;../../Lib/zlib;../../Lib/lpng;../../Lib/ljpeg;../../Lib/openal/win32;../../source;../../source/persistence/rapidjson/include;../../source/persistence/libjson;../../source/testing/googleTest;../../source/testing/googleTest/include;../../source/spine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
182-
<PreprocessorDefinitions>TORQUE_DEBUG;TORQUE_DEBUG_GUARD;_CRT_SECURE_NO_DEPRECATE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
183+
<PreprocessorDefinitions>TORQUE_DEBUG;TORQUE_DEBUG_GUARD;_CRT_SECURE_NO_DEPRECATE;UNICODE;_HAS_STD_BYTE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
183184
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
184185
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
185186
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
@@ -198,6 +199,7 @@
198199
<ShowIncludes>false</ShowIncludes>
199200
<FunctionLevelLinking>true</FunctionLevelLinking>
200201
<ConformanceMode>true</ConformanceMode>
202+
<LanguageStandard>stdcpp17</LanguageStandard>
201203
</ClCompile>
202204
<ResourceCompile>
203205
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -230,7 +232,7 @@
230232
<Optimization>MinSpace</Optimization>
231233
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
232234
<AdditionalIncludeDirectories>../../Lib/libogg/include;../../Lib/libvorbis/include;../../Lib/LeapSDK/include;../../Lib/zlib;../../Lib/lpng;../../Lib/ljpeg;../../Lib/openal/win32;../../source;../../source/persistence/rapidjson/include;../../source/persistence/libjson;../../source/testing/googleTest;../../source/testing/googleTest/include;../../source/spine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
233-
<PreprocessorDefinitions>UNICODE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
235+
<PreprocessorDefinitions>UNICODE;_CRT_SECURE_NO_DEPRECATE;_HAS_STD_BYTE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
234236
<StringPooling>true</StringPooling>
235237
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
236238
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -248,6 +250,7 @@
248250
<MultiProcessorCompilation>true</MultiProcessorCompilation>
249251
<DisableSpecificWarnings>4800;4100;4127;4512</DisableSpecificWarnings>
250252
<ConformanceMode>true</ConformanceMode>
253+
<LanguageStandard>stdcpp17</LanguageStandard>
251254
</ClCompile>
252255
<ResourceCompile>
253256
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -291,7 +294,7 @@
291294
<Optimization>MinSpace</Optimization>
292295
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
293296
<AdditionalIncludeDirectories>../../Lib/libogg/include;../../Lib/libvorbis/include;../../Lib/LeapSDK/include;../../Lib/zlib;../../Lib/lpng;../../Lib/ljpeg;../../Lib/openal/win32;../../source;../../source/persistence/rapidjson/include;../../source/persistence/libjson;../../source/testing/googleTest;../../source/testing/googleTest/include;../../source/spine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
294-
<PreprocessorDefinitions>UNICODE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
297+
<PreprocessorDefinitions>UNICODE;_CRT_SECURE_NO_DEPRECATE;_HAS_STD_BYTE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
295298
<StringPooling>true</StringPooling>
296299
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
297300
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -309,6 +312,7 @@
309312
<MultiProcessorCompilation>true</MultiProcessorCompilation>
310313
<DisableSpecificWarnings>4800;4100;4127;4512</DisableSpecificWarnings>
311314
<ConformanceMode>true</ConformanceMode>
315+
<LanguageStandard>stdcpp17</LanguageStandard>
312316
</ClCompile>
313317
<ResourceCompile>
314318
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -351,7 +355,7 @@
351355
<Optimization>MinSpace</Optimization>
352356
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
353357
<AdditionalIncludeDirectories>../../Lib/LeapSDK/include;../../Lib/zlib;../../Lib/lpng;../../Lib/ljpeg;../../Lib/openal/win32;../../Source;../../Source/persistence/rapidjson/include;../../Source/persistence/libjson;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
354-
<PreprocessorDefinitions>TORQUE_SHIPPING;UNICODE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
358+
<PreprocessorDefinitions>TORQUE_SHIPPING;UNICODE;_CRT_SECURE_NO_DEPRECATE;_HAS_STD_BYTE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
355359
<StringPooling>true</StringPooling>
356360
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
357361
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -369,6 +373,7 @@
369373
<MultiProcessorCompilation>true</MultiProcessorCompilation>
370374
<DisableSpecificWarnings>4800;4100;4127;4512</DisableSpecificWarnings>
371375
<ConformanceMode>true</ConformanceMode>
376+
<LanguageStandard>stdcpp17</LanguageStandard>
372377
</ClCompile>
373378
<ResourceCompile>
374379
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -412,7 +417,7 @@
412417
<Optimization>MinSpace</Optimization>
413418
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
414419
<AdditionalIncludeDirectories>../../Lib/LeapSDK/include;../../Lib/zlib;../../Lib/lpng;../../Lib/ljpeg;../../Lib/openal/win32;../../Source;../../Source/persistence/rapidjson/include;../../Source/persistence/libjson;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
415-
<PreprocessorDefinitions>TORQUE_SHIPPING;UNICODE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
420+
<PreprocessorDefinitions>TORQUE_SHIPPING;UNICODE;_CRT_SECURE_NO_DEPRECATE;_HAS_STD_BYTE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
416421
<StringPooling>true</StringPooling>
417422
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
418423
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -430,6 +435,7 @@
430435
<MultiProcessorCompilation>true</MultiProcessorCompilation>
431436
<DisableSpecificWarnings>4800;4100;4127;4512</DisableSpecificWarnings>
432437
<ConformanceMode>true</ConformanceMode>
438+
<LanguageStandard>stdcpp17</LanguageStandard>
433439
</ClCompile>
434440
<ResourceCompile>
435441
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

engine/source/testing/googleTest/CHANGES

Lines changed: 0 additions & 130 deletions
This file was deleted.

0 commit comments

Comments
 (0)