X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ece421c6c40b0977dc2a7f91f9eff7234b814dd..2026acc1e228e2d0e23244796bce9aa16f7a4599:/build/msw/wx_vc7_wxexpat.vcproj?ds=sidebyside

diff --git a/build/msw/wx_vc7_wxexpat.vcproj b/build/msw/wx_vc7_wxexpat.vcproj
index 796565a33f..ec6216019c 100644
--- a/build/msw/wx_vc7_wxexpat.vcproj
+++ b/build/msw/wx_vc7_wxexpat.vcproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <!--
 
-  This makefile was generated by
-  Bakefile 0.2.4 (http://www.bakefile.org)
+  This project was generated by
+  Bakefile 0.2.9 (http://www.bakefile.org)
   Do not modify, all changes will be overwritten!
 
 -->
@@ -17,78 +17,25 @@
 	</Platforms>
 	<Configurations>
 		<Configuration
-			Name="DLL Universal Release|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswunivudll\wxexpat"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll"
-				PreprocessorDefinitions="_LIB;COMPILED_FROM_DSP"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="TRUE"
-				AssemblerListingLocation="vc_mswunivudll\wxexpat\"
-				ObjectFile="vc_mswunivudll\wxexpat\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpat.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxexpat.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="COMPILED_FROM_DSP"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="DLL Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswunivuddll\wxexpat"
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswud\wxexpat"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll"
-				PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				RuntimeTypeInfo="TRUE"
-				AssemblerListingLocation="vc_mswunivuddll\wxexpat\"
-				ObjectFile="vc_mswunivuddll\wxexpat\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpatd.pdb"
+				ObjectFile="vc_mswud\wxexpat\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpatd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -97,10 +44,12 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxexpatd.lib"
+				OutputFile="..\..\lib\vc_lib\wxexpatd.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -109,9 +58,9 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"
+				PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll"/>
+				AdditionalIncludeDirectories="..\..\lib\vc_lib"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -124,23 +73,22 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="DLL Release|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswudll\wxexpat"
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswu\wxexpat"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll"
-				PreprocessorDefinitions="_LIB;COMPILED_FROM_DSP"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
-				AssemblerListingLocation="vc_mswudll\wxexpat\"
-				ObjectFile="vc_mswudll\wxexpat\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpat.pdb"
+				ObjectFile="vc_mswu\wxexpat\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpat.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -149,10 +97,12 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxexpat.lib"
+				OutputFile="..\..\lib\vc_lib\wxexpat.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -161,9 +111,9 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="COMPILED_FROM_DSP"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll"/>
+				AdditionalIncludeDirectories="..\..\lib\vc_lib"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -186,14 +136,13 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll"
-				PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				RuntimeTypeInfo="TRUE"
-				AssemblerListingLocation="vc_mswuddll\wxexpat\"
 				ObjectFile="vc_mswuddll\wxexpat\"
 				ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpatd.pdb"
 				WarningLevel="3"
@@ -207,114 +156,9 @@
 				OutputFile="..\..\lib\vc_dll\wxexpatd.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"
-				Culture="1033"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Universal Release|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivu\wxexpat"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib"
-				PreprocessorDefinitions="_LIB;COMPILED_FROM_DSP"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="TRUE"
-				AssemblerListingLocation="vc_mswunivu\wxexpat\"
-				ObjectFile="vc_mswunivu\wxexpat\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpat.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxexpat.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="COMPILED_FROM_DSP"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivud\wxexpat"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib"
-				PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				RuntimeTypeInfo="TRUE"
-				AssemblerListingLocation="vc_mswunivud\wxexpat\"
-				ObjectFile="vc_mswunivud\wxexpat\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpatd.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxexpatd.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -323,9 +167,9 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"
+				PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib"/>
+				AdditionalIncludeDirectories="..\..\lib\vc_dll"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -338,78 +182,22 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswu\wxexpat"
+			Name="DLL Release|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswudll\wxexpat"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib"
-				PreprocessorDefinitions="_LIB;COMPILED_FROM_DSP"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
-				AssemblerListingLocation="vc_mswu\wxexpat\"
-				ObjectFile="vc_mswu\wxexpat\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpat.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxexpat.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="COMPILED_FROM_DSP"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswud\wxexpat"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib"
-				PreprocessorDefinitions="_LIB;_DEBUG;COMPILED_FROM_DSP"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				RuntimeTypeInfo="TRUE"
-				AssemblerListingLocation="vc_mswud\wxexpat\"
-				ObjectFile="vc_mswud\wxexpat\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxexpatd.pdb"
+				ObjectFile="vc_mswudll\wxexpat\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxexpat.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -418,10 +206,12 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxexpatd.lib"
+				OutputFile="..\..\lib\vc_dll\wxexpat.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -430,9 +220,9 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib"/>
+				AdditionalIncludeDirectories="..\..\lib\vc_dll"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool