Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

regenerated makefiles after fixing files.bkl

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-17 11:17:34 +00:00
parent f75d778149
commit 187cf772fa
18 changed files with 687 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
build/bakefiles/Makefile
View File

@@ -141,6 +141,9 @@ AUTOCONF_ALL = \
../../samples/wxtest/Makefile.in \
../../utils/HelpGen/Makefile.in \
../../utils/Makefile.in \
../../utils/configtool/src/Makefile.in \
../../utils/emulator/src/Makefile.in \
../../utils/helpview/src/Makefile.in \
../../utils/tex2rtf/src/Makefile.in
BORLAND_ALL = \
../../contrib/build/animate/makefile.bcc \
@@ -268,6 +271,9 @@ BORLAND_ALL = \
../../samples/wizard/makefile.bcc \
../../samples/wxtest/makefile.bcc \
../../utils/HelpGen/makefile.bcc \
../../utils/configtool/src/makefile.bcc \
../../utils/emulator/src/makefile.bcc \
../../utils/helpview/src/makefile.bcc \
../../utils/makefile.bcc \
../../utils/tex2rtf/src/makefile.bcc \
../msw/makefile.bcc
@@ -397,6 +403,9 @@ MINGW_ALL = \
../../samples/wizard/makefile.gcc \
../../samples/wxtest/makefile.gcc \
../../utils/HelpGen/makefile.gcc \
../../utils/configtool/src/makefile.gcc \
../../utils/emulator/src/makefile.gcc \
../../utils/helpview/src/makefile.gcc \
../../utils/makefile.gcc \
../../utils/tex2rtf/src/makefile.gcc \
../msw/makefile.gcc
@@ -526,6 +535,9 @@ MSVC_ALL = \
../../samples/wizard/makefile.vc \
../../samples/wxtest/makefile.vc \
../../utils/HelpGen/makefile.vc \
../../utils/configtool/src/makefile.vc \
../../utils/emulator/src/makefile.vc \
../../utils/helpview/src/makefile.vc \
../../utils/makefile.vc \
../../utils/tex2rtf/src/makefile.vc \
../msw/makefile.vc
@@ -650,6 +662,9 @@ MSVC6PRJ_ALL = \
../../samples/wizard/wizard.dsw \
../../samples/wxtest/wxtest.dsw \
../../utils/HelpGen/helpgen.dsw \
../../utils/configtool/src/configtool.dsw \
../../utils/emulator/src/emulator.dsw \
../../utils/helpview/src/helpview.dsw \
../../utils/tex2rtf/src/tex2rtf.dsw \
../msw/wx.dsw
WATCOM_ALL = \
@@ -778,6 +793,9 @@ WATCOM_ALL = \
../../samples/wizard/makefile.wat \
../../samples/wxtest/makefile.wat \
../../utils/HelpGen/makefile.wat \
../../utils/configtool/src/makefile.wat \
../../utils/emulator/src/makefile.wat \
../../utils/helpview/src/makefile.wat \
../../utils/makefile.wat \
../../utils/tex2rtf/src/makefile.wat \
../msw/makefile.wat
@@ -920,6 +938,9 @@ clean:
rm -f ../../samples/wxtest/Makefile.in
rm -f ../../utils/HelpGen/Makefile.in
rm -f ../../utils/Makefile.in
rm -f ../../utils/configtool/src/Makefile.in
rm -f ../../utils/emulator/src/Makefile.in
rm -f ../../utils/helpview/src/Makefile.in
rm -f ../../utils/tex2rtf/src/Makefile.in
rm -f ../../contrib/build/animate/makefile.bcc
rm -f ../../contrib/build/deprecated/makefile.bcc
@@ -1046,6 +1067,9 @@ clean:
rm -f ../../samples/wizard/makefile.bcc
rm -f ../../samples/wxtest/makefile.bcc
rm -f ../../utils/HelpGen/makefile.bcc
rm -f ../../utils/configtool/src/makefile.bcc
rm -f ../../utils/emulator/src/makefile.bcc
rm -f ../../utils/helpview/src/makefile.bcc
rm -f ../../utils/makefile.bcc
rm -f ../../utils/tex2rtf/src/makefile.bcc
rm -f ../msw/makefile.bcc
@@ -1174,6 +1198,9 @@ clean:
rm -f ../../samples/wizard/makefile.gcc
rm -f ../../samples/wxtest/makefile.gcc
rm -f ../../utils/HelpGen/makefile.gcc
rm -f ../../utils/configtool/src/makefile.gcc
rm -f ../../utils/emulator/src/makefile.gcc
rm -f ../../utils/helpview/src/makefile.gcc
rm -f ../../utils/makefile.gcc
rm -f ../../utils/tex2rtf/src/makefile.gcc
rm -f ../msw/makefile.gcc
@@ -1302,6 +1329,9 @@ clean:
rm -f ../../samples/wizard/makefile.vc
rm -f ../../samples/wxtest/makefile.vc
rm -f ../../utils/HelpGen/makefile.vc
rm -f ../../utils/configtool/src/makefile.vc
rm -f ../../utils/emulator/src/makefile.vc
rm -f ../../utils/helpview/src/makefile.vc
rm -f ../../utils/makefile.vc
rm -f ../../utils/tex2rtf/src/makefile.vc
rm -f ../msw/makefile.vc
@@ -1425,6 +1455,9 @@ clean:
rm -f ../../samples/wizard/wizard.dsw
rm -f ../../samples/wxtest/wxtest.dsw
rm -f ../../utils/HelpGen/helpgen.dsw
rm -f ../../utils/configtool/src/configtool.dsw
rm -f ../../utils/emulator/src/emulator.dsw
rm -f ../../utils/helpview/src/helpview.dsw
rm -f ../../utils/tex2rtf/src/tex2rtf.dsw
rm -f ../msw/wx.dsw
rm -f ../../contrib/build/animate/makefile.wat
@@ -1552,6 +1585,9 @@ clean:
rm -f ../../samples/wizard/makefile.wat
rm -f ../../samples/wxtest/makefile.wat
rm -f ../../utils/HelpGen/makefile.wat
rm -f ../../utils/configtool/src/makefile.wat
rm -f ../../utils/emulator/src/makefile.wat
rm -f ../../utils/helpview/src/makefile.wat
rm -f ../../utils/makefile.wat
rm -f ../../utils/tex2rtf/src/makefile.wat
rm -f ../msw/makefile.wat
@@ -4063,6 +4099,66 @@ Makefile: regenMakefile.py
touch $@
../../utils/configtool/src/Makefile.in: $(SDEPS) ../../utils/configtool/src/configtool.bkl
$(BAKEFILE) -fautoconf -o$@ -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../utils/configtool/src/configtool.bkl
touch $@
../../utils/configtool/src/makefile.bcc: $(SDEPS) ../../utils/configtool/src/configtool.bkl
$(BAKEFILE) -fborland -o$@ -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0 ../../utils/configtool/src/configtool.bkl
touch $@
../../utils/configtool/src/makefile.vc: $(SDEPS) ../../utils/configtool/src/configtool.bkl
$(BAKEFILE) -fmsvc -o$@ -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0 ../../utils/configtool/src/configtool.bkl
touch $@
../../utils/configtool/src/makefile.gcc: $(SDEPS) ../../utils/configtool/src/configtool.bkl
$(BAKEFILE) -fmingw -o$@ -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0 ../../utils/configtool/src/configtool.bkl
touch $@
../../utils/configtool/src/makefile.wat: $(SDEPS) ../../utils/configtool/src/configtool.bkl
$(BAKEFILE) -fwatcom -o$@ -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0 ../../utils/configtool/src/configtool.bkl
touch $@
../../utils/configtool/src/configtool.dsw: $(SDEPS) ../../utils/configtool/src/configtool.bkl
$(BAKEFILE) -fmsvc6prj -o$@ -DWXTOPDIR=../../../ $(DSWFLAGS) ../../utils/configtool/src/configtool.bkl
touch $@
../../utils/emulator/src/Makefile.in: $(SDEPS) ../../utils/emulator/src/emulator.bkl
$(BAKEFILE) -fautoconf -o$@ -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../utils/emulator/src/emulator.bkl
touch $@
../../utils/emulator/src/makefile.bcc: $(SDEPS) ../../utils/emulator/src/emulator.bkl
$(BAKEFILE) -fborland -o$@ -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0 ../../utils/emulator/src/emulator.bkl
touch $@
../../utils/emulator/src/makefile.vc: $(SDEPS) ../../utils/emulator/src/emulator.bkl
$(BAKEFILE) -fmsvc -o$@ -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0 ../../utils/emulator/src/emulator.bkl
touch $@
../../utils/emulator/src/makefile.gcc: $(SDEPS) ../../utils/emulator/src/emulator.bkl
$(BAKEFILE) -fmingw -o$@ -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0 ../../utils/emulator/src/emulator.bkl
touch $@
../../utils/emulator/src/makefile.wat: $(SDEPS) ../../utils/emulator/src/emulator.bkl
$(BAKEFILE) -fwatcom -o$@ -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0 ../../utils/emulator/src/emulator.bkl
touch $@
../../utils/emulator/src/emulator.dsw: $(SDEPS) ../../utils/emulator/src/emulator.bkl
$(BAKEFILE) -fmsvc6prj -o$@ -DWXTOPDIR=../../../ $(DSWFLAGS) ../../utils/emulator/src/emulator.bkl
touch $@
../../utils/helpview/src/Makefile.in: $(SDEPS) ../../utils/helpview/src/helpview.bkl
$(BAKEFILE) -fautoconf -o$@ -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../utils/helpview/src/helpview.bkl
touch $@
../../utils/helpview/src/makefile.bcc: $(SDEPS) ../../utils/helpview/src/helpview.bkl
$(BAKEFILE) -fborland -o$@ -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0 ../../utils/helpview/src/helpview.bkl
touch $@
../../utils/helpview/src/makefile.vc: $(SDEPS) ../../utils/helpview/src/helpview.bkl
$(BAKEFILE) -fmsvc -o$@ -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0 ../../utils/helpview/src/helpview.bkl
touch $@
../../utils/helpview/src/makefile.gcc: $(SDEPS) ../../utils/helpview/src/helpview.bkl
$(BAKEFILE) -fmingw -o$@ -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0 ../../utils/helpview/src/helpview.bkl
touch $@
../../utils/helpview/src/makefile.wat: $(SDEPS) ../../utils/helpview/src/helpview.bkl
$(BAKEFILE) -fwatcom -o$@ -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0 ../../utils/helpview/src/helpview.bkl
touch $@
../../utils/helpview/src/helpview.dsw: $(SDEPS) ../../utils/helpview/src/helpview.bkl
$(BAKEFILE) -fmsvc6prj -o$@ -DWXTOPDIR=../../../ $(DSWFLAGS) ../../utils/helpview/src/helpview.bkl
touch $@
../../utils/tex2rtf/src/Makefile.in: $(SDEPS) ../../utils/tex2rtf/src/tex2rtf.bkl
$(BAKEFILE) -fautoconf -o$@ -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../utils/tex2rtf/src/tex2rtf.bkl
touch $@

17
build/msw/makefile.bcc
View File

@@ -364,14 +364,15 @@ HTMLLIB_OBJECTS = \
$(OBJS)\htmllib_m_tables.obj \
$(OBJS)\htmllib_winpars.obj \
$(OBJS)\htmllib_htmllbox.obj
MAKEARGS = -DCPPFLAGS=$(CPPFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) \
-DLDFLAGS=$(LDFLAGS) -DCC=$(CC) -DUSE_GUI=$(USE_GUI) \
-DMONOLITHIC=$(MONOLITHIC) -DCXXFLAGS=$(CXXFLAGS) -DUSE_HTML=$(USE_HTML) \
-DBUILD=$(BUILD) -DDEBUG_INFO=$(DEBUG_INFO) -DVENDOR=$(VENDOR) \
-DUNICODE=$(UNICODE) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DMSLU=$(MSLU) \
-DWXUNIV=$(WXUNIV) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DCXX=$(CXX) -DCFG=$(CFG) \
-DCFLAGS=$(CFLAGS) -DSHARED=$(SHARED) -DUSE_ODBC=$(USE_ODBC) \
-DUSE_OPENGL=$(USE_OPENGL)
MAKEARGS = -DCPPFLAGS="$(CPPFLAGS)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \
-DLDFLAGS="$(LDFLAGS)" -DCC="$(CC)" -DUSE_GUI="$(USE_GUI)" \
-DMONOLITHIC="$(MONOLITHIC)" -DCXXFLAGS="$(CXXFLAGS)" \
-DUSE_HTML="$(USE_HTML)" -DBUILD="$(BUILD)" -DDEBUG_INFO="$(DEBUG_INFO)" \
-DVENDOR="$(VENDOR)" -DUNICODE="$(UNICODE)" \
-DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DMSLU="$(MSLU)" -DWXUNIV="$(WXUNIV)" \
-DRUNTIME_LIBS="$(RUNTIME_LIBS)" -DCXX="$(CXX)" -DCFG="$(CFG)" \
-DCFLAGS="$(CFLAGS)" -DSHARED="$(SHARED)" -DUSE_ODBC="$(USE_ODBC)" \
-DUSE_OPENGL="$(USE_OPENGL)"
MONODLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
-tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \

15
build/msw/makefile.gcc
View File

@@ -350,13 +350,14 @@ HTMLLIB_OBJECTS = \
$(OBJS)\htmllib_m_tables.o \
$(OBJS)\htmllib_winpars.o \
$(OBJS)\htmllib_htmllbox.o
MAKEARGS = CPPFLAGS=$(CPPFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) LDFLAGS=$(LDFLAGS) \
CC=$(CC) USE_GUI=$(USE_GUI) MONOLITHIC=$(MONOLITHIC) CXXFLAGS=$(CXXFLAGS) \
GCC_VERSION=$(GCC_VERSION) USE_HTML=$(USE_HTML) BUILD=$(BUILD) \
DEBUG_INFO=$(DEBUG_INFO) VENDOR=$(VENDOR) UNICODE=$(UNICODE) \
OFFICIAL_BUILD=$(OFFICIAL_BUILD) MSLU=$(MSLU) WXUNIV=$(WXUNIV) \
RUNTIME_LIBS=$(RUNTIME_LIBS) CXX=$(CXX) CFG=$(CFG) CFLAGS=$(CFLAGS) \
SHARED=$(SHARED) USE_ODBC=$(USE_ODBC) USE_OPENGL=$(USE_OPENGL)
MAKEARGS = CPPFLAGS="$(CPPFLAGS)" DEBUG_FLAG="$(DEBUG_FLAG)" \
LDFLAGS="$(LDFLAGS)" CC="$(CC)" USE_GUI="$(USE_GUI)" \
MONOLITHIC="$(MONOLITHIC)" CXXFLAGS="$(CXXFLAGS)" \
GCC_VERSION="$(GCC_VERSION)" USE_HTML="$(USE_HTML)" BUILD="$(BUILD)" \
DEBUG_INFO="$(DEBUG_INFO)" VENDOR="$(VENDOR)" UNICODE="$(UNICODE)" \
OFFICIAL_BUILD="$(OFFICIAL_BUILD)" MSLU="$(MSLU)" WXUNIV="$(WXUNIV)" \
RUNTIME_LIBS="$(RUNTIME_LIBS)" CXX="$(CXX)" CFG="$(CFG)" CFLAGS="$(CFLAGS)" \
SHARED="$(SHARED)" USE_ODBC="$(USE_ODBC)" USE_OPENGL="$(USE_OPENGL)"
MONODLL_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \

10
build/msw/makefile.vc
View File

@@ -399,6 +399,14 @@ HTMLLIB_OBJECTS = \
$(OBJS)\htmllib_m_tables.obj \
$(OBJS)\htmllib_winpars.obj \
$(OBJS)\htmllib_htmllbox.obj
MAKEARGS = CPPFLAGS="$(CPPFLAGS)" DEBUG_FLAG="$(DEBUG_FLAG)" \
LDFLAGS="$(LDFLAGS)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" CC="$(CC)" \
USE_GUI="$(USE_GUI)" MONOLITHIC="$(MONOLITHIC)" CXXFLAGS="$(CXXFLAGS)" \
USE_HTML="$(USE_HTML)" BUILD="$(BUILD)" DEBUG_INFO="$(DEBUG_INFO)" \
VENDOR="$(VENDOR)" UNICODE="$(UNICODE)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
MSLU="$(MSLU)" WXUNIV="$(WXUNIV)" RUNTIME_LIBS="$(RUNTIME_LIBS)" \
CXX="$(CXX)" CFG="$(CFG)" CFLAGS="$(CFLAGS)" SHARED="$(SHARED)" \
USE_ODBC="$(USE_ODBC)" USE_OPENGL="$(USE_OPENGL)"
MONODLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_51) /DWIN32 \
$(__DEBUGINFO_36) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \
@@ -9598,7 +9606,7 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(OBJS)\odbclib_d
sub_samples:
cd ..\..\samples
$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
$(MAKE) -f makefile.vc $(MAKEARGS) all
cd $(MAKEDIR)
$(SETUPHDIR)\wx\setup.h:

34
build/msw/makefile.wat
View File

@@ -2335,13 +2335,13 @@ HTMLLIB_OBJECTS = &
$(OBJS)\htmllib_m_tables.obj &
$(OBJS)\htmllib_winpars.obj &
$(OBJS)\htmllib_htmllbox.obj
MAKEARGS = CPPFLAGS=$(CPPFLAGS) OFFICIAL_BUILD=$(OFFICIAL_BUILD) &
WXUNIV=$(WXUNIV) DEBUG_FLAG=$(DEBUG_FLAG) CFLAGS=$(CFLAGS) &
RUNTIME_LIBS=$(RUNTIME_LIBS) CXX=$(CXX) CFG=$(CFG) USE_GUI=$(USE_GUI) &
MONOLITHIC=$(MONOLITHIC) CXXFLAGS=$(CXXFLAGS) CC=$(CC) USE_HTML=$(USE_HTML) &
BUILD=$(BUILD) LDFLAGS=$(LDFLAGS) DEBUG_INFO=$(DEBUG_INFO) SHARED=$(SHARED) &
VENDOR=$(VENDOR) USE_OPENGL=$(USE_OPENGL) USE_ODBC=$(USE_ODBC) &
UNICODE=$(UNICODE)
MAKEARGS = CPPFLAGS="$(CPPFLAGS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" &
WXUNIV="$(WXUNIV)" DEBUG_FLAG="$(DEBUG_FLAG)" CFLAGS="$(CFLAGS)" &
RUNTIME_LIBS="$(RUNTIME_LIBS)" CXX="$(CXX)" CFG="$(CFG)" &
USE_GUI="$(USE_GUI)" MONOLITHIC="$(MONOLITHIC)" CXXFLAGS="$(CXXFLAGS)" &
CC="$(CC)" USE_HTML="$(USE_HTML)" BUILD="$(BUILD)" LDFLAGS="$(LDFLAGS)" &
DEBUG_INFO="$(DEBUG_INFO)" SHARED="$(SHARED)" VENDOR="$(VENDOR)" &
USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" UNICODE="$(UNICODE)"
MONODLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__UNICODE_DEFINE_p) -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff &
@@ -9413,7 +9413,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wa
@%create $(OBJS)\advdll.lbc
@%append $(OBJS)\advdll.lbc option quiet
@%append $(OBJS)\advdll.lbc name $^@
@%append $(OBJS)\advdll.lbc option incremental
@%append $(OBJS)\advdll.lbc option caseexact
@%append $(OBJS)\advdll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
@for %i in ($(ADVDLL_OBJECTS)) do @%append $(OBJS)\advdll.lbc file %i
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\advdll.lbc library %i
@@ -9442,7 +9442,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll : $(B
@%create $(OBJS)\basedll.lbc
@%append $(OBJS)\basedll.lbc option quiet
@%append $(OBJS)\basedll.lbc name $^@
@%append $(OBJS)\basedll.lbc option incremental
@%append $(OBJS)\basedll.lbc option caseexact
@%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
@for %i in ($(BASEDLL_OBJECTS)) do @%append $(OBJS)\basedll.lbc file %i
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\basedll.lbc library %i
@@ -9511,7 +9511,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_w
@%create $(OBJS)\coredll.lbc
@%append $(OBJS)\coredll.lbc option quiet
@%append $(OBJS)\coredll.lbc name $^@
@%append $(OBJS)\coredll.lbc option incremental
@%append $(OBJS)\coredll.lbc option caseexact
@%append $(OBJS)\coredll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
@for %i in ($(COREDLL_OBJECTS)) do @%append $(OBJS)\coredll.lbc file %i
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\coredll.lbc library %i
@@ -9542,7 +9542,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid
@%create $(OBJS)\dbgriddll.lbc
@%append $(OBJS)\dbgriddll.lbc option quiet
@%append $(OBJS)\dbgriddll.lbc name $^@
@%append $(OBJS)\dbgriddll.lbc option incremental
@%append $(OBJS)\dbgriddll.lbc option caseexact
@%append $(OBJS)\dbgriddll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
@for %i in ($(DBGRIDDLL_OBJECTS)) do @%append $(OBJS)\dbgriddll.lbc file %i
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\dbgriddll.lbc library %i
@@ -9575,7 +9575,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat
@%create $(OBJS)\gldll.lbc
@%append $(OBJS)\gldll.lbc option quiet
@%append $(OBJS)\gldll.lbc name $^@
@%append $(OBJS)\gldll.lbc option incremental
@%append $(OBJS)\gldll.lbc option caseexact
@%append $(OBJS)\gldll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
@for %i in ($(GLDLL_OBJECTS)) do @%append $(OBJS)\gldll.lbc file %i
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib) do @%append $(OBJS)\gldll.lbc library %i
@@ -9605,7 +9605,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_w
@%create $(OBJS)\htmldll.lbc
@%append $(OBJS)\htmldll.lbc option quiet
@%append $(OBJS)\htmldll.lbc name $^@
@%append $(OBJS)\htmldll.lbc option incremental
@%append $(OBJS)\htmldll.lbc option caseexact
@%append $(OBJS)\htmldll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
@for %i in ($(HTMLDLL_OBJECTS)) do @%append $(OBJS)\htmldll.lbc file %i
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\htmldll.lbc library %i
@@ -9646,7 +9646,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(V
@%create $(OBJS)\monodll.lbc
@%append $(OBJS)\monodll.lbc option quiet
@%append $(OBJS)\monodll.lbc name $^@
@%append $(OBJS)\monodll.lbc option incremental
@%append $(OBJS)\monodll.lbc option caseexact
@%append $(OBJS)\monodll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
@for %i in ($(MONODLL_OBJECTS)) do @%append $(OBJS)\monodll.lbc file %i
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\monodll.lbc library %i
@@ -9672,7 +9672,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll :
@%create $(OBJS)\netdll.lbc
@%append $(OBJS)\netdll.lbc option quiet
@%append $(OBJS)\netdll.lbc name $^@
@%append $(OBJS)\netdll.lbc option incremental
@%append $(OBJS)\netdll.lbc option caseexact
@%append $(OBJS)\netdll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
@for %i in ($(NETDLL_OBJECTS)) do @%append $(OBJS)\netdll.lbc file %i
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\netdll.lbc library %i
@@ -9699,7 +9699,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll :
@%create $(OBJS)\odbcdll.lbc
@%append $(OBJS)\odbcdll.lbc option quiet
@%append $(OBJS)\odbcdll.lbc name $^@
@%append $(OBJS)\odbcdll.lbc option incremental
@%append $(OBJS)\odbcdll.lbc option caseexact
@%append $(OBJS)\odbcdll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
@for %i in ($(ODBCDLL_OBJECTS)) do @%append $(OBJS)\odbcdll.lbc file %i
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\odbcdll.lbc library %i
@@ -9774,7 +9774,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll :
@%create $(OBJS)\xmldll.lbc
@%append $(OBJS)\xmldll.lbc option quiet
@%append $(OBJS)\xmldll.lbc name $^@
@%append $(OBJS)\xmldll.lbc option incremental
@%append $(OBJS)\xmldll.lbc option caseexact
@%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
@for %i in ($(XMLDLL_OBJECTS)) do @%append $(OBJS)\xmldll.lbc file %i
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\xmldll.lbc library %i

4
build/msw/wx_base.dsp
View File

@@ -955,6 +955,10 @@ SOURCE=..\..\include\wx\msw\wrapwin.h
# PROP Default_Filter ""
# 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

16
build/msw/wx_core.dsp
View File

@@ -7816,10 +7816,6 @@ 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\artprov.h
# End Source File
# Begin Source File
@@ -7908,22 +7904,10 @@ SOURCE=..\..\include\wx\dataobj.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\db.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\dbgrid.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\dbkeyg.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\dbtable.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\dc.h
# End Source File
# Begin Source File