Author: anonymissimus
Date: Wed Mar 28 20:15:50 2012
New Revision: 53682
URL: http://svn.gna.org/viewcvs/wesnoth?rev=53682&view=rev
Log:
set MSVC's intermediate output directories correctly
I finally managed to solve the linker warning spam about missing debug
information for liblua. Apparently the file MSVC was looking for was
overwritten by the one for wesnoth wich has the same name. This sets
an individual directory to write it to as it's already done for
wesnothlib. Also, this finally enables me to debug deep down into the
lua upstream source. :)
Also some other mostly warning related adjustments and fixes.
Modified:
trunk/projectfiles/VC9/liblua.vcproj
trunk/projectfiles/VC9/schema_generator.vcproj
trunk/projectfiles/VC9/wesnoth.sln
trunk/projectfiles/VC9/wesnothd.vcproj
trunk/projectfiles/VC9/wesnothlib.vcproj
Modified: trunk/projectfiles/VC9/liblua.vcproj
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/projectfiles/VC9/liblua.vcproj?rev=53682&r1=53681&r2=53682&view=diff
==============================================================================
--- trunk/projectfiles/VC9/liblua.vcproj (original)
+++ trunk/projectfiles/VC9/liblua.vcproj Wed Mar 28 20:15:50 2012
@@ -19,7 +19,7 @@
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\liblua"
ConfigurationType="4"
CharacterSet="1"
>
@@ -111,7 +111,7 @@
EnableFunctionLevelLinking="true"
OpenMP="true"
UsePrecompiledHeader="0"
- WarningLevel="3"
+ WarningLevel="0"
DebugInformationFormat="3"
/>
<Tool
@@ -145,7 +145,7 @@
<Configuration
Name="Debug_with_VLD|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\liblua"
ConfigurationType="4"
CharacterSet="1"
>
@@ -174,7 +174,7 @@
RuntimeLibrary="3"
OpenMP="true"
UsePrecompiledHeader="0"
- WarningLevel="4"
+ WarningLevel="0"
DebugInformationFormat="4"
/>
<Tool
Modified: trunk/projectfiles/VC9/schema_generator.vcproj
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/projectfiles/VC9/schema_generator.vcproj?rev=53682&r1=53681&r2=53682&view=diff
==============================================================================
--- trunk/projectfiles/VC9/schema_generator.vcproj (original)
+++ trunk/projectfiles/VC9/schema_generator.vcproj Wed Mar 28 20:15:50 2012
@@ -18,7 +18,7 @@
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+
IntermediateDirectory="$(ConfigurationName)\schema_generator"
ConfigurationType="1"
CharacterSet="2"
>
@@ -44,8 +44,9 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
- WarningLevel="3"
+ WarningLevel="4"
DebugInformationFormat="4"
+ DisableSpecificWarnings="4127;4512"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -58,7 +59,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libintl.lib SDL.lib
SDL_image.lib SDL_ttf.lib SDL_mixer.lib SDL_net.lib cairo.lib winmm.lib
ws2_32.lib SDLmain.lib pango-1.0.lib pangocairo-1.0.lib gobject-2.0.lib
glib-2.0.lib $(IntDir)\liblua.lib"
+ AdditionalDependencies="libintl.lib SDL.lib
SDL_image.lib SDL_ttf.lib SDL_mixer.lib SDL_net.lib cairo.lib winmm.lib
ws2_32.lib SDLmain.lib pango-1.0.lib pangocairo-1.0.lib gobject-2.0.lib
glib-2.0.lib"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
@@ -129,7 +130,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libintl.lib SDL.lib
SDL_image.lib SDL_ttf.lib SDL_mixer.lib SDL_net.lib cairo.lib winmm.lib
ws2_32.lib SDLmain.lib pango-1.0.lib pangocairo-1.0.lib gobject-2.0.lib
glib-2.0.lib $(IntDir)\liblua.lib"
+ AdditionalDependencies="libintl.lib SDL.lib
SDL_image.lib SDL_ttf.lib SDL_mixer.lib SDL_net.lib cairo.lib winmm.lib
ws2_32.lib SDLmain.lib pango-1.0.lib pangocairo-1.0.lib gobject-2.0.lib
glib-2.0.lib"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
@@ -161,7 +162,7 @@
<Configuration
Name="Debug_with_VLD|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+
IntermediateDirectory="$(ConfigurationName)\schema_generator"
ConfigurationType="1"
CharacterSet="2"
>
@@ -187,8 +188,9 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
- WarningLevel="3"
+ WarningLevel="4"
DebugInformationFormat="4"
+ DisableSpecificWarnings="4127;4512"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -201,7 +203,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libintl.lib SDL.lib
SDL_image.lib SDL_ttf.lib SDL_mixer.lib SDL_net.lib cairo.lib winmm.lib
ws2_32.lib SDLmain.lib pango-1.0.lib pangocairo-1.0.lib gobject-2.0.lib
glib-2.0.lib $(IntDir)\liblua.lib"
+ AdditionalDependencies="libintl.lib SDL.lib
SDL_image.lib SDL_ttf.lib SDL_mixer.lib SDL_net.lib cairo.lib winmm.lib
ws2_32.lib SDLmain.lib pango-1.0.lib pangocairo-1.0.lib gobject-2.0.lib
glib-2.0.lib"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
Modified: trunk/projectfiles/VC9/wesnoth.sln
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/projectfiles/VC9/wesnoth.sln?rev=53682&r1=53681&r2=53682&view=diff
==============================================================================
--- trunk/projectfiles/VC9/wesnoth.sln (original)
+++ trunk/projectfiles/VC9/wesnoth.sln Wed Mar 28 20:15:50 2012
@@ -63,6 +63,7 @@
{9FDDFD0B-C23F-47DB-97F7-7BDCA3E754D9}.Debug
(fast)|Win32.ActiveCfg = Debug|Win32
{9FDDFD0B-C23F-47DB-97F7-7BDCA3E754D9}.Debug_with_VLD|Win32.ActiveCfg =
Debug_with_VLD|Win32
{9FDDFD0B-C23F-47DB-97F7-7BDCA3E754D9}.Debug|Win32.ActiveCfg =
Debug|Win32
+ {9FDDFD0B-C23F-47DB-97F7-7BDCA3E754D9}.Debug|Win32.Build.0 =
Debug|Win32
{9FDDFD0B-C23F-47DB-97F7-7BDCA3E754D9}.Release|Win32.ActiveCfg
= Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
Modified: trunk/projectfiles/VC9/wesnothd.vcproj
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/projectfiles/VC9/wesnothd.vcproj?rev=53682&r1=53681&r2=53682&view=diff
==============================================================================
--- trunk/projectfiles/VC9/wesnothd.vcproj (original)
+++ trunk/projectfiles/VC9/wesnothd.vcproj Wed Mar 28 20:15:50 2012
@@ -175,7 +175,7 @@
<Configuration
Name="Debug_with_VLD|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\wesnothd"
ConfigurationType="1"
CharacterSet="0"
BuildLogFile="$(IntDir)\BuildLog-wesnothd.htm"
Modified: trunk/projectfiles/VC9/wesnothlib.vcproj
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/projectfiles/VC9/wesnothlib.vcproj?rev=53682&r1=53681&r2=53682&view=diff
==============================================================================
--- trunk/projectfiles/VC9/wesnothlib.vcproj (original)
+++ trunk/projectfiles/VC9/wesnothlib.vcproj Wed Mar 28 20:15:50 2012
@@ -146,7 +146,7 @@
<Configuration
Name="Debug_with_VLD|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\wesnothlib"
ConfigurationType="4"
CharacterSet="2"
BuildLogFile="$(IntDir)\BuildLog.htm"
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
