From 07fce3c2f91978b00eef7a74615badb374774fc0 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 8 Mar 2000 10:38:50 +0000 Subject: [PATCH] More makefile and project fun git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/mmedia/MmediaVC.dsp | 2 +- contrib/src/mmedia/g72x.cpp | 1 + contrib/src/mmedia/makefile.b32 | 20 +++ contrib/src/mmedia/makefile.g95 | 19 +++ contrib/src/mmedia/makefile.vc | 225 ++++++++++++++++++++++++++++++++ contrib/src/mmedia/makefile.wat | 20 +++ contrib/src/ogl/OglVC.dsp | 2 +- contrib/src/ogl/makefile.dos | 2 +- contrib/src/ogl/makefile.g95 | 4 +- contrib/src/ogl/makefile.vc | 4 +- distrib/msw/generic.rsp | 8 +- docs/html/index.htm | 15 +-- src/jpeg/jpeg.dsp | 2 +- src/png/png.dsp | 2 +- src/tiff/tiff.dsp | 2 +- src/wxvc.dsp | 2 +- src/xpm/xpm.dsp | 2 +- src/zlib/zlib.dsp | 2 +- 18 files changed, 304 insertions(+), 30 deletions(-) create mode 100644 contrib/src/mmedia/makefile.b32 create mode 100644 contrib/src/mmedia/makefile.g95 create mode 100644 contrib/src/mmedia/makefile.vc create mode 100644 contrib/src/mmedia/makefile.wat diff --git a/contrib/src/mmedia/MmediaVC.dsp b/contrib/src/mmedia/MmediaVC.dsp index 384e284a5b..7e9354eecb 100644 --- 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 ec7e47d99c..d4e0740634 100644 --- 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 #include #include "wx/mmedia/internal/g72x.h" diff --git a/contrib/src/mmedia/makefile.b32 b/contrib/src/mmedia/makefile.b32 new file mode 100644 index 0000000000..219a6e3080 --- /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 index 0000000000..4311548bf0 --- /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 index 0000000000..90e894d2ff --- /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 index 0000000000..e5181dde55 --- /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 fe90d22f69..c5a15a901a 100644 --- 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 c2aae8dc83..3bcd65b8b0 100644 --- 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 addf4414d7..7c96e529c5 100644 --- 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 f3a9ec1c23..df1072a2c2 100644 --- 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 4ddcf01255..929cfa6f9a 100644 --- 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 6a75978b15..f11549ac1f 100644 --- a/docs/html/index.htm +++ b/docs/html/index.htm @@ -116,20 +116,6 @@ downloaded from the wxWindows Web site.

- - -wxTreeLayout Class - - - -wxTreeLayout Class - - - -wxTreeLayout Class - - - Remstar ODBC Classes @@ -226,6 +212,7 @@ dialog resource, translating the controls into wxWindows controls (Windows only)

  • oleauto: a little OLE automation controller (Windows only; requires Excel to be present).
  • ownerdrw: demonstrates owner-draw menus and controls (Windows only). +
  • plot: demonstrates wxPlot classes (under development).
  • png: demonstrates PNG loading.
  • printing: shows printing and previewing.
  • proplist: demonstrates the property list classes (a VB-style property editor). diff --git a/src/jpeg/jpeg.dsp b/src/jpeg/jpeg.dsp index 4f7ca3290c..9a9fbdc6fe 100644 --- 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 b27b470a0a..dfa963dfdf 100644 --- 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 4b3ed2355c..3d918dc9e2 100644 --- 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 daed614725..fabd07e457 100644 --- 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 0da259a700..3cd176618c 100644 --- 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 6763accb7d..de668c1bed 100644 --- 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" -- 2.45.2