Make a couple virtuals protected so they can be overridden.

[wxWidgets.git] / samples / render / render_vc7_renddll.vcproj

diff --git a/samples/render/render_vc7_renddll.vcproj b/samples/render/render_vc7_renddll.vcproj
index 24317684a4a1f1c077590430ac7cc7a327a2e07e..dad61d743b12e162ab1d1ab3e178653765ecfb22 100644 (file)
--- a/samples/render/render_vc7_renddll.vcproj
+++ b/samples/render/render_vc7_renddll.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
 <!--\r
 \r
   This project was generated by\r

-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.9 (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


@@ -36,7 +36,7 @@
                                BufferSecurityCheck="TRUE"\r
                                RuntimeTypeInfo="TRUE"\r
                                ObjectFile="vc_mswuddll\renddll\"\r
                                BufferSecurityCheck="TRUE"\r
                                RuntimeTypeInfo="TRUE"\r
                                ObjectFile="vc_mswuddll\renddll\"\r

-                               ProgramDataBaseFileName="vc_mswuddll\renddll_mswud291_vc.pdb"\r
+                               ProgramDataBaseFileName="vc_mswuddll\renddll_mswud294_vc.pdb"\r

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


@@ -47,12 +47,12 @@
                                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 wininet.lib"\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 wininet.lib"\r

-                               OutputFile="vc_mswuddll\renddll_mswud291_vc.dll"\r
+                               OutputFile="vc_mswuddll\renddll_mswud294_vc.dll"\r

                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="vc_mswuddll\renddll_mswud291_vc.pdb"\r
+                               ProgramDatabaseFile="vc_mswuddll\renddll_mswud294_vc.pdb"\r

                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r


@@ -92,12 +92,12 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include"\r

-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL"\r

                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                ObjectFile="vc_mswudll\renddll\"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                ObjectFile="vc_mswudll\renddll\"\r

-                               ProgramDataBaseFileName="vc_mswudll\renddll_mswu291_vc.pdb"\r
+                               ProgramDataBaseFileName="vc_mswudll\renddll_mswu294_vc.pdb"\r

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


@@ -108,16 +108,18 @@
                                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 wininet.lib"\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 wininet.lib"\r

-                               OutputFile="vc_mswudll\renddll_mswu291_vc.dll"\r
-                               LinkIncremental="2"\r
+                               OutputFile="vc_mswudll\renddll_mswu294_vc.dll"\r
+                               LinkIncremental="1"\r

                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="vc_mswudll\renddll_mswu291_vc.pdb"\r
-                               TargetMachine="1"/>\r
+                               ProgramDatabaseFile="vc_mswudll\renddll_mswu294_vc.pdb"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r

                        <Tool\r
                                Name="VCMIDLTool"\r
                        <Tool\r
                                Name="VCMIDLTool"\r

-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL"\r

                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r


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

-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL"\r

                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include"/>\r
                        <Tool\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include"/>\r
                        <Tool\r


@@ -161,7 +163,7 @@
                                BufferSecurityCheck="TRUE"\r
                                RuntimeTypeInfo="TRUE"\r
                                ObjectFile="vc_mswunivuddll\renddll\"\r
                                BufferSecurityCheck="TRUE"\r
                                RuntimeTypeInfo="TRUE"\r
                                ObjectFile="vc_mswunivuddll\renddll\"\r

-                               ProgramDataBaseFileName="vc_mswunivuddll\renddll_mswunivud291_vc.pdb"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\renddll_mswunivud294_vc.pdb"\r

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


@@ -172,12 +174,12 @@
                                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 wininet.lib"\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 wininet.lib"\r

-                               OutputFile="vc_mswunivuddll\renddll_mswunivud291_vc.dll"\r
+                               OutputFile="vc_mswunivuddll\renddll_mswunivud294_vc.dll"\r

                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="vc_mswunivuddll\renddll_mswunivud291_vc.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivuddll\renddll_mswunivud294_vc.pdb"\r

                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r


@@ -217,12 +219,12 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include"\r

-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL"\r

                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                ObjectFile="vc_mswunivudll\renddll\"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                ObjectFile="vc_mswunivudll\renddll\"\r

-                               ProgramDataBaseFileName="vc_mswunivudll\renddll_mswunivu291_vc.pdb"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\renddll_mswunivu294_vc.pdb"\r

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


@@ -233,16 +235,18 @@
                                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 wininet.lib"\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 wininet.lib"\r

-                               OutputFile="vc_mswunivudll\renddll_mswunivu291_vc.dll"\r
-                               LinkIncremental="2"\r
+                               OutputFile="vc_mswunivudll\renddll_mswunivu294_vc.dll"\r
+                               LinkIncremental="1"\r

                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="vc_mswunivudll\renddll_mswunivu291_vc.pdb"\r
-                               TargetMachine="1"/>\r
+                               ProgramDatabaseFile="vc_mswunivudll\renddll_mswunivu294_vc.pdb"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r

                        <Tool\r
                                Name="VCMIDLTool"\r
                        <Tool\r
                                Name="VCMIDLTool"\r

-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL"\r

                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r


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

-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL"\r

                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include"/>\r
                        <Tool\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include"/>\r
                        <Tool\r