No real changes, just convert a Mac-specific file to UTF-8.

[wxWidgets.git] / samples / artprov / artprov_vc7.vcproj

diff --git a/samples/artprov/artprov_vc7.vcproj b/samples/artprov/artprov_vc7.vcproj
index ad69f21a14893513c05f7fc15a694a8a5f3bc8c7..e021ebe7623183cd7fb503c45320ad23d90d5476 100644 (file)
--- a/samples/artprov/artprov_vc7.vcproj
+++ b/samples/artprov/artprov_vc7.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.8 (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


@@ -93,7 +93,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r

-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH"\r

                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r


@@ -110,16 +110,18 @@
                                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_mswu\arttest.exe"\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_mswu\arttest.exe"\r

-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r

                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\arttest.pdb"\r
                                SubSystem="2"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswu\arttest.pdb"\r
                                SubSystem="2"\r

-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r

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

-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH"\r

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


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

-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH"\r

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


@@ -220,7 +222,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r

-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;_WINDOWS;NOPCH"\r

                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r


@@ -237,16 +239,18 @@
                                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_mswunivu\arttest.exe"\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_mswunivu\arttest.exe"\r

-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r

                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\arttest.pdb"\r
                                SubSystem="2"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivu\arttest.pdb"\r
                                SubSystem="2"\r

-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r

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

-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;_WINDOWS;NOPCH"\r

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


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

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

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


@@ -347,7 +351,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r

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

                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r


@@ -364,16 +368,18 @@
                                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\arttest.exe"\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\arttest.exe"\r

-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r

                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\arttest.pdb"\r
                                SubSystem="2"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswudll\arttest.pdb"\r
                                SubSystem="2"\r

-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r

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

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

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


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

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

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


@@ -474,7 +480,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r

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

                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r


@@ -491,16 +497,18 @@
                                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\arttest.exe"\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\arttest.exe"\r

-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r

                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\arttest.pdb"\r
                                SubSystem="2"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="vc_mswunivudll\arttest.pdb"\r
                                SubSystem="2"\r

-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r

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

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

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


@@ -510,7 +518,7 @@
                                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="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r

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