Merge with CatchUnitTesting-fix.
All checks were successful
Emscripten Build / Build_and_Deploy_Web_Build (push) Successful in 8m19s
Emscripten Build / UnitTesting (push) Successful in 7m51s

This commit is contained in:
AMay 2026-05-03 23:51:45 -05:00
commit 13d31b2ebc
2 changed files with 22 additions and 8 deletions

View File

@ -1092,13 +1092,27 @@
</SubType>
</ClCompile>
<ClCompile Include="Spider.cpp" />
<ClCompile Include="tests\BuffTests.cpp" />
<ClCompile Include="tests\EffectTests.cpp" />
<ClCompile Include="tests\EnchantTests.cpp" />
<ClCompile Include="tests\EngineTests.cpp" />
<ClCompile Include="tests\FileTests.cpp" />
<ClCompile Include="tests\GeometryTests.cpp" />
<ClCompile Include="tests\ItemTests.cpp" />
<ClCompile Include="tests\BuffTests.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Desktop|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="tests\EffectTests.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Desktop|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="tests\EnchantTests.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Desktop|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="tests\EngineTests.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Desktop|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="tests\FileTests.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Desktop|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="tests\GeometryTests.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Desktop|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="tests\ItemTests.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Desktop|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="ThunderOrb.cpp" />
<ClCompile Include="TileGroup.cpp" />
<ClCompile Include="Menu.cpp" />

View File

@ -39,7 +39,7 @@ All rights reserved.
#define VERSION_MAJOR 1
#define VERSION_MINOR 3
#define VERSION_PATCH 0
#define VERSION_BUILD 13501
#define VERSION_BUILD 13506
#define stringify(a) stringify_(a)
#define stringify_(a) #a