compilation fix after r61232

[wxWidgets.git] / samples / ownerdrw / ownerdrw_vc7.vcproj

diff --git a/samples/ownerdrw/ownerdrw_vc7.vcproj b/samples/ownerdrw/ownerdrw_vc7.vcproj
index 2d98bb606bd4f631539fb25ee917f8fbaa382046..d7adbe12f687ea2ce81bab0142c3337aaad166fa 100644 (file)
--- a/samples/ownerdrw/ownerdrw_vc7.vcproj
+++ b/samples/ownerdrw/ownerdrw_vc7.vcproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <!--\r
 \r
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <!--\r
 \r

-  This makefile was generated by\r
-  Bakefile 0.2.5 (http://www.bakefile.org)\r
+  This project was generated by\r
+  Bakefile 0.2.6 (http://www.bakefile.org)\r

   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r


@@ -17,24 +17,26 @@
        </Platforms>\r
        <Configurations>\r
                <Configuration\r
        </Platforms>\r
        <Configurations>\r
                <Configuration\r

-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivudll"\r
-                       IntermediateDirectory="vc_mswunivudll\ownerdrw"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="vc_mswud"\r
+                       IntermediateDirectory="vc_mswud\ownerdrw"\r

                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        CharacterSet="1">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        CharacterSet="1">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r

-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r

                                ExceptionHandling="TRUE"\r
                                ExceptionHandling="TRUE"\r

-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r

                                RuntimeTypeInfo="TRUE"\r
                                RuntimeTypeInfo="TRUE"\r

-                               AssemblerListingLocation="vc_mswunivudll\ownerdrw\"\r
-                               ObjectFile="vc_mswunivudll\ownerdrw\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\ownerdrw.pdb"\r
+                               ObjectFile="vc_mswud\ownerdrw\"\r
+                               ProgramDataBaseFileName="vc_mswud\ownerdrw.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r


@@ -44,17 +46,19 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r

-                               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"\r
-                               OutputFile="vc_mswunivudll\ownerdrw.exe"\r
+                               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"\r
+                               OutputFile="vc_mswud\ownerdrw.exe"\r

                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r

-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r

                                GenerateDebugInformation="TRUE"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="vc_mswunivudll\ownerdrw.pdb"\r
+                               ProgramDatabaseFile="vc_mswud\ownerdrw.pdb"\r

                                SubSystem="2"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                SubSystem="2"\r
                                TargetMachine="1"/>\r
                        <Tool\r

-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>\r

                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r


@@ -63,9 +67,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>\r

                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r


@@ -78,27 +82,23 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r

-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivuddll"\r
-                       IntermediateDirectory="vc_mswunivuddll\ownerdrw"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="vc_mswu"\r
+                       IntermediateDirectory="vc_mswu\ownerdrw"\r

                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        CharacterSet="1">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        CharacterSet="1">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r

-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r

                                ExceptionHandling="TRUE"\r
                                ExceptionHandling="TRUE"\r

-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r

                                RuntimeTypeInfo="TRUE"\r
                                RuntimeTypeInfo="TRUE"\r

-                               AssemblerListingLocation="vc_mswunivuddll\ownerdrw\"\r
-                               ObjectFile="vc_mswunivuddll\ownerdrw\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\ownerdrw.pdb"\r
+                               ObjectFile="vc_mswu\ownerdrw\"\r
+                               ProgramDataBaseFileName="vc_mswu\ownerdrw.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r


@@ -108,17 +108,19 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r

-                               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"\r
-                               OutputFile="vc_mswunivuddll\ownerdrw.exe"\r
+                               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"\r
+                               OutputFile="vc_mswu\ownerdrw.exe"\r

                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r

-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r

                                GenerateDebugInformation="TRUE"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="vc_mswunivuddll\ownerdrw.pdb"\r
+                               ProgramDatabaseFile="vc_mswu\ownerdrw.pdb"\r

                                SubSystem="2"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                SubSystem="2"\r
                                TargetMachine="1"/>\r
                        <Tool\r

-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>\r

                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r


@@ -127,9 +129,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>\r

                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r


@@ -142,24 +144,26 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r

-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="vc_mswudll"\r
-                       IntermediateDirectory="vc_mswudll\ownerdrw"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivud"\r
+                       IntermediateDirectory="vc_mswunivud\ownerdrw"\r

                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        CharacterSet="1">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        CharacterSet="1">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r

-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r

                                ExceptionHandling="TRUE"\r
                                ExceptionHandling="TRUE"\r

-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r

                                RuntimeTypeInfo="TRUE"\r
                                RuntimeTypeInfo="TRUE"\r

-                               AssemblerListingLocation="vc_mswudll\ownerdrw\"\r
-                               ObjectFile="vc_mswudll\ownerdrw\"\r
-                               ProgramDataBaseFileName="vc_mswudll\ownerdrw.pdb"\r
+                               ObjectFile="vc_mswunivud\ownerdrw\"\r
+                               ProgramDataBaseFileName="vc_mswunivud\ownerdrw.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r


@@ -169,17 +173,19 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r

-                               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"\r
-                               OutputFile="vc_mswudll\ownerdrw.exe"\r
+                               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"\r
+                               OutputFile="vc_mswunivud\ownerdrw.exe"\r

                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r

-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r

                                GenerateDebugInformation="TRUE"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="vc_mswudll\ownerdrw.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivud\ownerdrw.pdb"\r

                                SubSystem="2"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                SubSystem="2"\r
                                TargetMachine="1"/>\r
                        <Tool\r

-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r

                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r


@@ -188,9 +194,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r

                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r


@@ -203,27 +209,23 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r

-                       Name="DLL Debug|Win32"\r
-                       OutputDirectory="vc_mswuddll"\r
-                       IntermediateDirectory="vc_mswuddll\ownerdrw"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivu"\r
+                       IntermediateDirectory="vc_mswunivu\ownerdrw"\r

                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        CharacterSet="1">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        CharacterSet="1">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r

-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r

                                ExceptionHandling="TRUE"\r
                                ExceptionHandling="TRUE"\r

-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r

                                RuntimeTypeInfo="TRUE"\r
                                RuntimeTypeInfo="TRUE"\r

-                               AssemblerListingLocation="vc_mswuddll\ownerdrw\"\r
-                               ObjectFile="vc_mswuddll\ownerdrw\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\ownerdrw.pdb"\r
+                               ObjectFile="vc_mswunivu\ownerdrw\"\r
+                               ProgramDataBaseFileName="vc_mswunivu\ownerdrw.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r


@@ -233,17 +235,19 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r

-                               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"\r
-                               OutputFile="vc_mswuddll\ownerdrw.exe"\r
+                               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"\r
+                               OutputFile="vc_mswunivu\ownerdrw.exe"\r

                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r

-                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r

                                GenerateDebugInformation="TRUE"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="vc_mswuddll\ownerdrw.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivu\ownerdrw.pdb"\r

                                SubSystem="2"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                SubSystem="2"\r
                                TargetMachine="1"/>\r
                        <Tool\r

-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r

                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r


@@ -252,9 +256,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r

                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r


@@ -267,24 +271,26 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r

-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivu"\r
-                       IntermediateDirectory="vc_mswunivu\ownerdrw"\r
+                       Name="DLL Debug|Win32"\r
+                       OutputDirectory="vc_mswuddll"\r
+                       IntermediateDirectory="vc_mswuddll\ownerdrw"\r

                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        CharacterSet="1">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        CharacterSet="1">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r

-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r

                                ExceptionHandling="TRUE"\r
                                ExceptionHandling="TRUE"\r

-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r

                                RuntimeTypeInfo="TRUE"\r
                                RuntimeTypeInfo="TRUE"\r

-                               AssemblerListingLocation="vc_mswunivu\ownerdrw\"\r
-                               ObjectFile="vc_mswunivu\ownerdrw\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\ownerdrw.pdb"\r
+                               ObjectFile="vc_mswuddll\ownerdrw\"\r
+                               ProgramDataBaseFileName="vc_mswuddll\ownerdrw.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r


@@ -294,17 +300,19 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r

-                               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"\r
-                               OutputFile="vc_mswunivu\ownerdrw.exe"\r
+                               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"\r
+                               OutputFile="vc_mswuddll\ownerdrw.exe"\r

                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r

-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r

                                GenerateDebugInformation="TRUE"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="vc_mswunivu\ownerdrw.pdb"\r
+                               ProgramDatabaseFile="vc_mswuddll\ownerdrw.pdb"\r

                                SubSystem="2"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                SubSystem="2"\r
                                TargetMachine="1"/>\r
                        <Tool\r

-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>\r

                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r


@@ -313,9 +321,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>\r

                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r


@@ -328,27 +336,23 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r

-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivud"\r
-                       IntermediateDirectory="vc_mswunivud\ownerdrw"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="vc_mswudll"\r
+                       IntermediateDirectory="vc_mswudll\ownerdrw"\r

                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        CharacterSet="1">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        CharacterSet="1">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r

-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

                                ExceptionHandling="TRUE"\r
                                ExceptionHandling="TRUE"\r

-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r

                                RuntimeTypeInfo="TRUE"\r
                                RuntimeTypeInfo="TRUE"\r

-                               AssemblerListingLocation="vc_mswunivud\ownerdrw\"\r
-                               ObjectFile="vc_mswunivud\ownerdrw\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\ownerdrw.pdb"\r
+                               ObjectFile="vc_mswudll\ownerdrw\"\r
+                               ProgramDataBaseFileName="vc_mswudll\ownerdrw.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r


@@ -358,17 +362,19 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r

-                               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"\r
-                               OutputFile="vc_mswunivud\ownerdrw.exe"\r
+                               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"\r
+                               OutputFile="vc_mswudll\ownerdrw.exe"\r

                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r

-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r

                                GenerateDebugInformation="TRUE"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="vc_mswunivud\ownerdrw.pdb"\r
+                               ProgramDatabaseFile="vc_mswudll\ownerdrw.pdb"\r

                                SubSystem="2"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                SubSystem="2"\r
                                TargetMachine="1"/>\r
                        <Tool\r

-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>\r

                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r


@@ -377,9 +383,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>\r

                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r


@@ -392,24 +398,26 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r

-                       Name="Release|Win32"\r
-                       OutputDirectory="vc_mswu"\r
-                       IntermediateDirectory="vc_mswu\ownerdrw"\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivuddll"\r
+                       IntermediateDirectory="vc_mswunivuddll\ownerdrw"\r

                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        CharacterSet="1">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        CharacterSet="1">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r

-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               MinimalRebuild="TRUE"\r

                                ExceptionHandling="TRUE"\r
                                ExceptionHandling="TRUE"\r

-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r

                                RuntimeTypeInfo="TRUE"\r
                                RuntimeTypeInfo="TRUE"\r

-                               AssemblerListingLocation="vc_mswu\ownerdrw\"\r
-                               ObjectFile="vc_mswu\ownerdrw\"\r
-                               ProgramDataBaseFileName="vc_mswu\ownerdrw.pdb"\r
+                               ObjectFile="vc_mswunivuddll\ownerdrw\"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\ownerdrw.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r


@@ -419,17 +427,19 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r

-                               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"\r
-                               OutputFile="vc_mswu\ownerdrw.exe"\r
+                               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"\r
+                               OutputFile="vc_mswunivuddll\ownerdrw.exe"\r

                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r

-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r

                                GenerateDebugInformation="TRUE"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="vc_mswu\ownerdrw.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivuddll\ownerdrw.pdb"\r

                                SubSystem="2"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                SubSystem="2"\r
                                TargetMachine="1"/>\r
                        <Tool\r

-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r

                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r


@@ -438,9 +448,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r

                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r


@@ -453,27 +463,23 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r

-                       Name="Debug|Win32"\r
-                       OutputDirectory="vc_mswud"\r
-                       IntermediateDirectory="vc_mswud\ownerdrw"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivudll"\r
+                       IntermediateDirectory="vc_mswunivudll\ownerdrw"\r

                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        CharacterSet="1">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        CharacterSet="1">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r

-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

                                ExceptionHandling="TRUE"\r
                                ExceptionHandling="TRUE"\r

-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r

                                RuntimeTypeInfo="TRUE"\r
                                RuntimeTypeInfo="TRUE"\r

-                               AssemblerListingLocation="vc_mswud\ownerdrw\"\r
-                               ObjectFile="vc_mswud\ownerdrw\"\r
-                               ProgramDataBaseFileName="vc_mswud\ownerdrw.pdb"\r
+                               ObjectFile="vc_mswunivudll\ownerdrw\"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\ownerdrw.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r


@@ -483,17 +489,19 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r

-                               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"\r
-                               OutputFile="vc_mswud\ownerdrw.exe"\r
+                               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"\r
+                               OutputFile="vc_mswunivudll\ownerdrw.exe"\r

                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r

-                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r

                                GenerateDebugInformation="TRUE"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="vc_mswud\ownerdrw.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivudll\ownerdrw.pdb"\r

                                SubSystem="2"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                SubSystem="2"\r
                                TargetMachine="1"/>\r
                        <Tool\r

-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r

                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r


@@ -502,9 +510,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r

                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r