Removed dummy wxFont == operator implementation (IIRC was needed to compile with...

[wxWidgets.git] / utils / wxrc / wxrc_vc8.vcproj

diff --git a/utils/wxrc/wxrc_vc8.vcproj b/utils/wxrc/wxrc_vc8.vcproj
index 297424344ebfd5104b4a78b1f211424e2d792b49..d2b5c90eda6423d8d2c04018117f5a086232a455 100644 (file)
--- a/utils/wxrc/wxrc_vc8.vcproj
+++ b/utils/wxrc/wxrc_vc8.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
 <!--\r
 \r
   This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  Bakefile 0.2.4 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,57 +43,56 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
                                AssemblerListingLocation="vc_mswunivudll\wxrc\"\r
                                ObjectFile="vc_mswunivudll\wxrc\"\r
                                ProgramDataBaseFileName="vc_mswunivudll\wxrc.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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
                                AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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\wxrc.exe"\r
                                LinkIncremental="2"\r
-                               SubSystem="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswunivudll\wxrc.pdb"\r
+                               SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
@@ -137,57 +136,59 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
                                AssemblerListingLocation="vc_mswunivuddll\wxrc\"\r
                                ObjectFile="vc_mswunivuddll\wxrc\"\r
                                ProgramDataBaseFileName="vc_mswunivuddll\wxrc.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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
                                AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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\wxrc.exe"\r
                                LinkIncremental="2"\r
-                               SubSystem="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswunivuddll\wxrc.pdb"\r
+                               SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
@@ -231,57 +232,56 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
                                AssemblerListingLocation="vc_mswudll\wxrc\"\r
                                ObjectFile="vc_mswudll\wxrc\"\r
                                ProgramDataBaseFileName="vc_mswudll\wxrc.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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
                                AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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\wxrc.exe"\r
                                LinkIncremental="2"\r
-                               SubSystem="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswudll\wxrc.pdb"\r
+                               SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
@@ -325,57 +325,59 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
                                AssemblerListingLocation="vc_mswuddll\wxrc\"\r
                                ObjectFile="vc_mswuddll\wxrc\"\r
                                ProgramDataBaseFileName="vc_mswuddll\wxrc.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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
                                AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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\wxrc.exe"\r
                                LinkIncremental="2"\r
-                               SubSystem="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswuddll\wxrc.pdb"\r
+                               SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
@@ -419,57 +421,56 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
                                AssemblerListingLocation="vc_mswunivu\wxrc\"\r
                                ObjectFile="vc_mswunivu\wxrc\"\r
                                ProgramDataBaseFileName="vc_mswunivu\wxrc.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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
                                AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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\wxrc.exe"\r
                                LinkIncremental="2"\r
-                               SubSystem="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswunivu\wxrc.pdb"\r
+                               SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
@@ -513,57 +514,59 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
                                AssemblerListingLocation="vc_mswunivud\wxrc\"\r
                                ObjectFile="vc_mswunivud\wxrc\"\r
                                ProgramDataBaseFileName="vc_mswunivud\wxrc.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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
                                AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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\wxrc.exe"\r
                                LinkIncremental="2"\r
-                               SubSystem="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswunivud\wxrc.pdb"\r
+                               SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
@@ -607,57 +610,56 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
                                AssemblerListingLocation="vc_mswu\wxrc\"\r
                                ObjectFile="vc_mswu\wxrc\"\r
                                ProgramDataBaseFileName="vc_mswu\wxrc.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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
                                AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29u_xml.lib  wxbase29u.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\wxrc.exe"\r
                                LinkIncremental="2"\r
-                               SubSystem="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswu\wxrc.pdb"\r
+                               SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
@@ -701,57 +703,59 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
                                AssemblerListingLocation="vc_mswud\wxrc\"\r
                                ObjectFile="vc_mswud\wxrc\"\r
                                ProgramDataBaseFileName="vc_mswud\wxrc.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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
                                AdditionalOptions=""\r
+                               AdditionalDependencies="wxbase29ud_xml.lib  wxbase29ud.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\wxrc.exe"\r
                                LinkIncremental="2"\r
-                               SubSystem="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswud\wxrc.pdb"\r
+                               SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
@@ -780,12 +784,13 @@
        <Files>\r
                <Filter\r
                        Name="Source Files"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
                                RelativePath=".\wxrc.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                </Filter>\r
        </Files>\r
        <Globals>\r