Remove the long obsolete and unused since 2.7.0 __WIN95__ define.

Don't confuse things by defining it unnecessarily.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index afab0708064b150ede0551312838a7a12e0aeeab..8607efcba7d97350639ab0854dccff24a22865fa 100755 (executable)
--- a/configure
+++ b/configure
@@ -19762,8 +19762,6 @@ if test "$wants_win32" = 1 ; then
     USE_WIN32=1
     $as_echo "#define __WIN32__ 1" >>confdefs.h
 
     USE_WIN32=1
     $as_echo "#define __WIN32__ 1" >>confdefs.h
 

-    $as_echo "#define __WIN95__ 1" >>confdefs.h
-

     $as_echo "#define __WINDOWS__ 1" >>confdefs.h
 
     $as_echo "#define __GNUWIN32__ 1" >>confdefs.h
     $as_echo "#define __WINDOWS__ 1" >>confdefs.h
 
     $as_echo "#define __GNUWIN32__ 1" >>confdefs.h


@@ -23297,10 +23295,10 @@ fi
                         LIBS="$LIBS -lkernel32 -luser32"
     esac
 
                         LIBS="$LIBS -lkernel32 -luser32"
     esac
 

-        RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
+        RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"

     RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
 
     RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
 

-                WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
+                WXCONFIG_RESFLAGS="--define __WIN32__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"

 
         WIN32INSTALL=win32install
 fi
 
         WIN32INSTALL=win32install
 fi

diff --git a/configure.in b/configure.in
index d5fe0e19906061349151da9c0d38293a88b52046..7482a0ccbac4d8e3a36106475232e75fac5ff468 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1434,7 +1434,6 @@ if test "$wants_win32" = 1 ; then
     USE_UNIX=0
     USE_WIN32=1
     AC_DEFINE(__WIN32__)
     USE_UNIX=0
     USE_WIN32=1
     AC_DEFINE(__WIN32__)

-    AC_DEFINE(__WIN95__)

     AC_DEFINE(__WINDOWS__)
     AC_DEFINE(__GNUWIN32__)
     AC_DEFINE(STRICT)
     AC_DEFINE(__WINDOWS__)
     AC_DEFINE(__GNUWIN32__)
     AC_DEFINE(STRICT)


@@ -2834,13 +2833,13 @@ if test "$USE_WIN32" = 1 ; then
     esac
 
     dnl This one is still used by some sample makefiles.
     esac
 
     dnl This one is still used by some sample makefiles.

-    RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
+    RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"

     RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
 
     dnl This lot we export to wx-config.  It must add the relevant
     dnl include directories at the point when they can be known.
     dnl (but are these (still) required anyway?)
     RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
 
     dnl This lot we export to wx-config.  It must add the relevant
     dnl include directories at the point when they can be known.
     dnl (but are these (still) required anyway?)

-    WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
+    WXCONFIG_RESFLAGS="--define __WIN32__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"

 
     dnl install Win32-specific files in "make install"
     WIN32INSTALL=win32install
 
     dnl install Win32-specific files in "make install"
     WIN32INSTALL=win32install

diff --git a/samples/minimal/borland.bdsproj b/samples/minimal/borland.bdsproj
index 20fa88e9bdb4c6993889b8ac1df4a2cfc95dcc78..ee3f831dd04709d44a3354c4beb93013b8112c21 100644 (file)
--- a/samples/minimal/borland.bdsproj
+++ b/samples/minimal/borland.bdsproj
@@ -135,12 +135,11 @@
           <property category="win32.*.win32b.bcc32" name="option.whid.enabled" value="0"/>
           <property category="win32.*.win32b.bcc32" name="option.y.enabled" value="1"/>
           <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="INC_OLE2"/>
           <property category="win32.*.win32b.bcc32" name="option.whid.enabled" value="0"/>
           <property category="win32.*.win32b.bcc32" name="option.y.enabled" value="1"/>
           <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="INC_OLE2"/>

-          <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="__WIN95__"/>
-          <property category="win32.*.win32b.brcc32" name="option.D.arg.3" value="__WXMSW__"/>
-          <property category="win32.*.win32b.brcc32" name="option.D.arg.4" value="__WINDOWS__"/>
-          <property category="win32.*.win32b.brcc32" name="option.D.arg.5" value="WIN32"/>
-          <property category="win32.*.win32b.brcc32" name="option.D.arg.6" value="__BIDE__"/>
-          <property category="win32.*.win32b.brcc32" name="option.D.arg.7" value="NO_STRICT"/>
+          <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="__WXMSW__"/>
+          <property category="win32.*.win32b.brcc32" name="option.D.arg.3" value="__WINDOWS__"/>
+          <property category="win32.*.win32b.brcc32" name="option.D.arg.4" value="WIN32"/>
+          <property category="win32.*.win32b.brcc32" name="option.D.arg.5" value="__BIDE__"/>
+          <property category="win32.*.win32b.brcc32" name="option.D.arg.6" value="NO_STRICT"/>

           <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>
           <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>
           <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="$(BDS)\include"/>
           <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>
           <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>
           <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="$(BDS)\include"/>


@@ -186,12 +185,11 @@
           <property category="win32.*.win32b.ilink32" name="param.objfiles.3" value="sysinit.obj"/>
           <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>
           <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="INC_OLE2"/>
           <property category="win32.*.win32b.ilink32" name="param.objfiles.3" value="sysinit.obj"/>
           <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>
           <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="INC_OLE2"/>

-          <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="__WIN95__"/>
-          <property category="win32.*.win32b.tasm32" name="option.d.arg.3" value="__WXMSW__"/>
-          <property category="win32.*.win32b.tasm32" name="option.d.arg.4" value="__WINDOWS__"/>
-          <property category="win32.*.win32b.tasm32" name="option.d.arg.5" value="WIN32"/>
-          <property category="win32.*.win32b.tasm32" name="option.d.arg.6" value="__BIDE__"/>
-          <property category="win32.*.win32b.tasm32" name="option.d.arg.7" value="NO_STRICT"/>
+          <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="__WXMSW__"/>
+          <property category="win32.*.win32b.tasm32" name="option.d.arg.3" value="__WINDOWS__"/>
+          <property category="win32.*.win32b.tasm32" name="option.d.arg.4" value="WIN32"/>
+          <property category="win32.*.win32b.tasm32" name="option.d.arg.5" value="__BIDE__"/>
+          <property category="win32.*.win32b.tasm32" name="option.d.arg.6" value="NO_STRICT"/>

           <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>
           <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>
           <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="$(BDS)\include"/>
           <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>
           <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>
           <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="$(BDS)\include"/>

diff --git a/src/jpeg/jpeg.dsp b/src/jpeg/jpeg.dsp
index 93cf2974aa7c061186a3969b215255f0432f3fa1..ca71cf720aaa26217d9b2b92bef09c1866ab38d0 100644 (file)
--- a/src/jpeg/jpeg.dsp
+++ b/src/jpeg/jpeg.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c\r
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c\r

-# ADD CPP /nologo /MD /W1 /O1 /Ob2 /I "../include" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c\r
+# ADD CPP /nologo /MD /W1 /O1 /Ob2 /I "../include" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c

 # ADD BASE RSC /l 0x809\r
 # ADD RSC /l 0x809\r
 BSC32=bscmake.exe\r
 # ADD BASE RSC /l 0x809\r
 # ADD RSC /l 0x809\r
 BSC32=bscmake.exe\r


@@ -64,7 +64,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c\r
 # PROP Intermediate_Dir "Debug"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c\r

-# ADD CPP /nologo /MDd /W1 /Zi /Od /I "../include" /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c\r
+# ADD CPP /nologo /MDd /W1 /Zi /Od /I "../include" /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c

 # ADD BASE RSC /l 0x809\r
 # ADD RSC /l 0x809\r
 BSC32=bscmake.exe\r
 # ADD BASE RSC /l 0x809\r
 # ADD RSC /l 0x809\r
 BSC32=bscmake.exe\r

diff --git a/src/os2/dcprint.cpp b/src/os2/dcprint.cpp
index 9f3bd395ccddebd9a7da01d86b4c4682beefbf7b..1e26861b14bee6da7ce694ed913bf5ef87f74e96 100644 (file)
--- a/src/os2/dcprint.cpp
+++ b/src/os2/dcprint.cpp
@@ -86,10 +86,8 @@ bool wxPrinterDCImpl::StartDoc(const wxString& WXUNUSED(rsMessage))
     else
         docinfo.lpszOutput = (const wxChar *) filename;
 
     else
         docinfo.lpszOutput = (const wxChar *) filename;
 

-#if defined(__WIN95__)

     docinfo.lpszDatatype = NULL;
     docinfo.fwType = 0;
     docinfo.lpszDatatype = NULL;
     docinfo.fwType = 0;

-#endif

 
     if (!m_hDC)
         return false;
 
     if (!m_hDC)
         return false;

diff --git a/src/regex/regex.dsp b/src/regex/regex.dsp
index 7e05cd16364cc8f30f57628d9d7a36b7a485c7c1..2ff18266f77c4e04eba9f374279e526b249ae0de 100644 (file)
--- a/src/regex/regex.dsp
+++ b/src/regex/regex.dsp
@@ -48,7 +48,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r

-# ADD CPP /nologo /MD /W4 /O1 /I "." /I "../../lib/msw" /I "../../include" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c\r
+# ADD CPP /nologo /MD /W4 /O1 /I "." /I "../../lib/msw" /I "../../include" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c

 # ADD BASE RSC /l 0x809 /d "NDEBUG"\r
 # ADD RSC /l 0x809 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BASE RSC /l 0x809 /d "NDEBUG"\r
 # ADD RSC /l 0x809 /d "NDEBUG"\r
 BSC32=bscmake.exe\r


@@ -71,7 +71,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c\r
 # PROP Intermediate_Dir "Debug"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c\r

-# ADD CPP /nologo /MDd /W4 /Gm /Zi /Od /I "." /I "../../lib/mswd" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c\r
+# ADD CPP /nologo /MDd /W4 /Gm /Zi /Od /I "." /I "../../lib/mswd" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c

 # ADD BASE RSC /l 0x809 /d "_DEBUG"\r
 # ADD RSC /l 0x809 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BASE RSC /l 0x809 /d "_DEBUG"\r
 # ADD RSC /l 0x809 /d "_DEBUG"\r
 BSC32=bscmake.exe\r


@@ -94,7 +94,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r

-# ADD CPP /nologo /MD /W4 /O1 /I "." /I "../../lib/msw" /I "../../include" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c\r
+# ADD CPP /nologo /MD /W4 /O1 /I "." /I "../../lib/msw" /I "../../include" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c

 # ADD BASE RSC /l 0x809 /d "NDEBUG"\r
 # ADD RSC /l 0x809 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BASE RSC /l 0x809 /d "NDEBUG"\r
 # ADD RSC /l 0x809 /d "NDEBUG"\r
 BSC32=bscmake.exe\r


@@ -117,7 +117,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c\r
 # PROP Intermediate_Dir "Debug"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c\r

-# ADD CPP /nologo /MDd /W4 /Gm /Zi /Od /I "." /I "../../lib/mswd" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c\r
+# ADD CPP /nologo /MDd /W4 /Gm /Zi /Od /I "." /I "../../lib/mswd" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c

 # ADD BASE RSC /l 0x809 /d "_DEBUG"\r
 # ADD RSC /l 0x809 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BASE RSC /l 0x809 /d "_DEBUG"\r
 # ADD RSC /l 0x809 /d "_DEBUG"\r
 BSC32=bscmake.exe\r


@@ -139,9 +139,9 @@ LIB32=link.exe -lib
 # PROP Output_Dir "regex___Win32_Release_Unicode"\r
 # PROP Intermediate_Dir "regex___Win32_Release_Unicode"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "regex___Win32_Release_Unicode"\r
 # PROP Intermediate_Dir "regex___Win32_Release_Unicode"\r
 # PROP Target_Dir ""\r

-# ADD BASE CPP /nologo /MD /O1 /I "." /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c\r
+# ADD BASE CPP /nologo /MD /O1 /I "." /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c

 # SUBTRACT BASE CPP /YX\r
 # SUBTRACT BASE CPP /YX\r

-# ADD CPP /nologo /MD /W4 /O1 /I "." /I "../../lib/mswu" /I "../../include" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "wxUSE_UNICODE" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c\r
+# ADD CPP /nologo /MD /W4 /O1 /I "." /I "../../lib/mswu" /I "../../include" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "wxUSE_UNICODE" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c

 # ADD BASE RSC /l 0x809 /d "NDEBUG"\r
 # ADD RSC /l 0x809 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BASE RSC /l 0x809 /d "NDEBUG"\r
 # ADD RSC /l 0x809 /d "NDEBUG"\r
 BSC32=bscmake.exe\r


@@ -163,8 +163,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "regex___Win32_Debug_Unicode"\r
 # PROP Intermediate_Dir "regex___Win32_Debug_Unicode"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "regex___Win32_Debug_Unicode"\r
 # PROP Intermediate_Dir "regex___Win32_Debug_Unicode"\r
 # PROP Target_Dir ""\r

-# ADD BASE CPP /nologo /MDd /Gm /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W4 /Gm /Zi /Od /I "." /I "../../lib/mswud" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "_UNICODE" /D "UNICODE" /D "wxUSE_UNICODE" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c\r
+# ADD BASE CPP /nologo /MDd /Gm /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /Zi /Od /I "." /I "../../lib/mswud" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "_UNICODE" /D "UNICODE" /D "wxUSE_UNICODE" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c

 # ADD BASE RSC /l 0x809 /d "_DEBUG"\r
 # ADD RSC /l 0x809 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BASE RSC /l 0x809 /d "_DEBUG"\r
 # ADD RSC /l 0x809 /d "_DEBUG"\r
 BSC32=bscmake.exe\r


@@ -186,9 +186,9 @@ LIB32=link.exe -lib
 # PROP Output_Dir "regex___Win32_Release_With_Debug_Info"\r
 # PROP Intermediate_Dir "regex___Win32_Release_With_Debug_Info"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "regex___Win32_Release_With_Debug_Info"\r
 # PROP Intermediate_Dir "regex___Win32_Release_With_Debug_Info"\r
 # PROP Target_Dir ""\r

-# ADD BASE CPP /nologo /MD /O1 /I "." /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c\r
+# ADD BASE CPP /nologo /MD /O1 /I "." /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c

 # SUBTRACT BASE CPP /YX\r
 # SUBTRACT BASE CPP /YX\r

-# ADD CPP /nologo /MD /W4 /Zi /O1 /I "." /I "../../lib/msw" /I "../../include" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c\r
+# ADD CPP /nologo /MD /W4 /Zi /O1 /I "." /I "../../lib/msw" /I "../../include" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c

 # ADD BASE RSC /l 0x809 /d "NDEBUG"\r
 # ADD RSC /l 0x809 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BASE RSC /l 0x809 /d "NDEBUG"\r
 # ADD RSC /l 0x809 /d "NDEBUG"\r
 BSC32=bscmake.exe\r


@@ -210,8 +210,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "regex___Win32_Debug_Unicode_DLL"\r
 # PROP Intermediate_Dir "regex___Win32_Debug_Unicode_DLL"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "regex___Win32_Debug_Unicode_DLL"\r
 # PROP Intermediate_Dir "regex___Win32_Debug_Unicode_DLL"\r
 # PROP Target_Dir ""\r

-# ADD BASE CPP /nologo /MDd /W4 /Gm /Zi /Od /I "." /I "../../lib/mswud" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "_UNICODE" /D "UNICODE" /D "wxUSE_UNICODE" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W4 /Gm /Zi /Od /I "." /I "../../lib/mswud" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "_UNICODE" /D "UNICODE" /D "wxUSE_UNICODE" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c\r
+# ADD BASE CPP /nologo /MDd /W4 /Gm /Zi /Od /I "." /I "../../lib/mswud" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "_UNICODE" /D "UNICODE" /D "wxUSE_UNICODE" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /Zi /Od /I "." /I "../../lib/mswud" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "_UNICODE" /D "UNICODE" /D "wxUSE_UNICODE" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c

 # ADD BASE RSC /l 0x809 /d "_DEBUG"\r
 # ADD RSC /l 0x809 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BASE RSC /l 0x809 /d "_DEBUG"\r
 # ADD RSC /l 0x809 /d "_DEBUG"\r
 BSC32=bscmake.exe\r


@@ -233,8 +233,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "regex___Win32_Release_Unicode_DLL"\r
 # PROP Intermediate_Dir "regex___Win32_Release_Unicode_DLL"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "regex___Win32_Release_Unicode_DLL"\r
 # PROP Intermediate_Dir "regex___Win32_Release_Unicode_DLL"\r
 # PROP Target_Dir ""\r

-# ADD BASE CPP /nologo /MD /W4 /O1 /I "." /I "../../lib/mswu" /I "../../include" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "wxUSE_UNICODE" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c\r
-# ADD CPP /nologo /MD /W4 /O1 /I "." /I "../../lib/mswu" /I "../../include" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "wxUSE_UNICODE" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c\r
+# ADD BASE CPP /nologo /MD /W4 /O1 /I "." /I "../../lib/mswu" /I "../../include" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "wxUSE_UNICODE" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# ADD CPP /nologo /MD /W4 /O1 /I "." /I "../../lib/mswu" /I "../../include" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "wxUSE_UNICODE" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c

 # ADD BASE RSC /l 0x809 /d "NDEBUG"\r
 # ADD RSC /l 0x809 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BASE RSC /l 0x809 /d "NDEBUG"\r
 # ADD RSC /l 0x809 /d "NDEBUG"\r
 BSC32=bscmake.exe\r

diff --git a/src/zlib/zlib.dsp b/src/zlib/zlib.dsp
index 21af9ced4bb423eb5e5a84cb682cb01b2439e362..b0e1ab3dd5f0ba21bca3b426bae3d69d73c65262 100644 (file)
--- a/src/zlib/zlib.dsp
+++ b/src/zlib/zlib.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r

-# ADD CPP /nologo /MD /W1 /O1 /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c\r
+# ADD CPP /nologo /MD /W1 /O1 /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c

 # SUBTRACT CPP /YX\r
 # ADD BASE RSC /l 0x809 /d "NDEBUG"\r
 # ADD RSC /l 0x809 /d "NDEBUG"\r
 # SUBTRACT CPP /YX\r
 # ADD BASE RSC /l 0x809 /d "NDEBUG"\r
 # ADD RSC /l 0x809 /d "NDEBUG"\r


@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c\r
 # PROP Intermediate_Dir "Debug"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c\r

-# ADD CPP /nologo /MDd /W1 /Gm /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c\r
+# ADD CPP /nologo /MDd /W1 /Gm /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXDEBUG__" /D "" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c

 # ADD BASE RSC /l 0x809 /d "_DEBUG"\r
 # ADD RSC /l 0x809 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BASE RSC /l 0x809 /d "_DEBUG"\r
 # ADD RSC /l 0x809 /d "_DEBUG"\r
 BSC32=bscmake.exe\r