Define NDEBUG when building 3rd party libraries.

author Vadim Zeitlin <vadim@wxwidgets.org>

Fri, 18 Sep 2009 16:15:54 +0000 (16:15 +0000)

committer Vadim Zeitlin <vadim@wxwidgets.org>

Fri, 18 Sep 2009 16:15:54 +0000 (16:15 +0000)
author Vadim Zeitlin <vadim@wxwidgets.org>
Fri, 18 Sep 2009 16:15:54 +0000 (16:15 +0000)
committer Vadim Zeitlin <vadim@wxwidgets.org>
Fri, 18 Sep 2009 16:15:54 +0000 (16:15 +0000)
diff --git a/Makefile.in b/Makefile.in

index f268a8cfe6480b884f8e2a1b29f5a10a82559536..a15c0958dcfb1366dc28f2cef256c111fc6507e6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -79,14 +79,14 @@ WX_RELEASE_NODOT = 29
  WX_VERSION = $(WX_RELEASE).1
  WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
  LIBDIRNAME = $(wx_top_builddir)/lib
-WXREGEX_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \
+WXREGEX_CFLAGS = -DNDEBUG -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \
         $(CPPFLAGS) $(CFLAGS)
  WXREGEX_OBJECTS =  \
         wxregex_regcomp.o \
         wxregex_regexec.o \
         wxregex_regerror.o \
         wxregex_regfree.o
-WXZLIB_CFLAGS =        $(____SHARED) $(CPPFLAGS) $(CFLAGS)
+WXZLIB_CFLAGS =       -DNDEBUG  $(____SHARED) $(CPPFLAGS) $(CFLAGS)
  WXZLIB_OBJECTS =  \
         wxzlib_adler32.o \
         wxzlib_compress.o \
@@ -100,7 +100,7 @@ WXZLIB_OBJECTS =  \
         wxzlib_infback.o \
         wxzlib_inftrees.o \
         wxzlib_inffast.o
-WXPNG_CFLAGS =       $(__INC_ZLIB_p)  $(____SHARED) $(CPPFLAGS) $(CFLAGS)
+WXPNG_CFLAGS = -DNDEBUG $(__INC_ZLIB_p) $(____SHARED) $(CPPFLAGS) $(CFLAGS)
  WXPNG_OBJECTS =  \
         wxpng_png.o \
         wxpng_pngerror.o \
@@ -119,7 +119,7 @@ WXPNG_OBJECTS =  \
         wxpng_pngwrite.o \
         wxpng_pngwtran.o \
         wxpng_pngwutil.o
-WXJPEG_CFLAGS =        $(____SHARED) $(CPPFLAGS) $(CFLAGS)
+WXJPEG_CFLAGS =       -DNDEBUG  $(____SHARED) $(CPPFLAGS) $(CFLAGS)
  WXJPEG_OBJECTS =  \
         wxjpeg_jcomapi.o \
         wxjpeg_jutils.o \
@@ -167,7 +167,7 @@ WXJPEG_OBJECTS =  \
         wxjpeg_jquant1.o \
         wxjpeg_jquant2.o \
         wxjpeg_jdmerge.o
-WXTIFF_CFLAGS = $(__INC_ZLIB_p) $(__INC_JPEG_p) $(__INC_TIFF_BUILD_p) \
+WXTIFF_CFLAGS = -DNDEBUG $(__INC_ZLIB_p) $(__INC_JPEG_p) $(__INC_TIFF_BUILD_p) \
         $(__INC_TIFF_p) $(____SHARED) $(CPPFLAGS) $(CFLAGS)
  WXTIFF_OBJECTS =  \
         $(__TIFF_PLATFORM_SRC_OBJECTS) \
@@ -206,12 +206,12 @@ WXTIFF_OBJECTS =  \
         wxtiff_tif_warning.o \
         wxtiff_tif_write.o \
         wxtiff_tif_zip.o
-WXEXPAT_CFLAGS =       -I./src/expat  $(____SHARED) $(CPPFLAGS) $(CFLAGS)
+WXEXPAT_CFLAGS = -DNDEBUG -I./src/expat $(____SHARED) $(CPPFLAGS) $(CFLAGS)
  WXEXPAT_OBJECTS =  \
         wxexpat_xmlparse.o \
         wxexpat_xmlrole.o \
         wxexpat_xmltok.o
-WXSCINTILLA_CXXFLAGS = -I$(top_srcdir)/src/stc/scintilla/include \
+WXSCINTILLA_CXXFLAGS = -DNDEBUG -I$(top_srcdir)/src/stc/scintilla/include \
         -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
         $(____SHARED) $(CPPFLAGS) $(CXXFLAGS)
  WXSCINTILLA_OBJECTS =  \
diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl

index 56862964905b20a667d109adb953533676e25a7c..56082c51452f6678091085c94f0c1357a0bece10 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -341,6 +341,12 @@
          -->
          <install-if>SHARED=='0'</install-if>
          <pic>$(substituteFromDict(SHARED, {'0':'off', '1':'on'}))</pic>
+
+        <!--
+            we don't want to have asserts in the 3rd party libraries code,
+            neither we nor wx users are interested in debugging them anyhow
+         -->
+        <define>NDEBUG</define>
      </template>
  
  
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc

index 43bb7deb4b4c3de769b1ba30f45a9774b4a0f806..a60282ccba7ab72540e9d4881c628dbfd24f6713 100644 (file)
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -46,7 +46,7 @@ LIBDIRNAME = ..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
  SETUPHDIR = \
         $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
  WXREGEX_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-       $(__OPTIMIZEFLAG) $(__THREADSFLAG) -I..\..\include -I$(SETUPHDIR) \
+       $(__OPTIMIZEFLAG) $(__THREADSFLAG) -DNDEBUG -I..\..\include -I$(SETUPHDIR) \
         -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__UNICODE_DEFINE_p) -w-8008 -w-8012 \
         -w-8057 -w-8064 -w-8066 -w-8070 $(CPPFLAGS) $(CFLAGS)
  WXREGEX_OBJECTS =  \
@@ -55,8 +55,8 @@ WXREGEX_OBJECTS =  \
         $(OBJS)\wxregex_regerror.obj \
         $(OBJS)\wxregex_regfree.obj
  WXZLIB_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-       $(__OPTIMIZEFLAG) $(__THREADSFLAG) -w-8004 -w-8008 -w-8012 -w-8057 -w-8066 \
-       $(CPPFLAGS) $(CFLAGS)
+       $(__OPTIMIZEFLAG) $(__THREADSFLAG) -DNDEBUG -w-8004 -w-8008 -w-8012 -w-8057 \
+       -w-8066 $(CPPFLAGS) $(CFLAGS)
  WXZLIB_OBJECTS =  \
         $(OBJS)\wxzlib_adler32.obj \
         $(OBJS)\wxzlib_compress.obj \
@@ -71,8 +71,8 @@ WXZLIB_OBJECTS =  \
         $(OBJS)\wxzlib_inftrees.obj \
         $(OBJS)\wxzlib_inffast.obj
  WXPNG_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-       $(__OPTIMIZEFLAG) $(__THREADSFLAG) -I..\..\src\zlib -w-8004 $(CPPFLAGS) \
-       $(CFLAGS)
+       $(__OPTIMIZEFLAG) $(__THREADSFLAG) -DNDEBUG -I..\..\src\zlib -w-8004 \
+       $(CPPFLAGS) $(CFLAGS)
  WXPNG_OBJECTS =  \
         $(OBJS)\wxpng_png.obj \
         $(OBJS)\wxpng_pngerror.obj \
@@ -92,8 +92,8 @@ WXPNG_OBJECTS =  \
         $(OBJS)\wxpng_pngwtran.obj \
         $(OBJS)\wxpng_pngwutil.obj
  WXJPEG_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-       $(__OPTIMIZEFLAG) $(__THREADSFLAG) -I$(SETUPHDIR) -w-8004 -w-8008 -w-8057 \
-       -w-8066 $(CPPFLAGS) $(CFLAGS)
+       $(__OPTIMIZEFLAG) $(__THREADSFLAG) -DNDEBUG -I$(SETUPHDIR) -w-8004 -w-8008 \
+       -w-8057 -w-8066 $(CPPFLAGS) $(CFLAGS)
  WXJPEG_OBJECTS =  \
         $(OBJS)\wxjpeg_jcomapi.obj \
         $(OBJS)\wxjpeg_jutils.obj \
@@ -142,9 +142,9 @@ WXJPEG_OBJECTS =  \
         $(OBJS)\wxjpeg_jquant2.obj \
         $(OBJS)\wxjpeg_jdmerge.obj
  WXTIFF_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-       $(__OPTIMIZEFLAG) $(__THREADSFLAG) -I..\..\src\zlib -I..\..\src\jpeg \
-       -I..\..\src\tiff\libtiff -w-8004 -w-8012 -w-8057 -w-8060 -w-8066 $(CPPFLAGS) \
-       $(CFLAGS)
+       $(__OPTIMIZEFLAG) $(__THREADSFLAG) -DNDEBUG -I..\..\src\zlib \
+       -I..\..\src\jpeg -I..\..\src\tiff\libtiff -w-8004 -w-8012 -w-8057 -w-8060 \
+       -w-8066 $(CPPFLAGS) $(CFLAGS)
  WXTIFF_OBJECTS =  \
         $(OBJS)\wxtiff_tif_win32.obj \
         $(OBJS)\wxtiff_tif_aux.obj \
@@ -183,16 +183,17 @@ WXTIFF_OBJECTS =  \
         $(OBJS)\wxtiff_tif_write.obj \
         $(OBJS)\wxtiff_tif_zip.obj
  WXEXPAT_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-       $(__OPTIMIZEFLAG) $(__THREADSFLAG) -I$(LIBDIRNAME) -DCOMPILED_FROM_DSP \
-       -w-8004 -w-8008 -w-8012 -w-8057 -w-8066 $(CPPFLAGS) $(CFLAGS)
+       $(__OPTIMIZEFLAG) $(__THREADSFLAG) -DNDEBUG -I$(LIBDIRNAME) \
+       -DCOMPILED_FROM_DSP -w-8004 -w-8008 -w-8012 -w-8057 -w-8066 $(CPPFLAGS) \
+       $(CFLAGS)
  WXEXPAT_OBJECTS =  \
         $(OBJS)\wxexpat_xmlparse.obj \
         $(OBJS)\wxexpat_xmlrole.obj \
         $(OBJS)\wxexpat_xmltok.obj
  WXSCINTILLA_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-       $(__OPTIMIZEFLAG) $(__THREADSFLAG) -I..\..\src\stc\scintilla\include \
-       -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS $(CPPFLAGS) \
-       $(CXXFLAGS)
+       $(__OPTIMIZEFLAG) $(__THREADSFLAG) -DNDEBUG \
+       -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\src -D__WX__ \
+       -DSCI_LEXER -DLINK_LEXERS $(CPPFLAGS) $(CXXFLAGS)
  WXSCINTILLA_OBJECTS =  \
         $(OBJS)\wxscintilla_AutoComplete.obj \
         $(OBJS)\wxscintilla_CallTip.obj \
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc

index 879b876c54d6f13fa861a021b410201af689a527..0159901c1e0d6c14771f0bb2a22f9da5304786d4 100644 (file)
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -39,7 +39,7 @@ LIBDIRNAME = ..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
  SETUPHDIR = \
         $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
  WXREGEX_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
-       -DHAVE_W32API_H -I..\..\include -I$(SETUPHDIR) -D__WXMSW__ \
+       -DHAVE_W32API_H -DNDEBUG -I..\..\include -I$(SETUPHDIR) -D__WXMSW__ \
         $(__WXUNIV_DEFINE_p) $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS)
  WXREGEX_OBJECTS =  \
         $(OBJS)\wxregex_regcomp.o \
@@ -47,7 +47,7 @@ WXREGEX_OBJECTS =  \
         $(OBJS)\wxregex_regerror.o \
         $(OBJS)\wxregex_regfree.o
  WXZLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
-       -DHAVE_W32API_H $(CPPFLAGS) $(CFLAGS)
+       -DHAVE_W32API_H -DNDEBUG $(CPPFLAGS) $(CFLAGS)
  WXZLIB_OBJECTS =  \
         $(OBJS)\wxzlib_adler32.o \
         $(OBJS)\wxzlib_compress.o \
@@ -62,7 +62,7 @@ WXZLIB_OBJECTS =  \
         $(OBJS)\wxzlib_inftrees.o \
         $(OBJS)\wxzlib_inffast.o
  WXPNG_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
-       -DHAVE_W32API_H -I..\..\src\zlib $(CPPFLAGS) $(CFLAGS)
+       -DHAVE_W32API_H -DNDEBUG -I..\..\src\zlib $(CPPFLAGS) $(CFLAGS)
  WXPNG_OBJECTS =  \
         $(OBJS)\wxpng_png.o \
         $(OBJS)\wxpng_pngerror.o \
@@ -82,7 +82,7 @@ WXPNG_OBJECTS =  \
         $(OBJS)\wxpng_pngwtran.o \
         $(OBJS)\wxpng_pngwutil.o
  WXJPEG_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
-       -DHAVE_W32API_H -I$(SETUPHDIR) $(CPPFLAGS) $(CFLAGS)
+       -DHAVE_W32API_H -DNDEBUG -I$(SETUPHDIR) $(CPPFLAGS) $(CFLAGS)
  WXJPEG_OBJECTS =  \
         $(OBJS)\wxjpeg_jcomapi.o \
         $(OBJS)\wxjpeg_jutils.o \
@@ -131,8 +131,8 @@ WXJPEG_OBJECTS =  \
         $(OBJS)\wxjpeg_jquant2.o \
         $(OBJS)\wxjpeg_jdmerge.o
  WXTIFF_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
-       -DHAVE_W32API_H -I..\..\src\zlib -I..\..\src\jpeg -I..\..\src\tiff\libtiff \
-       $(CPPFLAGS) $(CFLAGS)
+       -DHAVE_W32API_H -DNDEBUG -I..\..\src\zlib -I..\..\src\jpeg \
+       -I..\..\src\tiff\libtiff $(CPPFLAGS) $(CFLAGS)
  WXTIFF_OBJECTS =  \
         $(OBJS)\wxtiff_tif_win32.o \
         $(OBJS)\wxtiff_tif_aux.o \
@@ -171,13 +171,14 @@ WXTIFF_OBJECTS =  \
         $(OBJS)\wxtiff_tif_write.o \
         $(OBJS)\wxtiff_tif_zip.o
  WXEXPAT_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
-       -DHAVE_W32API_H -I$(LIBDIRNAME) -DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS)
+       -DHAVE_W32API_H -DNDEBUG -I$(LIBDIRNAME) -DCOMPILED_FROM_DSP $(CPPFLAGS) \
+       $(CFLAGS)
  WXEXPAT_OBJECTS =  \
         $(OBJS)\wxexpat_xmlparse.o \
         $(OBJS)\wxexpat_xmlrole.o \
         $(OBJS)\wxexpat_xmltok.o
  WXSCINTILLA_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
-       $(GCCFLAGS) -DHAVE_W32API_H -I..\..\src\stc\scintilla\include \
+       $(GCCFLAGS) -DHAVE_W32API_H -DNDEBUG -I..\..\src\stc\scintilla\include \
         -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
         $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
  WXSCINTILLA_OBJECTS =  \
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc

index 39466ed547720b754e77b62eb49148869aab21fd..5d14da8cbad45dd8018fda5291e203c44b59c815 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -39,9 +39,9 @@ SETUPHDIR = \
         $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
  WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I..\..\include \
-       /I$(SETUPHDIR) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(CPPFLAGS) $(CFLAGS)
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \
+       /I..\..\include /I$(SETUPHDIR) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS)
  WXREGEX_OBJECTS =  \
         $(OBJS)\wxregex_regcomp.obj \
         $(OBJS)\wxregex_regexec.obj \
@@ -49,7 +49,7 @@ WXREGEX_OBJECTS =  \
         $(OBJS)\wxregex_regfree.obj
  WXZLIB_CFLAGS = /M$(__RUNTIME_LIBS_21)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) $(CPPFLAGS) $(CFLAGS)
+       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG $(CPPFLAGS) $(CFLAGS)
  WXZLIB_OBJECTS =  \
         $(OBJS)\wxzlib_adler32.obj \
         $(OBJS)\wxzlib_compress.obj \
@@ -65,7 +65,8 @@ WXZLIB_OBJECTS =  \
         $(OBJS)\wxzlib_inffast.obj
  WXPNG_CFLAGS = /M$(__RUNTIME_LIBS_34)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I..\..\src\zlib $(CPPFLAGS) $(CFLAGS)
+       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG /I..\..\src\zlib $(CPPFLAGS) \
+       $(CFLAGS)
  WXPNG_OBJECTS =  \
         $(OBJS)\wxpng_png.obj \
         $(OBJS)\wxpng_pngerror.obj \
@@ -86,7 +87,8 @@ WXPNG_OBJECTS =  \
         $(OBJS)\wxpng_pngwutil.obj
  WXJPEG_CFLAGS = /M$(__RUNTIME_LIBS_47)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I$(SETUPHDIR) $(CPPFLAGS) $(CFLAGS)
+       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG /I$(SETUPHDIR) $(CPPFLAGS) \
+       $(CFLAGS)
  WXJPEG_OBJECTS =  \
         $(OBJS)\wxjpeg_jcomapi.obj \
         $(OBJS)\wxjpeg_jutils.obj \
@@ -136,8 +138,8 @@ WXJPEG_OBJECTS =  \
         $(OBJS)\wxjpeg_jdmerge.obj
  WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS_60)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I..\..\src\zlib /I..\..\src\jpeg \
-       /I..\..\src\tiff\libtiff $(CPPFLAGS) $(CFLAGS)
+       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG /I..\..\src\zlib \
+       /I..\..\src\jpeg /I..\..\src\tiff\libtiff $(CPPFLAGS) $(CFLAGS)
  WXTIFF_OBJECTS =  \
         $(OBJS)\wxtiff_tif_win32.obj \
         $(OBJS)\wxtiff_tif_aux.obj \
@@ -177,15 +179,15 @@ WXTIFF_OBJECTS =  \
         $(OBJS)\wxtiff_tif_zip.obj
  WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS_73)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I$(LIBDIRNAME) \
-       /DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS)
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \
+       /I$(LIBDIRNAME) /DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS)
  WXEXPAT_OBJECTS =  \
         $(OBJS)\wxexpat_xmlparse.obj \
         $(OBJS)\wxexpat_xmlrole.obj \
         $(OBJS)\wxexpat_xmltok.obj
  WXSCINTILLA_CXXFLAGS = /M$(__RUNTIME_LIBS_86)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \
         /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \
         /DSCI_LEXER /DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \
         $(CXXFLAGS)
diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat

index 1ba623384472087b2e20479a7803f127147f9c48..18cb56ed3e1cc6862eb85c25c046ae095f6d8c9b 100644 (file)
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -3183,7 +3183,7 @@ LIBDIRNAME = ..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
  SETUPHDIR = &
         $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
  WXREGEX_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-       $(__RUNTIME_LIBS) -i=..\..\include -i=$(SETUPHDIR) -d__WXMSW__ &
+       $(__RUNTIME_LIBS) -dNDEBUG -i=..\..\include -i=$(SETUPHDIR) -d__WXMSW__ &
         $(__WXUNIV_DEFINE_p) $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS)
  WXREGEX_OBJECTS =  &
         $(OBJS)\wxregex_regcomp.obj &
@@ -3191,7 +3191,7 @@ WXREGEX_OBJECTS =  &
         $(OBJS)\wxregex_regerror.obj &
         $(OBJS)\wxregex_regfree.obj
  WXZLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-       $(__RUNTIME_LIBS) $(CPPFLAGS) $(CFLAGS)
+       $(__RUNTIME_LIBS) -dNDEBUG $(CPPFLAGS) $(CFLAGS)
  WXZLIB_OBJECTS =  &
         $(OBJS)\wxzlib_adler32.obj &
         $(OBJS)\wxzlib_compress.obj &
@@ -3206,7 +3206,7 @@ WXZLIB_OBJECTS =  &
         $(OBJS)\wxzlib_inftrees.obj &
         $(OBJS)\wxzlib_inffast.obj
  WXPNG_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-       $(__RUNTIME_LIBS) -i=..\..\src\zlib -wcd=124 $(CPPFLAGS) $(CFLAGS)
+       $(__RUNTIME_LIBS) -dNDEBUG -i=..\..\src\zlib -wcd=124 $(CPPFLAGS) $(CFLAGS)
  WXPNG_OBJECTS =  &
         $(OBJS)\wxpng_png.obj &
         $(OBJS)\wxpng_pngerror.obj &
@@ -3226,7 +3226,7 @@ WXPNG_OBJECTS =  &
         $(OBJS)\wxpng_pngwtran.obj &
         $(OBJS)\wxpng_pngwutil.obj
  WXJPEG_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-       $(__RUNTIME_LIBS) -i=$(SETUPHDIR) -wcd=136 $(CPPFLAGS) $(CFLAGS)
+       $(__RUNTIME_LIBS) -dNDEBUG -i=$(SETUPHDIR) -wcd=136 $(CPPFLAGS) $(CFLAGS)
  WXJPEG_OBJECTS =  &
         $(OBJS)\wxjpeg_jcomapi.obj &
         $(OBJS)\wxjpeg_jutils.obj &
@@ -3275,7 +3275,7 @@ WXJPEG_OBJECTS =  &
         $(OBJS)\wxjpeg_jquant2.obj &
         $(OBJS)\wxjpeg_jdmerge.obj
  WXTIFF_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-       $(__RUNTIME_LIBS) -i=..\..\src\zlib -i=..\..\src\jpeg &
+       $(__RUNTIME_LIBS) -dNDEBUG -i=..\..\src\zlib -i=..\..\src\jpeg &
         -i=..\..\src\tiff\libtiff -wcd=124 $(CPPFLAGS) $(CFLAGS)
  WXTIFF_OBJECTS =  &
         $(OBJS)\wxtiff_tif_win32.obj &
@@ -3315,13 +3315,14 @@ WXTIFF_OBJECTS =  &
         $(OBJS)\wxtiff_tif_write.obj &
         $(OBJS)\wxtiff_tif_zip.obj
  WXEXPAT_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-       $(__RUNTIME_LIBS) -i=$(LIBDIRNAME) -dCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS)
+       $(__RUNTIME_LIBS) -dNDEBUG -i=$(LIBDIRNAME) -dCOMPILED_FROM_DSP $(CPPFLAGS) &
+       $(CFLAGS)
  WXEXPAT_OBJECTS =  &
         $(OBJS)\wxexpat_xmlparse.obj &
         $(OBJS)\wxexpat_xmlrole.obj &
         $(OBJS)\wxexpat_xmltok.obj
  WXSCINTILLA_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-       $(__RUNTIME_LIBS) -i=..\..\src\stc\scintilla\include &
+       $(__RUNTIME_LIBS) -dNDEBUG -i=..\..\src\stc\scintilla\include &
         -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS &
         $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
  WXSCINTILLA_OBJECTS =  &
diff --git a/build/msw/wx_vc7_wxexpat.vcproj b/build/msw/wx_vc7_wxexpat.vcproj

index 4ab0a60dfdbbbb0c9196166cfc751193ec15b546..525725b7970a0e38a18ddd22f9e556359fe88d9d 100644 (file)
--- a/build/msw/wx_vc7_wxexpat.vcproj
+++ b/build/msw/wx_vc7_wxexpat.vcproj
@@ -27,7 +27,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 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;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
@@ -58,7 +58,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"/>\r
                         <Tool\r
@@ -83,7 +83,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
@@ -101,7 +101,7 @@
                                 SuppressStartupBanner="TRUE"/>\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
@@ -111,7 +111,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"/>\r
                         <Tool\r
@@ -136,7 +136,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 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;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
@@ -167,7 +167,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"/>\r
                         <Tool\r
@@ -192,7 +192,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
@@ -210,7 +210,7 @@
                                 SuppressStartupBanner="TRUE"/>\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
@@ -220,7 +220,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"/>\r
                         <Tool\r
@@ -245,7 +245,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 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;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
@@ -276,7 +276,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"/>\r
                         <Tool\r
@@ -301,7 +301,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
@@ -319,7 +319,7 @@
                                 SuppressStartupBanner="TRUE"/>\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
@@ -329,7 +329,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"/>\r
                         <Tool\r
@@ -354,7 +354,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 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;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
@@ -385,7 +385,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"/>\r
                         <Tool\r
@@ -410,7 +410,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
@@ -428,7 +428,7 @@
                                 SuppressStartupBanner="TRUE"/>\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
@@ -438,7 +438,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"/>\r
                         <Tool\r
diff --git a/build/msw/wx_vc7_wxjpeg.vcproj b/build/msw/wx_vc7_wxjpeg.vcproj

index 23776d46046ced67d19c36c78cbd720da19a056d..7744c107c55ca97d5a1ff246f98827dc27e25bf4 100644 (file)
--- a/build/msw/wx_vc7_wxjpeg.vcproj
+++ b/build/msw/wx_vc7_wxjpeg.vcproj
@@ -27,7 +27,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"\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="..\..\lib\vc_lib\mswud"/>\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="..\..\lib\vc_lib\mswud"/>\r
                         <Tool\r
@@ -83,7 +83,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"\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="..\..\lib\vc_lib\mswu"/>\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="..\..\lib\vc_lib\mswu"/>\r
                         <Tool\r
@@ -136,7 +136,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"\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="..\..\lib\vc_lib\mswunivud"/>\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="..\..\lib\vc_lib\mswunivud"/>\r
                         <Tool\r
@@ -192,7 +192,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"\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="..\..\lib\vc_lib\mswunivu"/>\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="..\..\lib\vc_lib\mswunivu"/>\r
                         <Tool\r
@@ -245,7 +245,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"\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="..\..\lib\vc_dll\mswud"/>\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="..\..\lib\vc_dll\mswud"/>\r
                         <Tool\r
@@ -301,7 +301,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"\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="..\..\lib\vc_dll\mswu"/>\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="..\..\lib\vc_dll\mswu"/>\r
                         <Tool\r
@@ -354,7 +354,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"\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="..\..\lib\vc_dll\mswunivud"/>\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="..\..\lib\vc_dll\mswunivud"/>\r
                         <Tool\r
@@ -410,7 +410,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"\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="..\..\lib\vc_dll\mswunivu"/>\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="..\..\lib\vc_dll\mswunivu"/>\r
                         <Tool\r
diff --git a/build/msw/wx_vc7_wxpng.vcproj b/build/msw/wx_vc7_wxpng.vcproj

index 935677000f781ef19a725709f9708c44660dc80d..515227a5d280d9cb356b8a64f4dc7ee8043f9cbe 100644 (file)
--- a/build/msw/wx_vc7_wxpng.vcproj
+++ b/build/msw/wx_vc7_wxpng.vcproj
@@ -27,7 +27,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\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="..\..\src\zlib"/>\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="..\..\src\zlib"/>\r
                         <Tool\r
@@ -83,7 +83,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\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="..\..\src\zlib"/>\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="..\..\src\zlib"/>\r
                         <Tool\r
@@ -136,7 +136,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\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="..\..\src\zlib"/>\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="..\..\src\zlib"/>\r
                         <Tool\r
@@ -192,7 +192,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\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="..\..\src\zlib"/>\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="..\..\src\zlib"/>\r
                         <Tool\r
@@ -245,7 +245,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\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="..\..\src\zlib"/>\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="..\..\src\zlib"/>\r
                         <Tool\r
@@ -301,7 +301,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\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="..\..\src\zlib"/>\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="..\..\src\zlib"/>\r
                         <Tool\r
@@ -354,7 +354,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\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="..\..\src\zlib"/>\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="..\..\src\zlib"/>\r
                         <Tool\r
@@ -410,7 +410,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\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="..\..\src\zlib"/>\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="..\..\src\zlib"/>\r
                         <Tool\r
diff --git a/build/msw/wx_vc7_wxregex.vcproj b/build/msw/wx_vc7_wxregex.vcproj

index 8514f489962e78a0ff1a3087c2da0e214ca9148f..cdd53338c0ca3ef261f8e96800da827baa324d02 100644 (file)
--- a/build/msw/wx_vc7_wxregex.vcproj
+++ b/build/msw/wx_vc7_wxregex.vcproj
@@ -28,7 +28,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
                                 MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
@@ -49,7 +49,7 @@
                                 SuppressStartupBanner="TRUE"/>\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
@@ -59,7 +59,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"/>\r
                         <Tool\r
@@ -85,7 +85,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
@@ -103,7 +103,7 @@
                                 SuppressStartupBanner="TRUE"/>\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
@@ -113,7 +113,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="NDEBUG;__WXMSW__;_UNICODE"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"/>\r
                         <Tool\r
@@ -139,7 +139,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
@@ -160,7 +160,7 @@
                                 SuppressStartupBanner="TRUE"/>\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
@@ -170,7 +170,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"/>\r
                         <Tool\r
@@ -196,7 +196,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
@@ -214,7 +214,7 @@
                                 SuppressStartupBanner="TRUE"/>\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
@@ -224,7 +224,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"/>\r
                         <Tool\r
@@ -250,7 +250,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
                                 MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
@@ -271,7 +271,7 @@
                                 SuppressStartupBanner="TRUE"/>\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
@@ -281,7 +281,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"/>\r
                         <Tool\r
@@ -307,7 +307,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
@@ -325,7 +325,7 @@
                                 SuppressStartupBanner="TRUE"/>\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
@@ -335,7 +335,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="NDEBUG;__WXMSW__;_UNICODE"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"/>\r
                         <Tool\r
@@ -361,7 +361,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
@@ -382,7 +382,7 @@
                                 SuppressStartupBanner="TRUE"/>\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
@@ -392,7 +392,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"/>\r
                         <Tool\r
@@ -418,7 +418,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
@@ -436,7 +436,7 @@
                                 SuppressStartupBanner="TRUE"/>\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
@@ -446,7 +446,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"/>\r
                         <Tool\r
diff --git a/build/msw/wx_vc7_wxscintilla.vcproj b/build/msw/wx_vc7_wxscintilla.vcproj

index 49a99aef0db597699c717769001c83952143dc73..484bd338e2e22ab8d1329ea21727b0bcfc09a6bd 100644 (file)
--- a/build/msw/wx_vc7_wxscintilla.vcproj
+++ b/build/msw/wx_vc7_wxscintilla.vcproj
@@ -27,7 +27,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 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;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
@@ -58,7 +58,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                         <Tool\r
@@ -83,7 +83,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
@@ -101,7 +101,7 @@
                                 SuppressStartupBanner="TRUE"/>\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
@@ -111,7 +111,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                         <Tool\r
@@ -136,7 +136,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 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;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
@@ -167,7 +167,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                         <Tool\r
@@ -192,7 +192,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
@@ -210,7 +210,7 @@
                                 SuppressStartupBanner="TRUE"/>\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
@@ -220,7 +220,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                         <Tool\r
@@ -245,7 +245,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 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;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
@@ -276,7 +276,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                         <Tool\r
@@ -301,7 +301,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
@@ -319,7 +319,7 @@
                                 SuppressStartupBanner="TRUE"/>\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
@@ -329,7 +329,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                         <Tool\r
@@ -354,7 +354,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 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;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
@@ -385,7 +385,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                         <Tool\r
@@ -410,7 +410,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
@@ -428,7 +428,7 @@
                                 SuppressStartupBanner="TRUE"/>\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
@@ -438,7 +438,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                         <Tool\r
diff --git a/build/msw/wx_vc7_wxtiff.vcproj b/build/msw/wx_vc7_wxtiff.vcproj

index f3e2c56e6c7d97680835c4d63263e112d4967cdb..5874ffc4c0237262204d8b7d06d91d0153cffbe5 100644 (file)
--- a/build/msw/wx_vc7_wxtiff.vcproj
+++ b/build/msw/wx_vc7_wxtiff.vcproj
@@ -27,7 +27,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\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="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\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="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                         <Tool\r
@@ -83,7 +83,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\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="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\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="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                         <Tool\r
@@ -136,7 +136,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\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="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\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="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                         <Tool\r
@@ -192,7 +192,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\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="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\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="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                         <Tool\r
@@ -245,7 +245,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\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="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\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="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                         <Tool\r
@@ -301,7 +301,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\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="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\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="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                         <Tool\r
@@ -354,7 +354,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\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="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\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="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                         <Tool\r
@@ -410,7 +410,7 @@
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\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="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\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="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                         <Tool\r
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
diff --git a/build/msw/wx_vc8_wxexpat.vcproj b/build/msw/wx_vc8_wxexpat.vcproj

index 09822dfbe05ceb1b599fd8f8bf60acc0e63cba11..8c69d8c2fb9a52b8a63b25f789d5b0d48e57b1ef 100644 (file)
--- a/build/msw/wx_vc8_wxexpat.vcproj
+++ b/build/msw/wx_vc8_wxexpat.vcproj
@@ -43,14 +43,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -69,7 +69,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                         />\r
@@ -124,14 +124,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -147,7 +147,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                         />\r
@@ -202,14 +202,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -228,7 +228,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                         />\r
@@ -283,14 +283,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -306,7 +306,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                         />\r
@@ -361,14 +361,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -387,7 +387,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                         />\r
@@ -442,14 +442,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -465,7 +465,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                         />\r
@@ -520,14 +520,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -546,7 +546,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                         />\r
@@ -601,14 +601,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -624,7 +624,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                         />\r
diff --git a/build/msw/wx_vc8_wxjpeg.vcproj b/build/msw/wx_vc8_wxjpeg.vcproj

index 8e59cfdecec8f2d78c847d87cec194ab22506d5d..e52b1e1298fd320d8c89d129bcd69d8956cb33cf 100644 (file)
--- a/build/msw/wx_vc8_wxjpeg.vcproj
+++ b/build/msw/wx_vc8_wxjpeg.vcproj
@@ -43,14 +43,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -69,7 +69,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"\r
                         />\r
@@ -124,14 +124,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -147,7 +147,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"\r
                         />\r
@@ -202,14 +202,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -228,7 +228,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"\r
                         />\r
@@ -283,14 +283,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -306,7 +306,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"\r
                         />\r
@@ -361,14 +361,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -387,7 +387,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"\r
                         />\r
@@ -442,14 +442,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -465,7 +465,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"\r
                         />\r
@@ -520,14 +520,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -546,7 +546,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"\r
                         />\r
@@ -601,14 +601,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -624,7 +624,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"\r
                         />\r
diff --git a/build/msw/wx_vc8_wxpng.vcproj b/build/msw/wx_vc8_wxpng.vcproj

index f32b7bd54b46bd199e389ee8a08ac5f618acc67c..35d94ca446a3eafaf738e6e93254c1154119c9fa 100644 (file)
--- a/build/msw/wx_vc8_wxpng.vcproj
+++ b/build/msw/wx_vc8_wxpng.vcproj
@@ -43,14 +43,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -69,7 +69,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
@@ -124,14 +124,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -147,7 +147,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
@@ -202,14 +202,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -228,7 +228,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
@@ -283,14 +283,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -306,7 +306,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
@@ -361,14 +361,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -387,7 +387,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
@@ -442,14 +442,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -465,7 +465,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
@@ -520,14 +520,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -546,7 +546,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
@@ -601,14 +601,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -624,7 +624,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
diff --git a/build/msw/wx_vc8_wxregex.vcproj b/build/msw/wx_vc8_wxregex.vcproj

index 4923e6e8e36a7199d79b6bafd7236e1dd7e5a273..b7848b78cd36c7cafda88e202ecf593ece9a14b5 100644 (file)
--- a/build/msw/wx_vc8_wxregex.vcproj
+++ b/build/msw/wx_vc8_wxregex.vcproj
@@ -44,14 +44,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -70,7 +70,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"\r
                         />\r
@@ -126,14 +126,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -149,7 +149,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="NDEBUG;__WXMSW__;_UNICODE"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"\r
                         />\r
@@ -205,14 +205,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -231,7 +231,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"\r
                         />\r
@@ -287,14 +287,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -310,7 +310,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"\r
                         />\r
@@ -366,14 +366,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -392,7 +392,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"\r
                         />\r
@@ -448,14 +448,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -471,7 +471,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="NDEBUG;__WXMSW__;_UNICODE"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"\r
                         />\r
@@ -527,14 +527,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -553,7 +553,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"\r
                         />\r
@@ -609,14 +609,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -632,7 +632,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"\r
                         />\r
diff --git a/build/msw/wx_vc8_wxscintilla.vcproj b/build/msw/wx_vc8_wxscintilla.vcproj

index 225da88e8ce689702100f32c416042bd0d90ec97..e1c990bee44664cfe3f496358218f6043c524676 100644 (file)
--- a/build/msw/wx_vc8_wxscintilla.vcproj
+++ b/build/msw/wx_vc8_wxscintilla.vcproj
@@ -43,14 +43,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -69,7 +69,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -124,14 +124,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -147,7 +147,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -202,14 +202,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -228,7 +228,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -283,14 +283,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -306,7 +306,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -361,14 +361,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -387,7 +387,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -442,14 +442,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -465,7 +465,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -520,14 +520,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -546,7 +546,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -601,14 +601,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -624,7 +624,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
diff --git a/build/msw/wx_vc8_wxtiff.vcproj b/build/msw/wx_vc8_wxtiff.vcproj

index eb56ad86e2b20c2dd0c288c700ed0a940af77866..90e5552a3be010c5d77ec7676967c830c3ba891b 100644 (file)
--- a/build/msw/wx_vc8_wxtiff.vcproj
+++ b/build/msw/wx_vc8_wxtiff.vcproj
@@ -43,14 +43,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -69,7 +69,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
@@ -124,14 +124,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -147,7 +147,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
@@ -202,14 +202,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -228,7 +228,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
@@ -283,14 +283,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -306,7 +306,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
@@ -361,14 +361,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -387,7 +387,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
@@ -442,14 +442,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -465,7 +465,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
@@ -520,14 +520,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -546,7 +546,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
@@ -601,14 +601,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -624,7 +624,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
diff --git a/build/msw/wx_vc8_wxzlib.vcproj b/build/msw/wx_vc8_wxzlib.vcproj

index 39371f1237619626a25c72439bded6443e2f55c0..b84c4abcde08d0e846b49a259c8432f65760fb3a 100644 (file)
--- a/build/msw/wx_vc8_wxzlib.vcproj
+++ b/build/msw/wx_vc8_wxzlib.vcproj
@@ -43,14 +43,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories=""\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -69,7 +69,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
@@ -124,14 +124,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories=""\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -147,7 +147,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
@@ -202,14 +202,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories=""\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -228,7 +228,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
@@ -283,14 +283,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories=""\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -306,7 +306,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
@@ -361,14 +361,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories=""\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -387,7 +387,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
@@ -442,14 +442,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories=""\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -465,7 +465,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
@@ -520,14 +520,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories=""\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -546,7 +546,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
@@ -601,14 +601,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories=""\r
                         />\r
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -624,7 +624,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
diff --git a/build/msw/wx_vc9_wxexpat.vcproj b/build/msw/wx_vc9_wxexpat.vcproj

index cf073a20f6d91c42ca9184f25df356bd43d7bb43..b7a8f33b0777739b7e191dbde219e4f9703f00e9 100644 (file)
--- a/build/msw/wx_vc9_wxexpat.vcproj
+++ b/build/msw/wx_vc9_wxexpat.vcproj
@@ -43,7 +43,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                         />\r
                         <Tool\r
@@ -51,7 +51,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -68,7 +68,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                         />\r
@@ -123,7 +123,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                         />\r
                         <Tool\r
@@ -131,7 +131,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -146,7 +146,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                         />\r
@@ -201,7 +201,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                         />\r
                         <Tool\r
@@ -209,7 +209,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -226,7 +226,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                         />\r
@@ -281,7 +281,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                         />\r
                         <Tool\r
@@ -289,7 +289,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -304,7 +304,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib"\r
                         />\r
@@ -359,7 +359,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                         />\r
                         <Tool\r
@@ -367,7 +367,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -384,7 +384,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                         />\r
@@ -439,7 +439,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                         />\r
                         <Tool\r
@@ -447,7 +447,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -462,7 +462,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                         />\r
@@ -517,7 +517,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                         />\r
                         <Tool\r
@@ -525,7 +525,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -542,7 +542,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;COMPILED_FROM_DSP"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                         />\r
@@ -597,7 +597,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                         />\r
                         <Tool\r
@@ -605,7 +605,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
-                               PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;COMPILED_FROM_DSP"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -620,7 +620,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="COMPILED_FROM_DSP"\r
+                               PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll"\r
                         />\r
diff --git a/build/msw/wx_vc9_wxjpeg.vcproj b/build/msw/wx_vc9_wxjpeg.vcproj

index 331d234eca14036dfff9140bbc83a2c3fdc48f4b..95cf3ed06bef78b5313a173661b29c443fc38b27 100644 (file)
--- a/build/msw/wx_vc9_wxjpeg.vcproj
+++ b/build/msw/wx_vc9_wxjpeg.vcproj
@@ -43,7 +43,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"\r
                         />\r
                         <Tool\r
@@ -51,7 +51,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -68,7 +68,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"\r
                         />\r
@@ -123,7 +123,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"\r
                         />\r
                         <Tool\r
@@ -131,7 +131,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -146,7 +146,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"\r
                         />\r
@@ -201,7 +201,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"\r
                         />\r
                         <Tool\r
@@ -209,7 +209,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -226,7 +226,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"\r
                         />\r
@@ -281,7 +281,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"\r
                         />\r
                         <Tool\r
@@ -289,7 +289,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -304,7 +304,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"\r
                         />\r
@@ -359,7 +359,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"\r
                         />\r
                         <Tool\r
@@ -367,7 +367,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -384,7 +384,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"\r
                         />\r
@@ -439,7 +439,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"\r
                         />\r
                         <Tool\r
@@ -447,7 +447,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -462,7 +462,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"\r
                         />\r
@@ -517,7 +517,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"\r
                         />\r
                         <Tool\r
@@ -525,7 +525,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -542,7 +542,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"\r
                         />\r
@@ -597,7 +597,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"\r
                         />\r
                         <Tool\r
@@ -605,7 +605,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -620,7 +620,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"\r
                         />\r
diff --git a/build/msw/wx_vc9_wxpng.vcproj b/build/msw/wx_vc9_wxpng.vcproj

index 1b35e19a48f1a17294c85a8c252f9cd098378e76..355ed1c06eba4d96a2dfebf52d1f6d4bfc62e903 100644 (file)
--- a/build/msw/wx_vc9_wxpng.vcproj
+++ b/build/msw/wx_vc9_wxpng.vcproj
@@ -43,7 +43,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
                         <Tool\r
@@ -51,7 +51,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -68,7 +68,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
@@ -123,7 +123,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
                         <Tool\r
@@ -131,7 +131,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -146,7 +146,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
@@ -201,7 +201,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
                         <Tool\r
@@ -209,7 +209,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -226,7 +226,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
@@ -281,7 +281,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
                         <Tool\r
@@ -289,7 +289,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -304,7 +304,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
@@ -359,7 +359,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
                         <Tool\r
@@ -367,7 +367,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -384,7 +384,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
@@ -439,7 +439,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
                         <Tool\r
@@ -447,7 +447,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -462,7 +462,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
@@ -517,7 +517,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
                         <Tool\r
@@ -525,7 +525,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -542,7 +542,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
@@ -597,7 +597,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
                         <Tool\r
@@ -605,7 +605,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -620,7 +620,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib"\r
                         />\r
diff --git a/build/msw/wx_vc9_wxregex.vcproj b/build/msw/wx_vc9_wxregex.vcproj

index 41e12b12222cfbbb876f526fa080b55959054a5a..21021bd6afef5bcf02335ae423aa251247051a3c 100644 (file)
--- a/build/msw/wx_vc9_wxregex.vcproj
+++ b/build/msw/wx_vc9_wxregex.vcproj
@@ -44,7 +44,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"\r
                         />\r
                         <Tool\r
@@ -52,7 +52,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -69,7 +69,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"\r
                         />\r
@@ -125,7 +125,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"\r
                         />\r
                         <Tool\r
@@ -133,7 +133,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -148,7 +148,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="NDEBUG;__WXMSW__;_UNICODE"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"\r
                         />\r
@@ -204,7 +204,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"\r
                         />\r
                         <Tool\r
@@ -212,7 +212,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -229,7 +229,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"\r
                         />\r
@@ -285,7 +285,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"\r
                         />\r
                         <Tool\r
@@ -293,7 +293,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -308,7 +308,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"\r
                         />\r
@@ -364,7 +364,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"\r
                         />\r
                         <Tool\r
@@ -372,7 +372,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -389,7 +389,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;_UNICODE"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"\r
                         />\r
@@ -445,7 +445,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"\r
                         />\r
                         <Tool\r
@@ -453,7 +453,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;_UNICODE"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -468,7 +468,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE"\r
+                               PreprocessorDefinitions="NDEBUG;__WXMSW__;_UNICODE"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"\r
                         />\r
@@ -524,7 +524,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"\r
                         />\r
                         <Tool\r
@@ -532,7 +532,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -549,7 +549,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"\r
                         />\r
@@ -605,7 +605,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"\r
                         />\r
                         <Tool\r
@@ -613,7 +613,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -628,7 +628,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               PreprocessorDefinitions="NDEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"\r
                         />\r
diff --git a/build/msw/wx_vc9_wxscintilla.vcproj b/build/msw/wx_vc9_wxscintilla.vcproj

index 7cd203b3abe9e77c8fa9c52dcd61751597e502df..541cd809e81903d003f776ffafdd534c9b5dc184 100644 (file)
--- a/build/msw/wx_vc9_wxscintilla.vcproj
+++ b/build/msw/wx_vc9_wxscintilla.vcproj
@@ -43,7 +43,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
                         <Tool\r
@@ -51,7 +51,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -68,7 +68,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -123,7 +123,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
                         <Tool\r
@@ -131,7 +131,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -146,7 +146,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -201,7 +201,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
                         <Tool\r
@@ -209,7 +209,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -226,7 +226,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -281,7 +281,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
                         <Tool\r
@@ -289,7 +289,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -304,7 +304,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -359,7 +359,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
                         <Tool\r
@@ -367,7 +367,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -384,7 +384,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -439,7 +439,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
                         <Tool\r
@@ -447,7 +447,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -462,7 +462,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -517,7 +517,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
                         <Tool\r
@@ -525,7 +525,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -542,7 +542,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
@@ -597,7 +597,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
                         <Tool\r
@@ -605,7 +605,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -620,7 +620,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                         />\r
diff --git a/build/msw/wx_vc9_wxtiff.vcproj b/build/msw/wx_vc9_wxtiff.vcproj

index 802e0f4f2dedcba5039005cb6fa0e142789ce42f..578cfc871dbe346f3efaaa142d620e2568fb1742 100644 (file)
--- a/build/msw/wx_vc9_wxtiff.vcproj
+++ b/build/msw/wx_vc9_wxtiff.vcproj
@@ -43,7 +43,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
                         <Tool\r
@@ -51,7 +51,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -68,7 +68,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
@@ -123,7 +123,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
                         <Tool\r
@@ -131,7 +131,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -146,7 +146,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
@@ -201,7 +201,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
                         <Tool\r
@@ -209,7 +209,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -226,7 +226,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
@@ -281,7 +281,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
                         <Tool\r
@@ -289,7 +289,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -304,7 +304,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
@@ -359,7 +359,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
                         <Tool\r
@@ -367,7 +367,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -384,7 +384,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
@@ -439,7 +439,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
                         <Tool\r
@@ -447,7 +447,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -462,7 +462,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
@@ -517,7 +517,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
                         <Tool\r
@@ -525,7 +525,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -542,7 +542,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
@@ -597,7 +597,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
                         <Tool\r
@@ -605,7 +605,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -620,7 +620,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                         />\r
diff --git a/build/msw/wx_vc9_wxzlib.vcproj b/build/msw/wx_vc9_wxzlib.vcproj

index 8762115d27d4c384f1d95738e712fd2089cedc7f..0f83e3252f28c7dea157318d53b9f4847dc1758b 100644 (file)
--- a/build/msw/wx_vc9_wxzlib.vcproj
+++ b/build/msw/wx_vc9_wxzlib.vcproj
@@ -43,7 +43,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories=""\r
                         />\r
                         <Tool\r
@@ -51,7 +51,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -68,7 +68,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
@@ -123,7 +123,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories=""\r
                         />\r
                         <Tool\r
@@ -131,7 +131,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -146,7 +146,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
@@ -201,7 +201,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories=""\r
                         />\r
                         <Tool\r
@@ -209,7 +209,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -226,7 +226,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
@@ -281,7 +281,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories=""\r
                         />\r
                         <Tool\r
@@ -289,7 +289,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -304,7 +304,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
@@ -359,7 +359,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories=""\r
                         />\r
                         <Tool\r
@@ -367,7 +367,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -384,7 +384,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
@@ -439,7 +439,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories=""\r
                         />\r
                         <Tool\r
@@ -447,7 +447,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -462,7 +462,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
@@ -517,7 +517,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 AdditionalIncludeDirectories=""\r
                         />\r
                         <Tool\r
@@ -525,7 +525,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG"
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -542,7 +542,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
@@ -597,7 +597,7 @@
                         />\r
                         <Tool\r
                                 Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 AdditionalIncludeDirectories=""\r
                         />\r
                         <Tool\r
@@ -605,7 +605,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="WIN32;_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG"
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -620,7 +620,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="NDEBUG"
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories=""\r
                         />\r
diff --git a/build/msw/wx_wxexpat.dsp b/build/msw/wx_wxexpat.dsp

index 999aa60be498ea00cf4bec8a31c925d0728f5d0e..26ffef999a5877687f41746a95e472239d71305d 100644 (file)
--- a/build/msw/wx_wxexpat.dsp
+++ b/build/msw/wx_wxexpat.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\wxexpat"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -69,8 +69,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivuddll\wxexpat"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -92,8 +92,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\wxexpat"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpat.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -115,8 +115,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswuddll\wxexpat"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxexpatd.pdb /I "..\..\lib\vc_dll" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -138,8 +138,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\wxexpat"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -161,8 +161,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivud\wxexpat"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -184,8 +184,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\wxexpat"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "COMPILED_FROM_DSP" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpat.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -207,8 +207,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswud\wxexpat"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "COMPILED_FROM_DSP" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxexpatd.pdb /I "..\..\lib\vc_lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "COMPILED_FROM_DSP" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/build/msw/wx_wxjpeg.dsp b/build/msw/wx_wxjpeg.dsp

index 5884e2add8b7581c7385f605011e1936bfe362e3..fe3492979c2769be00bfd3ef1ce12b22123dd099 100644 (file)
--- a/build/msw/wx_wxjpeg.dsp
+++ b/build/msw/wx_wxjpeg.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\wxjpeg"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswunivu" /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswunivu" /D "WIN32" /D "_LIB" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -69,8 +69,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivuddll\wxjpeg"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -92,8 +92,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\wxjpeg"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswu" /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswu" /D "WIN32" /D "_LIB" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpeg.pdb /I "..\..\lib\vc_dll\mswu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -115,8 +115,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswuddll\wxjpeg"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -138,8 +138,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\wxjpeg"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswunivu" /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswunivu" /D "WIN32" /D "_LIB" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -161,8 +161,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivud\wxjpeg"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -184,8 +184,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\wxjpeg"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswu" /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswu" /D "WIN32" /D "_LIB" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpeg.pdb /I "..\..\lib\vc_lib\mswu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -207,8 +207,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswud\wxjpeg"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/build/msw/wx_wxpng.dsp b/build/msw/wx_wxpng.dsp

index 3c78d967fbb2e82b860567afd60db11e4623c226..4b0e1922419cda48c4945c473fd8dd602c8bd7f4 100644 (file)
--- a/build/msw/wx_wxpng.dsp
+++ b/build/msw/wx_wxpng.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\wxpng"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -69,8 +69,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivuddll\wxpng"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -92,8 +92,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\wxpng"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -115,8 +115,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswuddll\wxpng"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -138,8 +138,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\wxpng"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -161,8 +161,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivud\wxpng"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -184,8 +184,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\wxpng"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -207,8 +207,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswud\wxpng"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/build/msw/wx_wxregex.dsp b/build/msw/wx_wxregex.dsp

index 83c8ba8480d2e5343c5911ab46d8a5434df50bdf..163e482a4dcb14169f118bc68f42de363cf85048 100644 (file)
--- a/build/msw/wx_wxregex.dsp
+++ b/build/msw/wx_wxregex.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\wxregex"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Zi /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Zi /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Zi /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Zi /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -69,8 +69,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivuddll\wxregex"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Zi /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Zi /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Zi /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Zi /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -92,8 +92,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\wxregex"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Zi /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Zi /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Zi /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Zi /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "_UNICODE" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -115,8 +115,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswuddll\wxregex"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Zi /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Zi /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Zi /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Zi /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WXMSW__" /D "_UNICODE" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -138,8 +138,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\wxregex"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Zi /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Zi /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Zi /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Zi /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -161,8 +161,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivud\wxregex"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -184,8 +184,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\wxregex"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Zi /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Zi /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Zi /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Zi /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "_UNICODE" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -207,8 +207,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswud\wxregex"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WXMSW__" /D "_UNICODE" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WXMSW__" /D "_UNICODE" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/build/msw/wx_wxscintilla.dsp b/build/msw/wx_wxscintilla.dsp

index 474972ec42face21252ac3847ee5925c6b064ce1..1d8bc15ffcf08a6663f47f4bd07c676e5b48e3b9 100644 (file)
--- a/build/msw/wx_wxscintilla.dsp
+++ b/build/msw/wx_wxscintilla.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\wxscintilla"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -69,8 +69,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivuddll\wxscintilla"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -92,8 +92,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\wxscintilla"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -115,8 +115,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswuddll\wxscintilla"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_dll\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -138,8 +138,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\wxscintilla"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -161,8 +161,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivud\wxscintilla"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -184,8 +184,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\wxscintilla"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintilla.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -207,8 +207,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswud\wxscintilla"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /Zi /Fd..\..\lib\vc_lib\wxscintillad.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/build/msw/wx_wxtiff.dsp b/build/msw/wx_wxtiff.dsp

index 7db3da28b7256fa600111d14af6ddaa18bd5ad73..9cbef2c45efa5e850a84ca9111fb0721ee5dee60 100644 (file)
--- a/build/msw/wx_wxtiff.dsp
+++ b/build/msw/wx_wxtiff.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\wxtiff"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -69,8 +69,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivuddll\wxtiff"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -92,8 +92,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\wxtiff"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -115,8 +115,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswuddll\wxtiff"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -138,8 +138,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\wxtiff"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -161,8 +161,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivud\wxtiff"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -184,8 +184,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\wxtiff"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -207,8 +207,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswud\wxtiff"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/build/msw/wx_wxzlib.dsp b/build/msw/wx_wxzlib.dsp

index 052fb918d074f67218fcb35ef63b64667b8de6fe..e0cad9c633af9676594b3ae72e3daf6017373ec3 100644 (file)
--- a/build/msw/wx_wxzlib.dsp
+++ b/build/msw/wx_wxzlib.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivudll\wxzlib"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -69,8 +69,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswunivuddll\wxzlib"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -92,8 +92,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswudll\wxzlib"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -115,8 +115,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_dll"\r
  # PROP Intermediate_Dir "vc_mswuddll\wxzlib"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -138,8 +138,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivu\wxzlib"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -161,8 +161,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswunivud\wxzlib"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -184,8 +184,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswu\wxzlib"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlib.pdb /D "WIN32" /D "_LIB" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
@@ -207,8 +207,8 @@ LIB32=link.exe -lib
  # PROP Output_Dir "..\..\lib\vc_lib"\r
  # PROP Intermediate_Dir "vc_mswud\wxzlib"\r
  # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxzlibd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /c
  # ADD BASE RSC /l 0x409\r
  # ADD RSC /l 0x409\r
  BSC32=bscmake.exe\r
diff --git a/src/regex/regguts.h b/src/regex/regguts.h

index be5041d9201f2be264497d352842fc71c2c0cd72..ec1b8aa22116739cb22b193375f1ed6f14dd1115 100644 (file)
--- a/src/regex/regguts.h
+++ b/src/regex/regguts.h
@@ -53,8 +53,10 @@
  /* assertions */
  #ifndef assert
  #      ifndef REG_DEBUG
+#      ifndef NDEBUG
  #      define  NDEBUG          /* no assertions */
  #      endif
+#      endif
  #include <assert.h>
  #endif
author	Vadim Zeitlin <vadim@wxwidgets.org>
	Fri, 18 Sep 2009 16:15:54 +0000 (16:15 +0000)
committer	Vadim Zeitlin <vadim@wxwidgets.org>
	Fri, 18 Sep 2009 16:15:54 +0000 (16:15 +0000)
Makefile.in		patch \| blob \| blame \| history
build/bakefiles/common.bkl		patch \| blob \| blame \| history
build/msw/makefile.bcc		patch \| blob \| blame \| history
build/msw/makefile.gcc		patch \| blob \| blame \| history
build/msw/makefile.vc		patch \| blob \| blame \| history
build/msw/makefile.wat		patch \| blob \| blame \| history
build/msw/wx_vc7_wxexpat.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc7_wxjpeg.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc7_wxpng.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc7_wxregex.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc7_wxscintilla.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc7_wxtiff.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc7_wxzlib.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8_wxexpat.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8_wxjpeg.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8_wxpng.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8_wxregex.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8_wxscintilla.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8_wxtiff.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8_wxzlib.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_wxexpat.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_wxjpeg.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_wxpng.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_wxregex.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_wxscintilla.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_wxtiff.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_wxzlib.vcproj		patch \| blob \| blame \| history
build/msw/wx_wxexpat.dsp		patch \| blob \| blame \| history
build/msw/wx_wxjpeg.dsp		patch \| blob \| blame \| history
build/msw/wx_wxpng.dsp		patch \| blob \| blame \| history
build/msw/wx_wxregex.dsp		patch \| blob \| blame \| history
build/msw/wx_wxscintilla.dsp		patch \| blob \| blame \| history
build/msw/wx_wxtiff.dsp		patch \| blob \| blame \| history
build/msw/wx_wxzlib.dsp		patch \| blob \| blame \| history
src/regex/regguts.h		patch \| blob \| blame \| history