More makefile and project fun

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

diff --git a/contrib/src/mmedia/MmediaVC.dsp b/contrib/src/mmedia/MmediaVC.dsp
index 384e284a5bf0ed0b23f1928d9a87ffff7ddc7a1c..7e9354eecb8d176732e05ae91e45724d2f51bdaf 100644 (file)
--- a/contrib/src/mmedia/MmediaVC.dsp
+++ b/contrib/src/mmedia/MmediaVC.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /c
 # ADD BASE RSC /l 0x809
 # ADD RSC /l 0x809
 BSC32=bscmake.exe

diff --git a/contrib/src/mmedia/g72x.cpp b/contrib/src/mmedia/g72x.cpp
index ec7e47d99cedcc29e0850b2bb5a852b233e7d346..d4e0740634b4441fd8b27c8e820c722f50fe0a61 100644 (file)
--- a/contrib/src/mmedia/g72x.cpp
+++ b/contrib/src/mmedia/g72x.cpp
@@ -30,6 +30,7 @@
  * Common routines for G.721 and G.723 conversions.
  */
 
+#include <wx/wxprec.h>
 #include <stdlib.h>
 #include "wx/mmedia/internal/g72x.h"
 

diff --git a/contrib/src/mmedia/makefile.b32 b/contrib/src/mmedia/makefile.b32
new file mode 100644 (file)
index 0000000..219a6e3
--- /dev/null
+++ b/contrib/src/mmedia/makefile.b32
@@ -0,0 +1,20 @@
+#
+# File:                makefile.b32
+# Author:      Julian Smart
+# Created:     1999
+# Updated:     
+# Copyright:
+#
+# Makefile : Builds wxMMedia library for 32-bit BC++
+
+WXDIR = $(WXWIN)
+
+LIBTARGET=$(WXDIR)\contrib\lib\mmedia.lib
+
+OBJECTS = cdbase.obj cdwin.obj g711.obj g721.obj g723_24.obj \
+  g723_40.obj g72x.obj sndaiff.obj sndbase.obj sndcodec.obj \
+  sndcpcm.obj sndfile.obj sndg72x.obj sndpcm.obj sndulaw.obj \
+  sndwav.obj sndwin.obj vidbase.obj vidwin.obj
+
+!include $(WXDIR)\src\makelib.b32
+

diff --git a/contrib/src/mmedia/makefile.g95 b/contrib/src/mmedia/makefile.g95
new file mode 100644 (file)
index 0000000..4311548
--- /dev/null
+++ b/contrib/src/mmedia/makefile.g95
@@ -0,0 +1,19 @@
+#
+# File:         makefile.g95
+# Author:       Julian Smart
+# Created:      1999
+# Updated:
+# Copyright:    (c) Julian Smart, 1999
+#
+# Makefile for wxWindows MMedia library Cygwin/Mingw32).
+
+WXDIR = ../../..
+
+LIBTARGET=$(WXDIR)/contrib/lib/libmmedia.a
+OBJECTS = cdbase.o cdwin.o g711.o g721.o g723_24.o \
+  g723_40.o g72x.o sndaiff.o sndbase.o sndcodec.o \
+  sndcpcm.o sndfile.o sndg72x.o sndpcm.o sndulaw.o \
+  sndwav.o sndwin.o vidbase.o vidwin.o
+
+include $(WXDIR)/src/makelib.g95
+

diff --git a/contrib/src/mmedia/makefile.vc b/contrib/src/mmedia/makefile.vc
new file mode 100644 (file)
index 0000000..90e894d
--- /dev/null
+++ b/contrib/src/mmedia/makefile.vc
@@ -0,0 +1,225 @@
+# File:                makefile.vc
+# Author:      Julian Smart
+# Created:     2000
+# Updated:
+# Copyright:   (c) 2000, Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile : Builds Mmedia classes library (MS VC++).
+# Use FINAL=1 argument to nmake to build final version with no debugging
+# info
+
+
+# Set WXDIR for your system
+WXDIR = $(WXWIN)
+OGLDIR = $(WXDIR)\contrib\src\mmedia
+OGLINC = $(WXDIR)\contrib\include\wx\mmedia
+THISDIR = $(WXDIR)\contrib\src\mmedia
+DOCDIR=$(WXDIR)\contrib\docs
+LOCALDOCDIR=$(WXDIR)\contrib\docs\latex\mmedia
+
+!include $(WXDIR)\src\makevc.env
+
+OBJECTS = $(D)\cdbase.obj $(D)\cdwin.obj $(D)\g711.obj $(D)\g721.obj $(D)\g723_24.obj \
+  $(D)\g723_40.obj $(D)\g72x.obj $(D)\sndaiff.obj $(D)\sndbase.obj $(D)\sndcodec.obj \
+  $(D)\sndcpcm.obj $(D)\sndfile.obj $(D)\sndg72x.obj $(D)\sndpcm.obj $(D)\sndulaw.obj \
+  $(D)\sndwav.obj $(D)\sndwin.obj $(D)\vidbase.obj $(D)\vidwin.obj
+
+LIBTARGET=$(WXDIR)\contrib\lib\mmedia$(LIBEXT).lib
+
+all:    $(D) $(LIBTARGET)
+
+$(D) :
+       mkdir $(D)
+
+wx:
+        cd $(WXDIR)\src\msw
+        nmake -f makefile.vc FINAL=$(FINAL)
+        cd $(THISDIR)
+
+wxclean:
+        cd $(WXDIR)\src\msw
+        nmake -f makefile.vc clean
+        cd $(THISDIR)
+
+$(LIBTARGET): $(OBJECTS)
+       -erase $(LIBTARGET)
+       $(implib) @<<
+-out:$(LIBTARGET)
+-machine:$(CPU)
+$(OBJECTS)
+<<
+
+$(D)\cdbase.obj:      cdbase.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Fo$@ /Tp $(*B).$(SRCSUFF)
+<<
+
+$(D)\cdwin.obj:      cdwin.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Fo$@ /Tp $(*B).$(SRCSUFF)
+<<
+
+$(D)\g711.obj:      g711.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Fo$@ /Tp $(*B).$(SRCSUFF)
+<<
+
+$(D)\g721.obj:      g721.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Fo$@ /Tp $(*B).$(SRCSUFF)
+<<
+
+$(D)\g723_24.obj:      g723_24.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Fo$@ /Tp $(*B).$(SRCSUFF)
+<<
+
+$(D)\g723_40.obj:      g723_40.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Fo$@ /Tp $(*B).$(SRCSUFF)
+<<
+
+$(D)\g72x.obj:      g72x.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Fo$@ /Tp $(*B).$(SRCSUFF)
+<<
+
+$(D)\sndaiff.obj:      sndaiff.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Fo$@ /Tp $(*B).$(SRCSUFF)
+<<
+
+$(D)\sndbase.obj:      sndbase.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Fo$@ /Tp $(*B).$(SRCSUFF)
+<<
+
+$(D)\sndcodec.obj:      sndcodec.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Fo$@ /Tp $(*B).$(SRCSUFF)
+<<
+
+$(D)\sndcpcm.obj:      sndcpcm.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Fo$@ /Tp $(*B).$(SRCSUFF)
+<<
+
+$(D)\sndfile.obj:      sndfile.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Fo$@ /Tp $(*B).$(SRCSUFF)
+<<
+
+$(D)\sndg72x.obj:      sndg72x.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Fo$@ /Tp $(*B).$(SRCSUFF)
+<<
+
+$(D)\sndpcm.obj:      sndpcm.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Fo$@ /Tp $(*B).$(SRCSUFF)
+<<
+
+$(D)\sndulaw.obj:      sndulaw.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Fo$@ /Tp $(*B).$(SRCSUFF)
+<<
+
+$(D)\sndwav.obj:      sndwav.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Fo$@ /Tp $(*B).$(SRCSUFF)
+<<
+
+$(D)\sndwin.obj:      sndwin.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Fo$@ /Tp $(*B).$(SRCSUFF)
+<<
+
+$(D)\vidbase.obj:      vidbase.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Fo$@ /Tp $(*B).$(SRCSUFF)
+<<
+
+$(D)\vidwin.obj:      vidwin.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Fo$@ /Tp $(*B).$(SRCSUFF)
+<<
+
+clean:
+        -erase $(D)\*.obj
+        -erase *.sbr
+        -erase *.exe
+        -erase *.res
+        -erase *.map
+        -erase *.pdb
+        -erase $(LIBTARGET)
+
+DOCSOURCES=$(LOCALDOCDIR)\mmedia.tex \
+ $(LOCALDOCDIR)\bugs.tex $(LOCALDOCDIR)\changes.tex\
+ $(LOCALDOCDIR)\classes.tex $(LOCALDOCDIR)\intro.tex\
+ $(LOCALDOCDIR)\topics.tex $(LOCALDOCDIR)\sample.tex
+
+html: $(DOCDIR)\html\mmedia\mmedia.htm
+htmlhelp: $(DOCDIR)\html\mmedia\mmedia.chm
+hlp: $(DOCDIR)\winhelp\mmedia.hlp
+pdfrtf: $(DOCDIR)\pdf\mmedia.rtf
+ps: $(DOCDIR)\ps\mmedia.ps
+
+touchmanual:
+       touch $(LOCALDOCDIR)\mmedia.tex
+
+
+$(DOCDIR)\winhelp\mmedia.hlp:         $(LOCALDOCDIR)\mmedia.rtf $(LOCALDOCDIR)\mmedia.hpj
+        cd $(LOCALDOCDIR)
+        -erase mmedia.ph
+        hc mmedia
+        move mmedia.hlp $(DOCDIR)\winhelp\mmedia.hlp
+        move mmedia.cnt $(DOCDIR)\winhelp\mmedia.cnt
+        cd $(THISDIR)
+
+$(LOCALDOCDIR)\mmedia.rtf: $(DOCSOURCES)
+        cd $(LOCALDOCDIR)
+        -start $(WAITFLAG) tex2rtf $(LOCALDOCDIR)\mmedia.tex $(LOCALDOCDIR)\mmedia.rtf -twice -winhelp
+        cd $(THISDIR)
+
+$(DOCDIR)\pdf\mmedia.rtf: $(DOCSOURCES)
+        cd $(LOCALDOCDIR)
+        -copy *.bmp $(DOCDIR)\pdf
+        -start $(WAITFLAG) tex2rtf $(LOCALDOCDIR)\mmedia.tex $(DOCDIR)\pdf\mmedia.rtf -twice -rtf
+        cd $(THISDIR)
+
+$(DOCDIR)\html\mmedia\mmedia.htm:         $(DOCSOURCES)
+        cd $(LOCALDOCDIR)
+        -mkdir $(DOCDIR)\html\mmedia
+        copy *.gif $(DOCDIR)\html\mmedia
+        -start $(WAITFLAG) tex2rtf $(LOCALDOCDIR)\mmedia.tex $(DOCDIR)\html\mmedia\mmedia.htm -twice -html
+        -erase $(DOCDIR)\html\mmedia\*.con
+       -erase *.con
+        -erase $(DOCDIR)\html\mmedia\*.ref
+        cd $(THISDIR)
+
+
+$(DOCDIR)\html\mmedia\mmedia.chm: $(DOCDIR)\html\mmedia\mmedia.htm $(DOCDIR)\html\mmedia\mmedia.hhp
+       cd $(DOCDIR)\html\mmedia
+       -hhc mmedia.hhp
+       cd $(THISDIR)
+
+
+$(LOCALDOCDIR)\mmedia.dvi:     $(DOCSOURCES)
+       cd $(LOCALDOCDIR)
+        -latex mmedia
+        -latex mmedia
+        -makeindx mmedia
+        -bibtex mmedia
+        -latex mmedia
+        -latex mmedia
+        cd $(THISDIR)
+
+$(WXDIR)\docs\ps\mmedia.ps:    $(LOCALDOCDIR)\mmedia.dvi
+       cd $(LOCALDOCDIR)
+        -dvips32 -o mmedia.ps mmedia
+        move mmedia.ps $(WXDIR)\docs\ps\mmedia.ps
+        cd $(THISDIR)
+
+

diff --git a/contrib/src/mmedia/makefile.wat b/contrib/src/mmedia/makefile.wat
new file mode 100644 (file)
index 0000000..e5181dd
--- /dev/null
+++ b/contrib/src/mmedia/makefile.wat
@@ -0,0 +1,20 @@
+#!/binb/wmake.exe
+#
+# File:                makefile.wat
+# Author:      Julian Smart
+# Created:     1999
+#
+# Makefile : Builds MMedia library for Watcom C++, WIN32
+
+WXDIR = $(%WXWIN)
+
+LIBTARGET=$(WXDIR)\contrib\lib\mmedia.lib
+
+OBJECTS = cdbase.obj cdwin.obj g711.obj g721.obj g723_24.obj &
+  g723_40.obj g72x.obj sndaiff.obj sndbase.obj sndcodec.obj &
+  sndcpcm.obj sndfile.obj sndg72x.obj sndpcm.obj sndulaw.obj &
+  sndwav.obj sndwin.obj vidbase.obj vidwin.obj
+
+!include $(WXDIR)\src\makelib.wat
+
+

diff --git a/contrib/src/ogl/OglVC.dsp b/contrib/src/ogl/OglVC.dsp
index fe90d22f69f01385a1dc118f801976992c078e61..c5a15a901a20b466457a42cf3176d2a690224942 100644 (file)
--- a/contrib/src/ogl/OglVC.dsp
+++ b/contrib/src/ogl/OglVC.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x809
 # ADD RSC /l 0x809

diff --git a/contrib/src/ogl/makefile.dos b/contrib/src/ogl/makefile.dos
index c2aae8dc83c0cc9ad487706cbb6c1da8df52c0b0..3bcd65b8b0f5e7cfe4251010094d3b0c176559c4 100644 (file)
--- a/contrib/src/ogl/makefile.dos
+++ b/contrib/src/ogl/makefile.dos
@@ -18,7 +18,7 @@ WXDIR = $(WXWIN)
 
 OGLDIR = $(WXDIR)\contrib\src\ogl
 THISDIR = $(OGLDIR)
-DOCDIR = $(WXDIR)\docs\latex\ogl
+DOCDIR = $(WXDIR)\contrib\docs\latex\ogl
 
 GRAPHICSLIB = $(WXDIR)\contrib\lib\ogl.lib
 INC = /I$(WXDIR)\include /I$(WXDIR)\contrib\include

diff --git a/contrib/src/ogl/makefile.g95 b/contrib/src/ogl/makefile.g95
index addf4414d70e411c9c0029b78f1740340d928fe1..7c96e529c53d4446d3b2d8611a6044d8fc51ecc1 100644 (file)
--- a/contrib/src/ogl/makefile.g95
+++ b/contrib/src/ogl/makefile.g95
@@ -7,9 +7,9 @@
 #
 # Makefile for wxWindows OGL library Cygwin/Mingw32).
 
-WXDIR = ../..
+WXDIR = ../../..
 
-LIBTARGET=$(WXDIR)/lib/libogl.a
+LIBTARGET=$(WXDIR)/contrib/lib/libogl.a
 OBJECTS = basic.o basic2.o canvas.o ogldiag.o lines.o misc.o divided.o constrnt.o\
  composit.o drawn.o bmpshape.o mfutils.o
 

diff --git a/contrib/src/ogl/makefile.vc b/contrib/src/ogl/makefile.vc
index f3a9ec1c234d1b2544a652940f830f0befa5a0ce..df1072a2c2d84ad87a096d4131646f536094555e 100644 (file)
--- a/contrib/src/ogl/makefile.vc
+++ b/contrib/src/ogl/makefile.vc
@@ -14,9 +14,9 @@
 
 # Set WXDIR for your system
 WXDIR = $(WXWIN)
-OGLDIR = $(WXDIR)\src\ogl
+OGLDIR = $(WXDIR)\contrib\src\ogl
 OGLINC = $(WXDIR)\contrib\include\wx\ogl
-THISDIR = $(WXDIR)\src\ogl
+THISDIR = $(WXDIR)\contrib\src\ogl
 EXTRAFLAGS=/DPROLOGIO=1
 DOCDIR=$(WXDIR)\contrib\docs
 LOCALDOCDIR=$(WXDIR)\contrib\docs\latex\ogl

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 4ddcf0125536cfa7c498bb5d26a5dcda1492340b..929cfa6f9ab0cc1526cc29d057a162cade06e2b0 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -238,11 +238,13 @@ utils/dialoged/test/*.ico
 utils/dialoged/test/*.prj
 utils/dialoged/test/*.bmp
 
+contrib/include/wx/mmedia/*.h
+contrib/include/wx/mmedia/internal/*.h
 contrib/src/mmedia/makefile*
 contrib/src/mmedia/README
-contrib/src/mmedia/lib/*.h
-contrib/src/mmedia/lib/*.cpp
-contrib/src/mmedia/lib/makefile*
+contrib/src/mmedia/*.h
+contrib/src/mmedia/*.cpp
+contrib/src/mmedia/makefile*
 contrib/samples/mmedia/*.h
 contrib/samples/mmedia/*.cpp
 contrib/samples/mmedia/makefile*

diff --git a/docs/html/index.htm b/docs/html/index.htm
index 6a75978b150a3734246bf698f17be73411c528dd..f11549ac1f48ee73526cb0d93bb2e2f96a844138 100644 (file)
--- a/docs/html/index.htm
+++ b/docs/html/index.htm
@@ -116,20 +116,6 @@ downloaded from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<P
 </td>
 </tr>
 
-<tr>
-<td align=center>
-<a href="wxtree/tree.htm">wxTreeLayout Class</a>
-</td>
-
-<td align=center>
-<a href="../winhelp/wxtree.hlp">wxTreeLayout Class</a>
-</td>
-
-<td align=center>
-<a href="../pdf/wxtree.pdf">wxTreeLayout Class</a>
-</td>
-</tr>
-
 <tr>
 <td align=center>
 <a href="odbc/odbc.htm">Remstar ODBC Classes</a>
@@ -226,6 +212,7 @@ dialog resource, translating the controls into wxWindows controls (Windows only)
 <li><a href="../../samples/oleauto">oleauto</a>: a little OLE automation controller (Windows only; requires
 Excel to be present).
 <li><a href="../../samples/ownerdrw">ownerdrw</a>: demonstrates owner-draw menus and controls (Windows only).
+<li><a href="../../samples/plot">plot</a>: demonstrates wxPlot classes (under development).
 <li><a href="../../samples/png">png</a>: demonstrates PNG loading.
 <li><a href="../../samples/printing">printing</a>: shows printing and previewing.
 <li><a href="../../samples/proplist">proplist</a>: demonstrates the property list classes (a VB-style property editor).

diff --git a/src/jpeg/jpeg.dsp b/src/jpeg/jpeg.dsp
index 4f7ca3290ccdafcffaf4d0ea69a759631be5fd0a..9a9fbdc6fe604287e13c38e9936709db8073266e 100644 (file)
--- a/src/jpeg/jpeg.dsp
+++ b/src/jpeg/jpeg.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /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
 # ADD BASE RSC /l 0x809
 # ADD RSC /l 0x809
 BSC32=bscmake.exe

diff --git a/src/png/png.dsp b/src/png/png.dsp
index b27b470a0a4ad0ccdffb17042c0aff65b2b81103..dfa963dfdfc7088204e18f3b6faf66e8aa74d528 100644 (file)
--- a/src/png/png.dsp
+++ b/src/png/png.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /I "..\zlib" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /I "..\zlib" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /c
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
 # ADD RSC /l 0x809 /d "NDEBUG"
 BSC32=bscmake.exe

diff --git a/src/tiff/tiff.dsp b/src/tiff/tiff.dsp
index 4b3ed2355c4e23e53b1ba2d5a69d1ca309d1a8d9..3d918dc9e2d553413e2e7e57d322bf1bb0525947 100644 (file)
--- a/src/tiff/tiff.dsp
+++ b/src/tiff/tiff.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /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
 # ADD BASE RSC /l 0x809
 # ADD RSC /l 0x809
 BSC32=bscmake.exe

diff --git a/src/wxvc.dsp b/src/wxvc.dsp
index daed614725bc9d7817aed40737d27665d2056ff2..fabd07e457b42c8c3dc9b868fb4fbe9fbe4a645e 100644 (file)
--- a/src/wxvc.dsp
+++ b/src/wxvc.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "msw/Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /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
 # ADD BASE RSC /l 0x809
 # ADD RSC /l 0x809
 BSC32=bscmake.exe

diff --git a/src/xpm/xpm.dsp b/src/xpm/xpm.dsp
index 0da259a70085204728ad35f385459ed24cdbf00c..3cd176618c45fa43d1691631cf8c337097a9b56a 100644 (file)
--- a/src/xpm/xpm.dsp
+++ b/src/xpm/xpm.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
 # ADD RSC /l 0x809 /d "NDEBUG"

diff --git a/src/zlib/zlib.dsp b/src/zlib/zlib.dsp
index 6763accb7dc2136dced1fa28866bb6588e069a58..de668c1bedc18a63590ed68ad9b34f5033e23e8b 100644 (file)
--- a/src/zlib/zlib.dsp
+++ b/src/zlib/zlib.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
 # ADD RSC /l 0x809 /d "NDEBUG"