0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enable remaining tests.

Browse source 
Move util.cpp from wesnothlib to wesnoth and define a preprocessor
symbol to escape a duplicate reference.
This commit is contained in:
Anonymissimus 2011-11-28 15:52:23 +00:00
parent 39377b6479
commit 0bfd31b17d
2 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
projectfiles/VC9/wesnoth.vcproj
View file

@ -359,7 +359,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\src"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_PYTHON;USE_GZIP;NO_HAVE_FRIBIDI;NOMINMAX;_SCL_SECURE_NO_WARNINGS;DEBUG_LUA"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_PYTHON;USE_GZIP;NO_HAVE_FRIBIDI;NOMINMAX;_SCL_SECURE_NO_WARNINGS;DEBUG_LUA;MSVC_DO_UNIT_TESTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@ -441,7 +441,7 @@
EnableIntrinsicFunctions="true"
WholeProgramOptimization="false"
AdditionalIncludeDirectories="..\..\src"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_PYTHON;USE_GZIP;NO_HAVE_FRIBIDI;NOMINMAX;_SCL_SECURE_NO_WARNINGS"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_PYTHON;USE_GZIP;NO_HAVE_FRIBIDI;NOMINMAX;_SCL_SECURE_NO_WARNINGS;MSVC_DO_UNIT_TESTS"
MinimalRebuild="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@ -13483,7 +13483,6 @@
</FileConfiguration>
<FileConfiguration
Name="Test_Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@ -13492,7 +13491,6 @@
</FileConfiguration>
<FileConfiguration
Name="Test_Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@ -13765,7 +13763,6 @@
</FileConfiguration>
<FileConfiguration
Name="Test_Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@ -13774,7 +13771,6 @@
</FileConfiguration>
<FileConfiguration
Name="Test_Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@ -15823,6 +15819,10 @@
RelativePath="..\..\src\unit_types.hpp"
>
</File>
<File
RelativePath="..\..\src\util.cpp"
>
</File>
<File
RelativePath="..\..\src\util.hpp"
>

8
projectfiles/VC9/wesnothlib.vcproj
View file

@ -373,14 +373,6 @@
RelativePath="..\..\src\tstring.hpp"
>
</File>
<File
RelativePath="..\..\src\util.cpp"
>
</File>
<File
RelativePath="..\..\src\util.hpp"
>
</File>
<File
RelativePath="..\..\src\version.cpp"
>