Move a bunch of project properties for respack into VSProps files:

* Support picking up wx from $solution/wxlib/ location
 * Use standard_outdirs
 * Move post-build resource-packing event into new VSProps

Originally committed to SVN as r3275.
This commit is contained in:
Niels Martin Hansen 2009-07-25 17:13:10 +00:00
parent 23767950a9
commit 966f88e577
2 changed files with 91 additions and 84 deletions

View file

@ -21,9 +21,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="..\build\aegisub_vs2008\libraries_outdirs.vsprops;..\build\aegisub_vs2008\wxlib_include.vsprops;..\build\aegisub_vs2008\wxlib_lib32.vsprops;.\common_respack_packresources.vsprops"
CharacterSet="1"
>
<Tool
@ -63,6 +62,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)/respack.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
@ -88,89 +88,12 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="$(TargetPath) $(SolutionDir)\..\..\src\libresrc\libresrc.cpp $(SolutionDir)\..\..\src\bitmaps\16 $(SolutionDir)\..\..\src\bitmaps\24 $(SolutionDir)\..\..\src\bitmaps\misc"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="$(TargetPath) $(SolutionDir)\..\..\src\libresrc\libresrc.cpp $(SolutionDir)\..\..\src\bitmaps\16 $(SolutionDir)\..\..\src\bitmaps\24 $(SolutionDir)\..\..\src\bitmaps\misc"
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="..\build\aegisub_vs2008\libraries_outdirs.vsprops;..\build\aegisub_vs2008\wxlib_include.vsprops;..\build\aegisub_vs2008\wxlib_lib64.vsprops;.\common_respack_packresources.vsprops"
CharacterSet="1"
>
<Tool
@ -211,6 +134,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)/respack.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
@ -236,14 +160,86 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="$(TargetPath) $(SolutionDir)\..\..\src\libresrc\libresrc.cpp $(SolutionDir)\..\..\src\bitmaps\16 $(SolutionDir)\..\..\src\bitmaps\24 $(SolutionDir)\..\..\src\bitmaps\misc"
/>
</Configuration>
<Configuration
Name="Release|Win32"
ConfigurationType="1"
InheritedPropertySheets="..\build\aegisub_vs2008\libraries_outdirs.vsprops;..\build\aegisub_vs2008\wxlib_include.vsprops;..\build\aegisub_vs2008\wxlib_lib32.vsprops;.\common_respack_packresources.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)/respack.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="..\build\aegisub_vs2008\libraries_outdirs.vsprops;..\build\aegisub_vs2008\wxlib_include.vsprops;..\build\aegisub_vs2008\wxlib_lib64.vsprops;.\common_respack_packresources.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@ -285,6 +281,7 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)/respack.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
@ -312,7 +309,6 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="$(TargetPath) $(SolutionDir)\..\..\src\libresrc\libresrc.cpp $(SolutionDir)\..\..\src\bitmaps\16 $(SolutionDir)\..\..\src\bitmaps\24 $(SolutionDir)\..\..\src\bitmaps\misc"
/>
</Configuration>
</Configurations>

View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
Name="common_respack_packresources"
>
<Tool
Name="VCPostBuildEventTool"
CommandLine="$(TargetPath) &quot;$(ProjectDir)\..\src\libresrc\libresrc.cpp&quot; &quot;$(ProjectDir)\..\src\bitmaps\16&quot; &quot;$(ProjectDir)\..\src\bitmaps\24&quot; &quot;$(ProjectDir)\..\src\bitmaps\misc&quot;"
/>
</VisualStudioPropertySheet>