From 1dbdb45df56cfa29969ae0fd5a81df53925bc147 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 3 Aug 2003 16:35:41 +0000 Subject: [PATCH] added ability to generate wx24-like wxWindows.dsp git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/bakefiles/Makefile | 138 ++++++++- build/bakefiles/compat/README | 3 + build/bakefiles/compat/wx24dsp.bkl | 58 ++++ build/bakefiles/compat/wx24dsp.empy | 457 ++++++++++++++++++++++++++++ build/bakefiles/regenMakefile.py | 9 +- src/wxWindows.dsp | 310 +++++++++++++------ 6 files changed, 878 insertions(+), 97 deletions(-) create mode 100644 build/bakefiles/compat/README create mode 100644 build/bakefiles/compat/wx24dsp.bkl create mode 100644 build/bakefiles/compat/wx24dsp.empy diff --git a/build/bakefiles/Makefile b/build/bakefiles/Makefile index 6b5ec47dd8..2130607623 100644 --- a/build/bakefiles/Makefile +++ b/build/bakefiles/Makefile @@ -11,15 +11,22 @@ MDEPS = common.bkl config.bkl files.bkl monolithic.bkl multilib.bkl opengl.bkl w DSWFLAGS = -DRUNTIME_LIBS=dynamic -DOFFICIAL_BUILD=0 -DUSE_HTML=1 \ -DUSE_OPENGL=1 -DUSE_ODBC=1 -DMONOLITHIC=0 -DUSE_GUI=1 \ -DDEBUG_INFO=default -DDEBUG_FLAG=default + +COMPAT_TARGETS = ../../src/wxWindows.dsp + AUTOCONF_ALL = \ ../../Makefile.in \ ../../contrib/samples/animate/Makefile.in \ ../../contrib/samples/svg/Makefile.in \ ../../contrib/samples/xrc/Makefile.in \ ../../contrib/src/animate/Makefile.in \ + ../../contrib/src/deprecated/Makefile.in \ ../../contrib/src/fl/Makefile.in \ ../../contrib/src/gizmos/Makefile.in \ + ../../contrib/src/mmedia/Makefile.in \ + ../../contrib/src/net/Makefile.in \ ../../contrib/src/ogl/Makefile.in \ + ../../contrib/src/plot/Makefile.in \ ../../contrib/src/stc/Makefile.in \ ../../contrib/src/svg/Makefile.in \ ../../contrib/src/xrc/Makefile.in \ @@ -109,9 +116,13 @@ AUTOCONF_ALL = \ ../../samples/wxtest/Makefile.in BORLAND_ALL = \ ../../contrib/build/animate/makefile.bcc \ + ../../contrib/build/deprecated/makefile.bcc \ ../../contrib/build/fl/makefile.bcc \ ../../contrib/build/gizmos/makefile.bcc \ + ../../contrib/build/mmedia/makefile.bcc \ + ../../contrib/build/net/makefile.bcc \ ../../contrib/build/ogl/makefile.bcc \ + ../../contrib/build/plot/makefile.bcc \ ../../contrib/build/stc/makefile.bcc \ ../../contrib/build/svg/makefile.bcc \ ../../contrib/build/xrc/makefile.bcc \ @@ -205,9 +216,13 @@ BORLAND_ALL = \ ../makefile.bcc MINGW_ALL = \ ../../contrib/build/animate/makefile.gcc \ + ../../contrib/build/deprecated/makefile.gcc \ ../../contrib/build/fl/makefile.gcc \ ../../contrib/build/gizmos/makefile.gcc \ + ../../contrib/build/mmedia/makefile.gcc \ + ../../contrib/build/net/makefile.gcc \ ../../contrib/build/ogl/makefile.gcc \ + ../../contrib/build/plot/makefile.gcc \ ../../contrib/build/stc/makefile.gcc \ ../../contrib/build/svg/makefile.gcc \ ../../contrib/build/xrc/makefile.gcc \ @@ -301,9 +316,13 @@ MINGW_ALL = \ ../makefile.gcc MSVC_ALL = \ ../../contrib/build/animate/makefile.vc \ + ../../contrib/build/deprecated/makefile.vc \ ../../contrib/build/fl/makefile.vc \ ../../contrib/build/gizmos/makefile.vc \ + ../../contrib/build/mmedia/makefile.vc \ + ../../contrib/build/net/makefile.vc \ ../../contrib/build/ogl/makefile.vc \ + ../../contrib/build/plot/makefile.vc \ ../../contrib/build/stc/makefile.vc \ ../../contrib/build/svg/makefile.vc \ ../../contrib/build/xrc/makefile.vc \ @@ -397,9 +416,13 @@ MSVC_ALL = \ ../makefile.vc MSVC6PRJ_ALL = \ ../../contrib/build/animate/animate.dsw \ + ../../contrib/build/deprecated/deprecated.dsw \ ../../contrib/build/fl/fl.dsw \ ../../contrib/build/gizmos/gizmos.dsw \ + ../../contrib/build/mmedia/mmedia.dsw \ + ../../contrib/build/net/netutils.dsw \ ../../contrib/build/ogl/ogl.dsw \ + ../../contrib/build/plot/plot.dsw \ ../../contrib/build/stc/stc.dsw \ ../../contrib/build/svg/svg.dsw \ ../../contrib/build/xrc/xrc.dsw \ @@ -490,9 +513,13 @@ MSVC6PRJ_ALL = \ ../wx.dsw WATCOM_ALL = \ ../../contrib/build/animate/makefile.wat \ + ../../contrib/build/deprecated/makefile.wat \ ../../contrib/build/fl/makefile.wat \ ../../contrib/build/gizmos/makefile.wat \ + ../../contrib/build/mmedia/makefile.wat \ + ../../contrib/build/net/makefile.wat \ ../../contrib/build/ogl/makefile.wat \ + ../../contrib/build/plot/makefile.wat \ ../../contrib/build/stc/makefile.wat \ ../../contrib/build/svg/makefile.wat \ ../../contrib/build/xrc/makefile.wat \ @@ -584,7 +611,8 @@ WATCOM_ALL = \ ../../samples/wizard/makefile.wat \ ../../samples/wxtest/makefile.wat \ ../makefile.wat -all: autoconf borland mingw msvc msvc6prj watcom + +all: $(COMPAT_TARGETS) autoconf borland mingw msvc msvc6prj watcom autoconf: $(AUTOCONF_ALL) borland: $(BORLAND_ALL) @@ -595,14 +623,19 @@ watcom: $(WATCOM_ALL) clean: rm -f ../../autoconf_inc.m4 + rm -f $(COMPAT_TARGETS) rm -f ../../Makefile.in rm -f ../../contrib/samples/animate/Makefile.in rm -f ../../contrib/samples/svg/Makefile.in rm -f ../../contrib/samples/xrc/Makefile.in rm -f ../../contrib/src/animate/Makefile.in + rm -f ../../contrib/src/deprecated/Makefile.in rm -f ../../contrib/src/fl/Makefile.in rm -f ../../contrib/src/gizmos/Makefile.in + rm -f ../../contrib/src/mmedia/Makefile.in + rm -f ../../contrib/src/net/Makefile.in rm -f ../../contrib/src/ogl/Makefile.in + rm -f ../../contrib/src/plot/Makefile.in rm -f ../../contrib/src/stc/Makefile.in rm -f ../../contrib/src/svg/Makefile.in rm -f ../../contrib/src/xrc/Makefile.in @@ -691,9 +724,13 @@ clean: rm -f ../../samples/wizard/Makefile.in rm -f ../../samples/wxtest/Makefile.in rm -f ../../contrib/build/animate/makefile.bcc + rm -f ../../contrib/build/deprecated/makefile.bcc rm -f ../../contrib/build/fl/makefile.bcc rm -f ../../contrib/build/gizmos/makefile.bcc + rm -f ../../contrib/build/mmedia/makefile.bcc + rm -f ../../contrib/build/net/makefile.bcc rm -f ../../contrib/build/ogl/makefile.bcc + rm -f ../../contrib/build/plot/makefile.bcc rm -f ../../contrib/build/stc/makefile.bcc rm -f ../../contrib/build/svg/makefile.bcc rm -f ../../contrib/build/xrc/makefile.bcc @@ -786,9 +823,13 @@ clean: rm -f ../../samples/wxtest/makefile.bcc rm -f ../makefile.bcc rm -f ../../contrib/build/animate/makefile.gcc + rm -f ../../contrib/build/deprecated/makefile.gcc rm -f ../../contrib/build/fl/makefile.gcc rm -f ../../contrib/build/gizmos/makefile.gcc + rm -f ../../contrib/build/mmedia/makefile.gcc + rm -f ../../contrib/build/net/makefile.gcc rm -f ../../contrib/build/ogl/makefile.gcc + rm -f ../../contrib/build/plot/makefile.gcc rm -f ../../contrib/build/stc/makefile.gcc rm -f ../../contrib/build/svg/makefile.gcc rm -f ../../contrib/build/xrc/makefile.gcc @@ -881,9 +922,13 @@ clean: rm -f ../../samples/wxtest/makefile.gcc rm -f ../makefile.gcc rm -f ../../contrib/build/animate/makefile.vc + rm -f ../../contrib/build/deprecated/makefile.vc rm -f ../../contrib/build/fl/makefile.vc rm -f ../../contrib/build/gizmos/makefile.vc + rm -f ../../contrib/build/mmedia/makefile.vc + rm -f ../../contrib/build/net/makefile.vc rm -f ../../contrib/build/ogl/makefile.vc + rm -f ../../contrib/build/plot/makefile.vc rm -f ../../contrib/build/stc/makefile.vc rm -f ../../contrib/build/svg/makefile.vc rm -f ../../contrib/build/xrc/makefile.vc @@ -976,9 +1021,13 @@ clean: rm -f ../../samples/wxtest/makefile.vc rm -f ../makefile.vc rm -f ../../contrib/build/animate/animate.dsw + rm -f ../../contrib/build/deprecated/deprecated.dsw rm -f ../../contrib/build/fl/fl.dsw rm -f ../../contrib/build/gizmos/gizmos.dsw + rm -f ../../contrib/build/mmedia/mmedia.dsw + rm -f ../../contrib/build/net/netutils.dsw rm -f ../../contrib/build/ogl/ogl.dsw + rm -f ../../contrib/build/plot/plot.dsw rm -f ../../contrib/build/stc/stc.dsw rm -f ../../contrib/build/svg/svg.dsw rm -f ../../contrib/build/xrc/xrc.dsw @@ -1068,9 +1117,13 @@ clean: rm -f ../../samples/wxtest/wxtest.dsw rm -f ../wx.dsw rm -f ../../contrib/build/animate/makefile.wat + rm -f ../../contrib/build/deprecated/makefile.wat rm -f ../../contrib/build/fl/makefile.wat rm -f ../../contrib/build/gizmos/makefile.wat + rm -f ../../contrib/build/mmedia/makefile.wat + rm -f ../../contrib/build/net/makefile.wat rm -f ../../contrib/build/ogl/makefile.wat + rm -f ../../contrib/build/plot/makefile.wat rm -f ../../contrib/build/stc/makefile.wat rm -f ../../contrib/build/svg/makefile.wat rm -f ../../contrib/build/xrc/makefile.wat @@ -1168,6 +1221,9 @@ library: ../../Makefile.in ../makefile.bcc ../makefile.vc ../makefile.wat ../mak ../../autoconf_inc.m4: ../../Makefile.in +../../src/wxWindows.dsp: monolithic.bkl files.bkl + $(BAKEFILE) -Icompat -fwx24dsp -DUSE_GUI=1 -DWXUNIV=0 -o$@ wx.bkl + Makefile: regenMakefile.py ./regenMakefile.py @echo @@ -1198,6 +1254,26 @@ Makefile: regenMakefile.py touch $@ +../../contrib/src/deprecated/Makefile.in: $(CDEPS) ../../contrib/build/deprecated/deprecated.bkl + $(BAKEFILE) -fautoconf -o$@ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/deprecated/deprecated.bkl + touch $@ +../../contrib/build/deprecated/makefile.bcc: $(CDEPS) ../../contrib/build/deprecated/deprecated.bkl + $(BAKEFILE) -fborland -o$@ -DOPTIONS_FILE=../../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/deprecated -DWXTOPDIR=../../../ ../../contrib/build/deprecated/deprecated.bkl + touch $@ +../../contrib/build/deprecated/makefile.vc: $(CDEPS) ../../contrib/build/deprecated/deprecated.bkl + $(BAKEFILE) -fmsvc -o$@ -DOPTIONS_FILE=../../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/deprecated -DWXTOPDIR=../../../ ../../contrib/build/deprecated/deprecated.bkl + touch $@ +../../contrib/build/deprecated/makefile.gcc: $(CDEPS) ../../contrib/build/deprecated/deprecated.bkl + $(BAKEFILE) -fmingw -o$@ -DOPTIONS_FILE=../../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/deprecated -DWXTOPDIR=../../../ ../../contrib/build/deprecated/deprecated.bkl + touch $@ +../../contrib/build/deprecated/makefile.wat: $(CDEPS) ../../contrib/build/deprecated/deprecated.bkl + $(BAKEFILE) -fwatcom -o$@ -DOPTIONS_FILE=../../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/deprecated -DWXTOPDIR=../../../ ../../contrib/build/deprecated/deprecated.bkl + touch $@ +../../contrib/build/deprecated/deprecated.dsw: $(CDEPS) ../../contrib/build/deprecated/deprecated.bkl + $(BAKEFILE) -fmsvc6prj -o$@ $(DSWFLAGS) -DSRCDIR=../../src/deprecated -DWXTOPDIR=../../../ ../../contrib/build/deprecated/deprecated.bkl + touch $@ + + ../../contrib/src/fl/Makefile.in: $(CDEPS) ../../contrib/build/fl/fl.bkl $(BAKEFILE) -fautoconf -o$@ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/fl/fl.bkl touch $@ @@ -1238,6 +1314,46 @@ Makefile: regenMakefile.py touch $@ +../../contrib/src/mmedia/Makefile.in: $(CDEPS) ../../contrib/build/mmedia/mmedia.bkl + $(BAKEFILE) -fautoconf -o$@ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/mmedia/mmedia.bkl + touch $@ +../../contrib/build/mmedia/makefile.bcc: $(CDEPS) ../../contrib/build/mmedia/mmedia.bkl + $(BAKEFILE) -fborland -o$@ -DOPTIONS_FILE=../../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/mmedia -DWXTOPDIR=../../../ ../../contrib/build/mmedia/mmedia.bkl + touch $@ +../../contrib/build/mmedia/makefile.vc: $(CDEPS) ../../contrib/build/mmedia/mmedia.bkl + $(BAKEFILE) -fmsvc -o$@ -DOPTIONS_FILE=../../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/mmedia -DWXTOPDIR=../../../ ../../contrib/build/mmedia/mmedia.bkl + touch $@ +../../contrib/build/mmedia/makefile.gcc: $(CDEPS) ../../contrib/build/mmedia/mmedia.bkl + $(BAKEFILE) -fmingw -o$@ -DOPTIONS_FILE=../../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/mmedia -DWXTOPDIR=../../../ ../../contrib/build/mmedia/mmedia.bkl + touch $@ +../../contrib/build/mmedia/makefile.wat: $(CDEPS) ../../contrib/build/mmedia/mmedia.bkl + $(BAKEFILE) -fwatcom -o$@ -DOPTIONS_FILE=../../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/mmedia -DWXTOPDIR=../../../ ../../contrib/build/mmedia/mmedia.bkl + touch $@ +../../contrib/build/mmedia/mmedia.dsw: $(CDEPS) ../../contrib/build/mmedia/mmedia.bkl + $(BAKEFILE) -fmsvc6prj -o$@ $(DSWFLAGS) -DSRCDIR=../../src/mmedia -DWXTOPDIR=../../../ ../../contrib/build/mmedia/mmedia.bkl + touch $@ + + +../../contrib/src/net/Makefile.in: $(CDEPS) ../../contrib/build/net/netutils.bkl + $(BAKEFILE) -fautoconf -o$@ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/net/netutils.bkl + touch $@ +../../contrib/build/net/makefile.bcc: $(CDEPS) ../../contrib/build/net/netutils.bkl + $(BAKEFILE) -fborland -o$@ -DOPTIONS_FILE=../../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/net -DWXTOPDIR=../../../ ../../contrib/build/net/netutils.bkl + touch $@ +../../contrib/build/net/makefile.vc: $(CDEPS) ../../contrib/build/net/netutils.bkl + $(BAKEFILE) -fmsvc -o$@ -DOPTIONS_FILE=../../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/net -DWXTOPDIR=../../../ ../../contrib/build/net/netutils.bkl + touch $@ +../../contrib/build/net/makefile.gcc: $(CDEPS) ../../contrib/build/net/netutils.bkl + $(BAKEFILE) -fmingw -o$@ -DOPTIONS_FILE=../../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/net -DWXTOPDIR=../../../ ../../contrib/build/net/netutils.bkl + touch $@ +../../contrib/build/net/makefile.wat: $(CDEPS) ../../contrib/build/net/netutils.bkl + $(BAKEFILE) -fwatcom -o$@ -DOPTIONS_FILE=../../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/net -DWXTOPDIR=../../../ ../../contrib/build/net/netutils.bkl + touch $@ +../../contrib/build/net/netutils.dsw: $(CDEPS) ../../contrib/build/net/netutils.bkl + $(BAKEFILE) -fmsvc6prj -o$@ $(DSWFLAGS) -DSRCDIR=../../src/net -DWXTOPDIR=../../../ ../../contrib/build/net/netutils.bkl + touch $@ + + ../../contrib/src/ogl/Makefile.in: $(CDEPS) ../../contrib/build/ogl/ogl.bkl $(BAKEFILE) -fautoconf -o$@ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/ogl/ogl.bkl touch $@ @@ -1258,6 +1374,26 @@ Makefile: regenMakefile.py touch $@ +../../contrib/src/plot/Makefile.in: $(CDEPS) ../../contrib/build/plot/plot.bkl + $(BAKEFILE) -fautoconf -o$@ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/plot/plot.bkl + touch $@ +../../contrib/build/plot/makefile.bcc: $(CDEPS) ../../contrib/build/plot/plot.bkl + $(BAKEFILE) -fborland -o$@ -DOPTIONS_FILE=../../../build/config.bcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/plot -DWXTOPDIR=../../../ ../../contrib/build/plot/plot.bkl + touch $@ +../../contrib/build/plot/makefile.vc: $(CDEPS) ../../contrib/build/plot/plot.bkl + $(BAKEFILE) -fmsvc -o$@ -DOPTIONS_FILE=../../../build/config.vc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/plot -DWXTOPDIR=../../../ ../../contrib/build/plot/plot.bkl + touch $@ +../../contrib/build/plot/makefile.gcc: $(CDEPS) ../../contrib/build/plot/plot.bkl + $(BAKEFILE) -fmingw -o$@ -DOPTIONS_FILE=../../../build/config.gcc -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/plot -DWXTOPDIR=../../../ ../../contrib/build/plot/plot.bkl + touch $@ +../../contrib/build/plot/makefile.wat: $(CDEPS) ../../contrib/build/plot/plot.bkl + $(BAKEFILE) -fwatcom -o$@ -DOPTIONS_FILE=../../../build/config.wat -DWRITE_OPTIONS_FILE=0 -DSRCDIR=../../src/plot -DWXTOPDIR=../../../ ../../contrib/build/plot/plot.bkl + touch $@ +../../contrib/build/plot/plot.dsw: $(CDEPS) ../../contrib/build/plot/plot.bkl + $(BAKEFILE) -fmsvc6prj -o$@ $(DSWFLAGS) -DSRCDIR=../../src/plot -DWXTOPDIR=../../../ ../../contrib/build/plot/plot.bkl + touch $@ + + ../../contrib/src/stc/Makefile.in: $(CDEPS) ../../contrib/build/stc/stc.bkl $(BAKEFILE) -fautoconf -o$@ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/stc/stc.bkl touch $@ diff --git a/build/bakefiles/compat/README b/build/bakefiles/compat/README new file mode 100644 index 0000000000..219dbea6e3 --- /dev/null +++ b/build/bakefiles/compat/README @@ -0,0 +1,3 @@ + +This is Bakefile backend that generates wx2.4-compatible VC++ project file +(src/wxWindows.dsp). diff --git a/build/bakefiles/compat/wx24dsp.bkl b/build/bakefiles/compat/wx24dsp.bkl new file mode 100644 index 0000000000..044a3d9132 --- /dev/null +++ b/build/bakefiles/compat/wx24dsp.bkl @@ -0,0 +1,58 @@ + + + + + + + vc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(MONOLIB_SRC) src/msw/dummy.cpp $(OPENGL_SRC) + + + + + ALL_SOURCES,ALL_HEADERS + + + diff --git a/build/bakefiles/compat/wx24dsp.empy b/build/bakefiles/compat/wx24dsp.empy new file mode 100644 index 0000000000..478c1d58ed --- /dev/null +++ b/build/bakefiles/compat/wx24dsp.empy @@ -0,0 +1,457 @@ +@{ + +used = {} +def mkgroup(lst, name, mask): + x = [s for s in lst if s.startswith(mask)] + for s in x: + used[s] = 1 + x.sort() + return (name,x) + +sources = ALL_SOURCES.split() +SOURCES = [] +SOURCES.append(mkgroup(sources,'Common Files','src/common/')) +SOURCES.append(mkgroup(sources,'Generic Files','src/generic/')) +SOURCES.append(mkgroup(sources,'wxHTML Files','src/html/')) +SOURCES.append(mkgroup(sources,'MSW Files','src/msw/')) +otherSrcs = [x for x in sources if x not in used] +otherSrcs.sort() +SOURCES.append(('Other Sources', otherSrcs)) + +headers = [x for x in ALL_HEADERS.split() if x.endswith('.h')] +HEADERS = [] +HEADERS.append(mkgroup(headers,'MSW','wx/msw/')) +HEADERS.append(mkgroup(headers,'Generic','wx/generic/')) +HEADERS.append(mkgroup(headers,'HTML','wx/html/')) +commonHdrs = [x for x in headers if x not in used] +commonHdrs.sort() +HEADERS.insert(0, ('Common', commonHdrs)) + +}@ +# Microsoft Developer Studio Project File - Name="wxWindows" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=wxWindows - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "wxWindows.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "wxWindows.mak" CFG="wxWindows - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "wxWindows - Win32 Release Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "wxWindows - Win32 Debug Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "wxWindows - Win32 Release Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "wxWindows - Win32 Debug Unicode" (based on "Win32 (x86) Static Library") +!MESSAGE "wxWindows - Win32 Release DLL" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "wxWindows - Win32 Debug DLL" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "wxWindows - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "wxWindows - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "wxWindows - Win32 Release With Debug Info" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" + +!IF "$(CFG)" == "wxWindows - Win32 Release Unicode DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "../lib" +# PROP BASE Intermediate_Dir "../ReleaseUnicodeDll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "../lib" +# PROP Intermediate_Dir "../ReleaseUnicodeDll" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +CPP=cl.exe +# ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdllu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c +MTL=midl.exe +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +RSC=rc.exe +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /i "../include" /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250u.dll" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250u.dll" + +!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "../lib" +# PROP BASE Intermediate_Dir "../DebugUnicodeDll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "../lib" +# PROP Intermediate_Dir "../DebugUnicodeDll" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +CPP=cl.exe +# ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdllud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c +MTL=midl.exe +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /i "../include" /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250ud.dll" /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250ud.dll" + +!ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "../lib" +# PROP BASE Intermediate_Dir "../ReleaseUnicode" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "../lib" +# PROP Intermediate_Dir "../ReleaseUnicode" +# PROP Target_Dir "" +CPP=cl.exe +# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c +RSC=rc.exe +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"..\lib\wxmswu.lib" + +!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "../lib" +# PROP BASE Intermediate_Dir "../DebugUnicode" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "../lib" +# PROP Intermediate_Dir "../DebugUnicode" +# PROP Target_Dir "" +CPP=cl.exe +# ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_DEBUG" /D "__WXDEBUG__" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c +RSC=rc.exe +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"..\lib\wxmswud.lib" + +!ELSEIF "$(CFG)" == "wxWindows - Win32 Release DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "../lib" +# PROP BASE Intermediate_Dir "../ReleaseDll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "../lib" +# PROP Intermediate_Dir "../ReleaseDll" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +CPP=cl.exe +# ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdll" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c +MTL=midl.exe +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +RSC=rc.exe +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /i "../include" /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250.dll" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250.dll" + +!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "../lib" +# PROP BASE Intermediate_Dir "../DebugDll" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "../lib" +# PROP Intermediate_Dir "../DebugDll" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +CPP=cl.exe +# ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdlld" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c +MTL=midl.exe +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /i "../include" /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250d.dll" /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250d.dll" + +!ELSEIF "$(CFG)" == "wxWindows - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "../lib" +# PROP BASE Intermediate_Dir "../Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "../lib" +# PROP Intermediate_Dir "../Release" +# PROP Target_Dir "" +CPP=cl.exe +# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c +RSC=rc.exe +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"..\lib\wxmsw.lib" + +!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "../lib" +# PROP BASE Intermediate_Dir "../Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "../lib" +# PROP Intermediate_Dir "../Debug" +# PROP Target_Dir "" +CPP=cl.exe +# ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswd" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_DEBUG" /D "__WXDEBUG__" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c +RSC=rc.exe +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"..\lib\wxmswd.lib" + +!ELSEIF "$(CFG)" == "wxWindows - Win32 Release With Debug Info" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "wxWindows___Win32_Release_With_Debug_Info" +# PROP BASE Intermediate_Dir "wxWindows___Win32_Release_With_Debug_Info" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "ReleaseDebug" +# PROP Intermediate_Dir "ReleaseDebug" +# PROP Target_Dir "" +CPP=cl.exe +# ADD BASE CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MD /W4 /Zi /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c +RSC=rc.exe +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\lib\wxmsw.lib" +# ADD LIB32 /nologo /out:"..\lib\wxmsw.lib" + +!ENDIF + +# Begin Target + +# Name "wxWindows - Win32 Release Unicode DLL" +# Name "wxWindows - Win32 Debug Unicode DLL" +# Name "wxWindows - Win32 Release Unicode" +# Name "wxWindows - Win32 Debug Unicode" +# Name "wxWindows - Win32 Release DLL" +# Name "wxWindows - Win32 Debug DLL" +# Name "wxWindows - Win32 Release" +# Name "wxWindows - Win32 Debug" +# Name "wxWindows - Win32 Release With Debug Info" +@[for group in SOURCES:@ +# Begin Group "@group[0]" + +# PROP Default_Filter "" +@[for src in group[1]:@ +# Begin Source File + +SOURCE=.\@src[4:].replace('/','\\') +@[if src=='src/msw/dummy.cpp':@ +# ADD CPP /Yc"wx/wxprec.h" +]@ +@[if src.endswith('.c'):@ +# SUBTRACT CPP /YX /Yc /Yu +]@ +# End Source File +]@ +# End Group +]@ +# Begin Group "Headers" + +# PROP Default_Filter "" +# Begin Group "Setup" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\include\wx\msw\setup.h + +!IF "$(CFG)" == "wxWindows - Win32 Release Unicode DLL" + +# Begin Custom Build - Creating ..\lib\mswdllu\wx\setup.h from $(InputPath) +InputPath=..\include\wx\msw\setup.h + +"../lib/mswdllu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\lib\mswdllu\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL" + +# Begin Custom Build - Creating ..\lib\mswdllud\wx\setup.h from $(InputPath) +InputPath=..\include\wx\msw\setup.h + +"../lib/mswdllud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\lib\mswdllud\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode" + +# Begin Custom Build - Creating ..\lib\mswu\wx\setup.h from $(InputPath) +InputPath=..\include\wx\msw\setup.h + +"../lib/mswu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\lib\mswu\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode" + +# Begin Custom Build - Creating ..\lib\mswud\wx\setup.h from $(InputPath) +InputPath=..\include\wx\msw\setup.h + +"../lib/mswud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\lib\mswud\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "wxWindows - Win32 Release DLL" + +# Begin Custom Build - Creating ..\lib\mswdll\wx\setup.h from $(InputPath) +InputPath=..\include\wx\msw\setup.h + +"../lib/mswdll/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\lib\mswdll\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug DLL" + +# Begin Custom Build - Creating ..\lib\mswdlld\wx\setup.h from $(InputPath) +InputPath=..\include\wx\msw\setup.h + +"../lib/mswdlld/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\lib\mswdlld\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "wxWindows - Win32 Release" + +# Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath) +InputPath=..\include\wx\msw\setup.h + +"../lib/msw/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\lib\msw\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug" + +# Begin Custom Build - Creating ..\lib\mswd\wx\setup.h from $(InputPath) +InputPath=..\include\wx\msw\setup.h + +"../lib/mswd/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\lib\mswd\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "wxWindows - Win32 Release With Debug Info" + +# Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath) +InputPath=..\include\wx\msw\setup.h + +"../lib/msw/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\lib\msw\wx\setup.h + +# End Custom Build + +!ENDIF + +# End Source File +# End Group +@[for group in HEADERS:@ +# Begin Group "@group[0]" + +# PROP Default_Filter "" +@[for hdr in group[1]:@ +# Begin Source File + +SOURCE=..\include\@hdr.replace('/','\\') +# End Source File +]@ +# End Group +]@ +# End Group +# End Target +# End Project diff --git a/build/bakefiles/regenMakefile.py b/build/bakefiles/regenMakefile.py index 7cb9913575..41a07ce030 100755 --- a/build/bakefiles/regenMakefile.py +++ b/build/bakefiles/regenMakefile.py @@ -23,6 +23,9 @@ MDEPS = common.bkl config.bkl files.bkl monolithic.bkl multilib.bkl opengl.bkl w DSWFLAGS = -DRUNTIME_LIBS=dynamic -DOFFICIAL_BUILD=0 -DUSE_HTML=1 \\ -DUSE_OPENGL=1 -DUSE_ODBC=1 -DMONOLITHIC=0 -DUSE_GUI=1 \\ -DDEBUG_INFO=default -DDEBUG_FLAG=default + +COMPAT_TARGETS = ../../src/wxWindows.dsp + """) lines = {} @@ -170,7 +173,7 @@ for f in allK: var = '%s_ALL' % f.upper() file.write('%s = \\\n\t%s\n' % (var,' \\\n\t'.join(all[f]))) -file.write('all:') +file.write('\nall: $(COMPAT_TARGETS)') for f in allK: file.write(' %s' % f) file.write('\n\n') @@ -180,12 +183,16 @@ for f in allK: file.write(""" clean: \trm -f ../../autoconf_inc.m4 +\trm -f $(COMPAT_TARGETS) %s library: ../../Makefile.in ../makefile.bcc ../makefile.vc ../makefile.wat ../makefile.gcc ../../autoconf_inc.m4: ../../Makefile.in +../../src/wxWindows.dsp: monolithic.bkl files.bkl +\t$(BAKEFILE) -Icompat -fwx24dsp -DUSE_GUI=1 -DWXUNIV=0 -o$@ wx.bkl + Makefile: regenMakefile.py \t./regenMakefile.py \t@echo diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index b85c015fc7..1124a7ae22 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -313,6 +313,10 @@ SOURCE=.\common\artstd.cpp # End Source File # Begin Source File +SOURCE=.\common\bmpbase.cpp +# End Source File +# Begin Source File + SOURCE=.\common\choiccmn.cpp # End Source File # Begin Source File @@ -891,6 +895,14 @@ SOURCE=.\generic\gridsel.cpp # End Source File # Begin Source File +SOURCE=.\generic\helpext.cpp +# End Source File +# Begin Source File + +SOURCE=.\generic\htmllbox.cpp +# End Source File +# Begin Source File + SOURCE=.\generic\laywin.cpp # End Source File # Begin Source File @@ -963,6 +975,14 @@ SOURCE=.\generic\treectlg.cpp # End Source File # Begin Source File +SOURCE=.\generic\vlbox.cpp +# End Source File +# Begin Source File + +SOURCE=.\generic\vscroll.cpp +# End Source File +# Begin Source File + SOURCE=.\generic\wizard.cpp # End Source File # End Group @@ -1053,38 +1073,6 @@ SOURCE=.\html\winpars.cpp # Begin Group "MSW Files" # PROP Default_Filter "" -# Begin Group "OLE Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\msw\ole\access.cpp -# End Source File -# Begin Source File - -SOURCE=.\msw\ole\automtn.cpp -# End Source File -# Begin Source File - -SOURCE=.\msw\ole\dataobj.cpp -# End Source File -# Begin Source File - -SOURCE=.\msw\ole\dropsrc.cpp -# End Source File -# Begin Source File - -SOURCE=.\msw\ole\droptgt.cpp -# End Source File -# Begin Source File - -SOURCE=.\msw\ole\oleutils.cpp -# End Source File -# Begin Source File - -SOURCE=.\msw\ole\uuid.cpp -# End Source File -# End Group # Begin Source File SOURCE=.\msw\accel.cpp @@ -1362,6 +1350,34 @@ SOURCE=.\msw\notebook.cpp # End Source File # Begin Source File +SOURCE=.\msw\ole\access.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\ole\automtn.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\ole\dataobj.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\ole\dropsrc.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\ole\droptgt.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\ole\oleutils.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\ole\uuid.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\ownerdrw.cpp # End Source File # Begin Source File @@ -1525,6 +1541,14 @@ SOURCE=.\msw\wave.cpp SOURCE=.\msw\window.cpp # End Source File # End Group +# Begin Group "Other Sources" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\xml\xml.cpp +# End Source File +# End Group # Begin Group "Headers" # PROP Default_Filter "" @@ -1642,6 +1666,10 @@ SOURCE=..\include\wx\access.h # End Source File # Begin Source File +SOURCE=..\include\wx\afterstd.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\app.h # End Source File # Begin Source File @@ -1650,10 +1678,18 @@ SOURCE=..\include\wx\apptrait.h # End Source File # Begin Source File +SOURCE=..\include\wx\arrstr.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\artprov.h # End Source File # Begin Source File +SOURCE=..\include\wx\beforestd.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\bitmap.h # End Source File # Begin Source File @@ -1778,10 +1814,6 @@ SOURCE=..\include\wx\datetime.h # End Source File # Begin Source File -SOURCE=..\include\wx\datetime.inl -# End Source File -# Begin Source File - SOURCE=..\include\wx\datstrm.h # End Source File # Begin Source File @@ -1818,6 +1850,10 @@ SOURCE=..\include\wx\dcmemory.h # End Source File # Begin Source File +SOURCE=..\include\wx\dcmirror.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\dcprint.h # End Source File # Begin Source File @@ -1906,6 +1942,10 @@ SOURCE=..\include\wx\event.h # End Source File # Begin Source File +SOURCE=..\include\wx\evtloop.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\fdrepdlg.h # End Source File # Begin Source File @@ -2034,10 +2074,18 @@ SOURCE=..\include\wx\helpbase.h # End Source File # Begin Source File +SOURCE=..\include\wx\helphtml.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\helpwin.h # End Source File # Begin Source File +SOURCE=..\include\wx\htmllbox.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\icon.h # End Source File # Begin Source File @@ -2046,6 +2094,10 @@ SOURCE=..\include\wx\iconbndl.h # End Source File # Begin Source File +SOURCE=..\include\wx\iconloc.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\imagbmp.h # End Source File # Begin Source File @@ -2090,6 +2142,10 @@ SOURCE=..\include\wx\imagxpm.h # End Source File # Begin Source File +SOURCE=..\include\wx\init.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\intl.h # End Source File # Begin Source File @@ -2210,6 +2266,10 @@ SOURCE=..\include\wx\msgout.h # End Source File # Begin Source File +SOURCE=..\include\wx\msgout.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\mstream.h # End Source File # Begin Source File @@ -2270,6 +2330,26 @@ SOURCE=..\include\wx\progdlg.h # End Source File # Begin Source File +SOURCE=..\include\wx\protocol\file.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\protocol\ftp.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\protocol\http.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\protocol\protocol.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\ptr_scpd.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\quantize.h # End Source File # Begin Source File @@ -2294,6 +2374,10 @@ SOURCE=..\include\wx\region.h # End Source File # Begin Source File +SOURCE=..\include\wx\renderer.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\sashwin.h # End Source File # Begin Source File @@ -2310,6 +2394,14 @@ SOURCE=..\include\wx\sckstrm.h # End Source File # Begin Source File +SOURCE=..\include\wx\scopeguard.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\scrolbar.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\scrolbar.h # End Source File # Begin Source File @@ -2382,6 +2474,10 @@ SOURCE=..\include\wx\statusbr.h # End Source File # Begin Source File +SOURCE=..\include\wx\stopwatch.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\strconv.h # End Source File # Begin Source File @@ -2518,39 +2614,39 @@ SOURCE=..\include\wx\version.h # End Source File # Begin Source File -SOURCE=..\include\wx\volume.h +SOURCE=..\include\wx\vlbox.h # End Source File # Begin Source File -SOURCE=..\include\wx\wave.h +SOURCE=..\include\wx\vms_x_fix.h # End Source File # Begin Source File -SOURCE=..\include\wx\wfstream.h +SOURCE=..\include\wx\volume.h # End Source File # Begin Source File -SOURCE=..\include\wx\window.h +SOURCE=..\include\wx\vscroll.h # End Source File # Begin Source File -SOURCE=..\include\wx\wizard.h +SOURCE=..\include\wx\wave.h # End Source File # Begin Source File -SOURCE=..\include\wx\wx.h +SOURCE=..\include\wx\wfstream.h # End Source File # Begin Source File -SOURCE=..\include\wx\wx_cw.h +SOURCE=..\include\wx\window.h # End Source File # Begin Source File -SOURCE=..\include\wx\wx_cw_cm.h +SOURCE=..\include\wx\wizard.h # End Source File # Begin Source File -SOURCE=..\include\wx\wx_cw_d.h +SOURCE=..\include\wx\wx.h # End Source File # Begin Source File @@ -2566,10 +2662,18 @@ SOURCE=..\include\wx\wxprec.h # End Source File # Begin Source File +SOURCE=..\include\wx\xml\xml.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\xpmdecod.h # End Source File # Begin Source File +SOURCE=..\include\wx\xpmhand.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\zipstrm.h # End Source File # Begin Source File @@ -2586,22 +2690,10 @@ SOURCE=..\include\wx\msw\accel.h # End Source File # Begin Source File -SOURCE=..\include\wx\msw\access.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\msw\app.h # End Source File # Begin Source File -SOURCE=..\include\wx\msw\apptbase.h -# End Source File -# Begin Source File - -SOURCE=..\include\wx\msw\apptrait.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\msw\bitmap.h # End Source File # Begin Source File @@ -2630,6 +2722,10 @@ SOURCE=..\include\wx\msw\checklst.h # End Source File # Begin Source File +SOURCE=..\include\wx\msw\chkconf.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\msw\choice.h # End Source File # Begin Source File @@ -2654,6 +2750,10 @@ SOURCE=..\include\wx\msw\control.h # End Source File # Begin Source File +SOURCE=..\include\wx\msw\crashrpt.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\msw\cursor.h # End Source File # Begin Source File @@ -2742,6 +2842,14 @@ SOURCE=..\include\wx\msw\glcanvas.h # End Source File # Begin Source File +SOURCE=..\include\wx\msw\gnuwin32\winresrc.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\msw\gsockmsw.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\msw\helpbest.h # End Source File # Begin Source File @@ -2822,6 +2930,42 @@ SOURCE=..\include\wx\msw\notebook.h # End Source File # Begin Source File +SOURCE=..\include\wx\msw\ole\access.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\msw\ole\automtn.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\msw\ole\dataform.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\msw\ole\dataobj.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\msw\ole\dataobj2.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\msw\ole\dropsrc.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\msw\ole\droptgt.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\msw\ole\oleutils.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\msw\ole\uuid.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\msw\palette.h # End Source File # Begin Source File @@ -2866,6 +3010,10 @@ SOURCE=..\include\wx\msw\scrolbar.h # End Source File # Begin Source File +SOURCE=..\include\wx\msw\setup0.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\msw\slider95.h # End Source File # Begin Source File @@ -2952,6 +3100,10 @@ SOURCE=..\include\wx\msw\window.h SOURCE=..\include\wx\msw\winundef.h # End Source File +# Begin Source File + +SOURCE=..\include\wx\msw\wrapwin.h +# End Source File # End Group # Begin Group "Generic" @@ -2966,10 +3118,6 @@ SOURCE=..\include\wx\generic\calctrl.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\caret.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\generic\choicdgg.h # End Source File # Begin Source File @@ -2986,18 +3134,10 @@ SOURCE=..\include\wx\generic\dirctrlg.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\dirdlgg.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\generic\dragimgg.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\fdrepdlg.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\generic\filedlgg.h # End Source File # Begin Source File @@ -3014,7 +3154,7 @@ SOURCE=..\include\wx\generic\gridctrl.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\gridg.h +SOURCE=..\include\wx\generic\gridsel.h # End Source File # Begin Source File @@ -3030,11 +3170,7 @@ SOURCE=..\include\wx\generic\laywin.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\listctrl.h -# End Source File -# Begin Source File - -SOURCE=..\include\wx\generic\mdig.h +SOURCE=..\include\wx\generic\logg.h # End Source File # Begin Source File @@ -3046,18 +3182,10 @@ SOURCE=..\include\wx\generic\notebook.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\paletteg.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\generic\panelg.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\printps.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\generic\prntdlgg.h # End Source File # Begin Source File @@ -3086,18 +3214,6 @@ SOURCE=..\include\wx\generic\splitter.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\statline.h -# End Source File -# Begin Source File - -SOURCE=..\include\wx\generic\statusbr.h -# End Source File -# Begin Source File - -SOURCE=..\include\wx\generic\tabg.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\generic\textdlgg.h # End Source File # Begin Source File @@ -3150,6 +3266,10 @@ SOURCE=..\include\wx\html\htmlpars.h # End Source File # Begin Source File +SOURCE=..\include\wx\html\htmlproc.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\html\htmltag.h # End Source File # Begin Source File -- 2.45.2