X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b44f5137ce562c2c281542b09f2ed6379dcbf00b..961f4d0ce6fb0478c2850d2da37e072d8636639a:/utils/emulator/src/emulator_vc8.vcproj

diff --git a/utils/emulator/src/emulator_vc8.vcproj b/utils/emulator/src/emulator_vc8.vcproj
index f9f5b91c1b..da755ef9a4 100644
--- a/utils/emulator/src/emulator_vc8.vcproj
+++ b/utils/emulator/src/emulator_vc8.vcproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <!--
 
-  This makefile was generated by
-  Bakefile 0.2.5 (http://www.bakefile.org)
+  This project was generated by
+  Bakefile 0.2.8 (http://www.bakefile.org)
   Do not modify, all changes will be overwritten!
 
 -->
@@ -22,9 +22,9 @@
 	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="DLL Universal Release|Win32"
-			OutputDirectory="vc_mswunivudll"
-			IntermediateDirectory="vc_mswunivudll\wxemulator"
+			Name="Debug|Win32"
+			OutputDirectory="vc_mswud"
+			IntermediateDirectory="vc_mswud\wxemulator"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -44,18 +44,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+				AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+				MinimalRebuild="true"
 				ExceptionHandling="1"
-				RuntimeLibrary="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivudll\wxemulator\"
-				ObjectFile="vc_mswunivudll\wxemulator\"
-				ProgramDataBaseFileName="vc_mswunivudll\wxemulator.pdb"
+				ObjectFile="vc_mswud\wxemulator\"
+				ProgramDataBaseFileName="vc_mswud\wxemulator.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -66,9 +70,9 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
+				AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -76,14 +80,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-				OutputFile="vc_mswunivudll\wxemulator.exe"
+				AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib     kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswud\wxemulator.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
+				AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswunivudll\wxemulator.pdb"
+				ProgramDatabaseFile="vc_mswud\wxemulator.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -98,7 +102,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswunivudll\emulator_vc8.bsc"
+				OutputFile="vc_mswud\emulator_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -115,9 +119,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DLL Universal Debug|Win32"
-			OutputDirectory="vc_mswunivuddll"
-			IntermediateDirectory="vc_mswunivuddll\wxemulator"
+			Name="Release|Win32"
+			OutputDirectory="vc_mswu"
+			IntermediateDirectory="vc_mswu\wxemulator"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -137,21 +141,19 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH"
+				AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-				MinimalRebuild="true"
+				Optimization="2"
+				AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
+				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH"
 				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
+				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivuddll\wxemulator\"
-				ObjectFile="vc_mswunivuddll\wxemulator\"
-				ProgramDataBaseFileName="vc_mswunivuddll\wxemulator.pdb"
+				ObjectFile="vc_mswu\wxemulator\"
+				ProgramDataBaseFileName="vc_mswu\wxemulator.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -162,9 +164,9 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+				AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -172,16 +174,18 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-				OutputFile="vc_mswunivuddll\wxemulator.exe"
-				LinkIncremental="2"
+				AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib     kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswu\wxemulator.exe"
+				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
+				AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswunivuddll\wxemulator.pdb"
+				ProgramDatabaseFile="vc_mswu\wxemulator.pdb"
 				SubSystem="2"
 				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -194,7 +198,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswunivuddll\emulator_vc8.bsc"
+				OutputFile="vc_mswu\emulator_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -211,9 +215,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DLL Release|Win32"
-			OutputDirectory="vc_mswudll"
-			IntermediateDirectory="vc_mswudll\wxemulator"
+			Name="Universal Debug|Win32"
+			OutputDirectory="vc_mswunivud"
+			IntermediateDirectory="vc_mswunivud\wxemulator"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -233,18 +237,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+				AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+				MinimalRebuild="true"
 				ExceptionHandling="1"
-				RuntimeLibrary="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswudll\wxemulator\"
-				ObjectFile="vc_mswudll\wxemulator\"
-				ProgramDataBaseFileName="vc_mswudll\wxemulator.pdb"
+				ObjectFile="vc_mswunivud\wxemulator\"
+				ProgramDataBaseFileName="vc_mswunivud\wxemulator.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -255,9 +263,9 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
+				AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -265,14 +273,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-				OutputFile="vc_mswudll\wxemulator.exe"
+				AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib     kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswunivud\wxemulator.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
+				AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll\wxemulator.pdb"
+				ProgramDatabaseFile="vc_mswunivud\wxemulator.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -287,7 +295,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll\emulator_vc8.bsc"
+				OutputFile="vc_mswunivud\emulator_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -304,9 +312,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DLL Debug|Win32"
-			OutputDirectory="vc_mswuddll"
-			IntermediateDirectory="vc_mswuddll\wxemulator"
+			Name="Universal Release|Win32"
+			OutputDirectory="vc_mswunivu"
+			IntermediateDirectory="vc_mswunivu\wxemulator"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -326,21 +334,19 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;_WINDOWS;NOPCH"
+				AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
-				MinimalRebuild="true"
+				Optimization="2"
+				AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
+				PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;_WINDOWS;NOPCH"
 				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
+				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswuddll\wxemulator\"
-				ObjectFile="vc_mswuddll\wxemulator\"
-				ProgramDataBaseFileName="vc_mswuddll\wxemulator.pdb"
+				ObjectFile="vc_mswunivu\wxemulator\"
+				ProgramDataBaseFileName="vc_mswunivu\wxemulator.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -351,9 +357,9 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;_WINDOWS;NOPCH"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+				AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -361,16 +367,18 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-				OutputFile="vc_mswuddll\wxemulator.exe"
-				LinkIncremental="2"
+				AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib     kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswunivu\wxemulator.exe"
+				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
+				AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll\wxemulator.pdb"
+				ProgramDatabaseFile="vc_mswunivu\wxemulator.pdb"
 				SubSystem="2"
 				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -383,7 +391,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll\emulator_vc8.bsc"
+				OutputFile="vc_mswunivu\emulator_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -400,9 +408,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Universal Release|Win32"
-			OutputDirectory="vc_mswunivu"
-			IntermediateDirectory="vc_mswunivu\wxemulator"
+			Name="DLL Debug|Win32"
+			OutputDirectory="vc_mswuddll"
+			IntermediateDirectory="vc_mswuddll\wxemulator"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -422,18 +430,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+				AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+				MinimalRebuild="true"
 				ExceptionHandling="1"
-				RuntimeLibrary="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivu\wxemulator\"
-				ObjectFile="vc_mswunivu\wxemulator\"
-				ProgramDataBaseFileName="vc_mswunivu\wxemulator.pdb"
+				ObjectFile="vc_mswuddll\wxemulator\"
+				ProgramDataBaseFileName="vc_mswuddll\wxemulator.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -444,9 +456,9 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
+				AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -454,14 +466,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-				OutputFile="vc_mswunivu\wxemulator.exe"
+				AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib     kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswuddll\wxemulator.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
+				AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswunivu\wxemulator.pdb"
+				ProgramDatabaseFile="vc_mswuddll\wxemulator.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -476,7 +488,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswunivu\emulator_vc8.bsc"
+				OutputFile="vc_mswuddll\emulator_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -493,9 +505,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Universal Debug|Win32"
-			OutputDirectory="vc_mswunivud"
-			IntermediateDirectory="vc_mswunivud\wxemulator"
+			Name="DLL Release|Win32"
+			OutputDirectory="vc_mswudll"
+			IntermediateDirectory="vc_mswudll\wxemulator"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -515,21 +527,19 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+				AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
-				MinimalRebuild="true"
+				Optimization="2"
+				AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
+				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
 				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
+				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivud\wxemulator\"
-				ObjectFile="vc_mswunivud\wxemulator\"
-				ProgramDataBaseFileName="vc_mswunivud\wxemulator.pdb"
+				ObjectFile="vc_mswudll\wxemulator\"
+				ProgramDataBaseFileName="vc_mswudll\wxemulator.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -540,9 +550,9 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+				AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -550,16 +560,18 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-				OutputFile="vc_mswunivud\wxemulator.exe"
-				LinkIncremental="2"
+				AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib     kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswudll\wxemulator.exe"
+				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
+				AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswunivud\wxemulator.pdb"
+				ProgramDatabaseFile="vc_mswudll\wxemulator.pdb"
 				SubSystem="2"
 				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -572,7 +584,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswunivud\emulator_vc8.bsc"
+				OutputFile="vc_mswudll\emulator_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -589,9 +601,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="vc_mswu"
-			IntermediateDirectory="vc_mswu\wxemulator"
+			Name="DLL Universal Debug|Win32"
+			OutputDirectory="vc_mswunivuddll"
+			IntermediateDirectory="vc_mswunivuddll\wxemulator"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -611,18 +623,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+				AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+				MinimalRebuild="true"
 				ExceptionHandling="1"
-				RuntimeLibrary="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswu\wxemulator\"
-				ObjectFile="vc_mswu\wxemulator\"
-				ProgramDataBaseFileName="vc_mswu\wxemulator.pdb"
+				ObjectFile="vc_mswunivuddll\wxemulator\"
+				ProgramDataBaseFileName="vc_mswunivuddll\wxemulator.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -633,9 +649,9 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
+				AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -643,14 +659,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-				OutputFile="vc_mswu\wxemulator.exe"
+				AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib     kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswunivuddll\wxemulator.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
+				AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu\wxemulator.pdb"
+				ProgramDatabaseFile="vc_mswunivuddll\wxemulator.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -665,7 +681,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu\emulator_vc8.bsc"
+				OutputFile="vc_mswunivuddll\emulator_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -682,9 +698,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="vc_mswud"
-			IntermediateDirectory="vc_mswud\wxemulator"
+			Name="DLL Universal Release|Win32"
+			OutputDirectory="vc_mswunivudll"
+			IntermediateDirectory="vc_mswunivudll\wxemulator"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -704,21 +720,19 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
+				AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
-				MinimalRebuild="true"
+				Optimization="2"
+				AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
+				PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
 				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
+				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswud\wxemulator\"
-				ObjectFile="vc_mswud\wxemulator\"
-				ProgramDataBaseFileName="vc_mswud\wxemulator.pdb"
+				ObjectFile="vc_mswunivudll\wxemulator\"
+				ProgramDataBaseFileName="vc_mswunivudll\wxemulator.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -729,9 +743,9 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
+				AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -739,16 +753,18 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
-				OutputFile="vc_mswud\wxemulator.exe"
-				LinkIncremental="2"
+				AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib     kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswunivudll\wxemulator.exe"
+				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
+				AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud\wxemulator.pdb"
+				ProgramDatabaseFile="vc_mswunivudll\wxemulator.pdb"
 				SubSystem="2"
 				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -761,7 +777,7 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud\emulator_vc8.bsc"
+				OutputFile="vc_mswunivudll\emulator_vc8.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -798,7 +814,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath=".\..\..\..\samples\sample.rc"
+				RelativePath="..\..\..\samples\sample.rc"
 				>
 			</File>
 		</Filter>