update wxpresets for new osx_carbon and osx_cocoa names provided by the wx-config...

[wxWidgets.git] / build / msw / wx_vc7_wxzlib.vcproj

diff --git a/build/msw/wx_vc7_wxzlib.vcproj b/build/msw/wx_vc7_wxzlib.vcproj
index 68d1da5a3acf8e554b6aad986eec883c0b5c470e..bc6605ed78f6f30a484b5c8dea1c475cffa67dcc 100644 (file)
--- a/build/msw/wx_vc7_wxzlib.vcproj
+++ b/build/msw/wx_vc7_wxzlib.vcproj
@@ -27,7 +27,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -48,7 +48,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -58,7 +58,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                Culture="1033"\r
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
@@ -83,7 +83,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -101,7 +101,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -111,7 +111,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                Culture="1033"\r
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
@@ -136,7 +136,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -157,7 +157,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -167,7 +167,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                Culture="1033"\r
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
@@ -192,7 +192,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -210,7 +210,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -220,7 +220,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                Culture="1033"\r
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
@@ -245,7 +245,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -266,7 +266,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -276,7 +276,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                Culture="1033"\r
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
@@ -301,7 +301,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -319,7 +319,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -329,7 +329,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                Culture="1033"\r
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
@@ -354,7 +354,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -375,7 +375,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -385,7 +385,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                Culture="1033"\r
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
@@ -410,7 +410,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -428,7 +428,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -438,7 +438,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                Culture="1033"\r
                                AdditionalIncludeDirectories=""/>\r
                        <Tool\r