X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/399a88248ae8bd37d01ee104c0ff0d84bc27824d..7015ef3aaeb73adc897554d24bc6dc8b3edf68fe:/build/msw/makefile.bcc?ds=sidebyside diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 79fca9669b..f2f92e6bc8 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -20,12 +20,12 @@ BCCDIR = $(MAKEDIR)\.. ### Variables: ### -ADVDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_ADV $(CXXFLAGS) -Hu \ - -H=$(OBJS)\wxprec_advdll.csm +ADVDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_ADV \ + $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_advdll.csm ADVDLL_OBJECTS = \ $(OBJS)\advdll_dummy.obj \ $(OBJS)\advdll_calctrl.obj \ @@ -43,11 +43,12 @@ ADVDLL_OBJECTS = \ $(OBJS)\advdll_joystick.obj \ $(OBJS)\advdll_taskbar.obj \ $(OBJS)\advdll_wave.obj -ADVLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_advlib.csm +ADVLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib $(CXXFLAGS) -Hu \ + -H=$(OBJS)\wxprec_advlib.csm ADVLIB_OBJECTS = \ $(OBJS)\advlib_dummy.obj \ $(OBJS)\advlib_calctrl.obj \ @@ -65,18 +66,18 @@ ADVLIB_OBJECTS = \ $(OBJS)\advlib_joystick.obj \ $(OBJS)\advlib_taskbar.obj \ $(OBJS)\advlib_wave.obj -BASEDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ - -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 \ - $(CFLAGS) -BASEDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 \ - $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_basedll.csm +BASEDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE \ + -DwxUSE_BASE=1 $(CFLAGS) +BASEDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE \ + -DwxUSE_BASE=1 $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_basedll.csm BASEDLL_OBJECTS = \ $(OBJS)\basedll_dummy.obj \ $(OBJS)\basedll_appbase.obj \ @@ -127,6 +128,8 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_variant.obj \ $(OBJS)\basedll_wfstream.obj \ $(OBJS)\basedll_wxchar.obj \ + $(OBJS)\basedll_xti.obj \ + $(OBJS)\basedll_xtistrm.obj \ $(OBJS)\basedll_zipstrm.obj \ $(OBJS)\basedll_zstream.obj \ $(OBJS)\basedll_basemsw.obj \ @@ -147,17 +150,18 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_main.obj \ $(OBJS)\basedll_mslu.obj \ $(OBJS)\basedll_volume.obj -BASELIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ - -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CFLAGS) -BASELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CXXFLAGS) -Hu \ - -H=$(OBJS)\wxprec_baselib.csm +BASELIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -DwxUSE_BASE=1 \ + $(CFLAGS) +BASELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -DwxUSE_BASE=1 \ + $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_baselib.csm BASELIB_OBJECTS = \ $(OBJS)\baselib_dummy.obj \ $(OBJS)\baselib_appbase.obj \ @@ -208,6 +212,8 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_variant.obj \ $(OBJS)\baselib_wfstream.obj \ $(OBJS)\baselib_wxchar.obj \ + $(OBJS)\baselib_xti.obj \ + $(OBJS)\baselib_xtistrm.obj \ $(OBJS)\baselib_zipstrm.obj \ $(OBJS)\baselib_zstream.obj \ $(OBJS)\baselib_basemsw.obj \ @@ -228,18 +234,18 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_main.obj \ $(OBJS)\baselib_mslu.obj \ $(OBJS)\baselib_volume.obj -COREDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ - -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 \ - $(CFLAGS) -COREDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 \ - $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_coredll.csm +COREDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_CORE \ + -DwxUSE_BASE=0 $(CFLAGS) +COREDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_CORE \ + -DwxUSE_BASE=0 $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_coredll.csm COREDLL_OBJECTS = \ $(OBJS)\coredll_dummy.obj \ $(OBJS)\coredll_event.obj \ @@ -250,16 +256,16 @@ COREDLL_OBJECTS = \ $(OBJS)\coredll_mslu.obj \ $(OBJS)\coredll_volume.obj \ $(____CORE_SRC_FILENAMES_2_OBJECTS) -CORELIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ - -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_BASE=0 $(CFLAGS) -CORELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_BASE=0 $(CXXFLAGS) -Hu \ +CORELIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_BASE=0 $(CFLAGS) +CORELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_BASE=0 $(CXXFLAGS) -Hu \ -H=$(OBJS)\wxprec_corelib.csm CORELIB_OBJECTS = \ $(OBJS)\corelib_dummy.obj \ @@ -271,46 +277,48 @@ CORELIB_OBJECTS = \ $(OBJS)\corelib_mslu.obj \ $(OBJS)\corelib_volume.obj \ $(____CORE_SRC_FILENAMES_3_OBJECTS) -DBGRIDDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_DBGRID $(CXXFLAGS) -Hu \ - -H=$(OBJS)\wxprec_dbgriddll.csm +DBGRIDDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_DBGRID \ + $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_dbgriddll.csm DBGRIDDLL_OBJECTS = \ $(OBJS)\dbgriddll_dummy.obj \ $(OBJS)\dbgriddll_dbgrid.obj -DBGRIDLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_dbgridlib.csm +DBGRIDLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib $(CXXFLAGS) -Hu \ + -H=$(OBJS)\wxprec_dbgridlib.csm DBGRIDLIB_OBJECTS = \ $(OBJS)\dbgridlib_dummy.obj \ $(OBJS)\dbgridlib_dbgrid.obj -GLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ - -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_GL $(CXXFLAGS) -Hu \ - -H=$(OBJS)\wxprec_gldll.csm +GLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_GL \ + $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_gldll.csm GLDLL_OBJECTS = \ $(OBJS)\gldll_dummy.obj \ $(OBJS)\gldll_glcanvas.obj -GLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ - -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_gllib.csm +GLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib $(CXXFLAGS) -Hu \ + -H=$(OBJS)\wxprec_gllib.csm GLLIB_OBJECTS = \ $(OBJS)\gllib_dummy.obj \ $(OBJS)\gllib_glcanvas.obj -HTMLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_HTML $(CXXFLAGS) -Hu \ - -H=$(OBJS)\wxprec_htmldll.csm +HTMLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_HTML \ + $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_htmldll.csm HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_dummy.obj \ $(OBJS)\htmldll_helpbest.obj \ @@ -335,11 +343,12 @@ HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_m_tables.obj \ $(OBJS)\htmldll_winpars.obj \ $(OBJS)\htmldll_htmllbox.obj -HTMLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_htmllib.csm +HTMLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib $(CXXFLAGS) -Hu \ + -H=$(OBJS)\wxprec_htmllib.csm HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_dummy.obj \ $(OBJS)\htmllib_helpbest.obj \ @@ -364,27 +373,27 @@ HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_m_tables.obj \ $(OBJS)\htmllib_winpars.obj \ $(OBJS)\htmllib_htmllbox.obj -LIBDIRNAME = \ - ..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -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$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_BASE=1 -DWXMAKINGDLL $(CFLAGS) -MONODLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_BASE=1 -DWXMAKINGDLL $(CXXFLAGS) -Hu \ - -H=$(OBJS)\wxprec_monodll.csm +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) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_BASE=1 -DWXMAKINGDLL \ + $(CFLAGS) +MONODLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_BASE=1 -DWXMAKINGDLL \ + $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_monodll.csm MONODLL_OBJECTS = \ $(OBJS)\monodll_dummy.obj \ $(OBJS)\monodll_appbase.obj \ @@ -435,6 +444,8 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_variant.obj \ $(OBJS)\monodll_wfstream.obj \ $(OBJS)\monodll_wxchar.obj \ + $(OBJS)\monodll_xti.obj \ + $(OBJS)\monodll_xtistrm.obj \ $(OBJS)\monodll_zipstrm.obj \ $(OBJS)\monodll_zstream.obj \ $(OBJS)\monodll_basemsw.obj \ @@ -467,17 +478,18 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_url.obj \ $(OBJS)\monodll_gsocket.obj \ $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \ - $(OBJS)\monodll_xml.obj -MONOLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ - -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_BASE=1 $(CFLAGS) -MONOLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_BASE=1 $(CXXFLAGS) -Hu \ + $(OBJS)\monodll_xml.obj \ + $(OBJS)\monodll_xtixml.obj +MONOLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_BASE=1 $(CFLAGS) +MONOLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_BASE=1 $(CXXFLAGS) -Hu \ -H=$(OBJS)\wxprec_monolib.csm MONOLIB_OBJECTS = \ $(OBJS)\monolib_dummy.obj \ @@ -529,6 +541,8 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_variant.obj \ $(OBJS)\monolib_wfstream.obj \ $(OBJS)\monolib_wxchar.obj \ + $(OBJS)\monolib_xti.obj \ + $(OBJS)\monolib_xtistrm.obj \ $(OBJS)\monolib_zipstrm.obj \ $(OBJS)\monolib_zstream.obj \ $(OBJS)\monolib_basemsw.obj \ @@ -561,18 +575,20 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_url.obj \ $(OBJS)\monolib_gsocket.obj \ $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \ - $(OBJS)\monolib_xml.obj -NETDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ - -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS) -NETDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET \ - $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_netdll.csm + $(OBJS)\monolib_xml.obj \ + $(OBJS)\monolib_xtixml.obj +NETDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL \ + -DWXMAKINGDLL_NET $(CFLAGS) +NETDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL \ + -DWXMAKINGDLL_NET $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_netdll.csm NETDLL_OBJECTS = \ $(OBJS)\netdll_dummy.obj \ $(OBJS)\netdll_fs_inet.obj \ @@ -586,16 +602,16 @@ NETDLL_OBJECTS = \ $(OBJS)\netdll_socket.obj \ $(OBJS)\netdll_url.obj \ $(OBJS)\netdll_gsocket.obj -NETLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ - -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 $(CFLAGS) -NETLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 $(CXXFLAGS) -Hu \ +NETLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 $(CFLAGS) +NETLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 $(CXXFLAGS) -Hu \ -H=$(OBJS)\wxprec_netlib.csm NETLIB_OBJECTS = \ $(OBJS)\netlib_dummy.obj \ @@ -612,35 +628,38 @@ NETLIB_OBJECTS = \ $(OBJS)\netlib_gsocket.obj OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -ODBCDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC \ - $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_odbcdll.csm +ODBCDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL \ + -DWXMAKINGDLL_ODBC $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_odbcdll.csm ODBCDLL_OBJECTS = \ $(OBJS)\odbcdll_dummy.obj \ $(OBJS)\odbcdll_db.obj \ $(OBJS)\odbcdll_dbtable.obj -ODBCLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 $(CXXFLAGS) -Hu \ +ODBCLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 $(CXXFLAGS) -Hu \ -H=$(OBJS)\wxprec_odbclib.csm ODBCLIB_OBJECTS = \ $(OBJS)\odbclib_dummy.obj \ $(OBJS)\odbclib_db.obj \ $(OBJS)\odbclib_dbtable.obj -WXEXPAT_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ - -tWM -I$(LIBDIRNAME) -DCOMPILED_FROM_DSP $(CFLAGS) -w-8004 -w-8008 -w-8057 \ - -w-8066 +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +WXEXPAT_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM $(____LIBDIRNAME_FILENAMES_6_p) \ + -DCOMPILED_FROM_DSP $(CFLAGS) -w-8004 -w-8008 -w-8057 -w-8066 WXEXPAT_OBJECTS = \ $(OBJS)\wxexpat_xmlparse.obj \ $(OBJS)\wxexpat_xmlrole.obj \ $(OBJS)\wxexpat_xmltok.obj -WXJPEG_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ - -tWM -I$(LIBDIRNAME) $(CFLAGS) -w-8004 -w-8008 -w-8057 -w-8066 +WXJPEG_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -I$(SETUPHDIR) $(CFLAGS) -w-8004 -w-8008 \ + -w-8057 -w-8066 WXJPEG_OBJECTS = \ $(OBJS)\wxjpeg_jcomapi.obj \ $(OBJS)\wxjpeg_jutils.obj \ @@ -688,8 +707,8 @@ WXJPEG_OBJECTS = \ $(OBJS)\wxjpeg_jquant1.obj \ $(OBJS)\wxjpeg_jquant2.obj \ $(OBJS)\wxjpeg_jdmerge.obj -WXPNG_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ - -tWM -I..\..\src\zlib $(CFLAGS) -w-8004 +WXPNG_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -I..\..\src\zlib $(CFLAGS) -w-8004 WXPNG_OBJECTS = \ $(OBJS)\wxpng_png.obj \ $(OBJS)\wxpng_pngerror.obj \ @@ -708,15 +727,16 @@ WXPNG_OBJECTS = \ $(OBJS)\wxpng_pngwrite.obj \ $(OBJS)\wxpng_pngwtran.obj \ $(OBJS)\wxpng_pngwutil.obj -WXREGEX_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ - -tWM $(CFLAGS) -w-8004 -w-8012 -w-8057 -w-8066 +WXREGEX_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM $(CFLAGS) -w-8004 -w-8012 -w-8057 -w-8066 WXREGEX_OBJECTS = \ $(OBJS)\wxregex_regcomp.obj \ $(OBJS)\wxregex_regexec.obj \ $(OBJS)\wxregex_regerror.obj \ $(OBJS)\wxregex_regfree.obj -WXTIFF_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ - -tWM $(CFLAGS) -w-8004 -w-8012 -w-8057 -w-8060 -w-8066 +WXTIFF_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM $(CFLAGS) -w-8004 -w-8012 -w-8057 -w-8060 \ + -w-8066 WXTIFF_OBJECTS = \ $(OBJS)\wxtiff_tif_win32.obj \ $(OBJS)\wxtiff_tif_aux.obj \ @@ -751,8 +771,8 @@ WXTIFF_OBJECTS = \ $(OBJS)\wxtiff_tif_warning.obj \ $(OBJS)\wxtiff_tif_write.obj \ $(OBJS)\wxtiff_tif_zip.obj -WXZLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ - -tWM $(CFLAGS) -w-8004 -w-8012 -w-8057 +WXZLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM $(CFLAGS) -w-8004 -w-8012 -w-8057 WXZLIB_OBJECTS = \ $(OBJS)\wxzlib_adler32.obj \ $(OBJS)\wxzlib_compress.obj \ @@ -768,27 +788,35 @@ WXZLIB_OBJECTS = \ $(OBJS)\wxzlib_infcodes.obj \ $(OBJS)\wxzlib_infutil.obj \ $(OBJS)\wxzlib_inffast.obj -XMLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_XML \ - $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_xmldll.csm +XMLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL \ + -DWXMAKINGDLL_XML $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_xmldll.csm XMLDLL_OBJECTS = \ $(OBJS)\xmldll_dummy.obj \ - $(OBJS)\xmldll_xml.obj -XMLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 $(CXXFLAGS) -Hu \ + $(OBJS)\xmldll_xml.obj \ + $(OBJS)\xmldll_xtixml.obj +XMLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 $(CXXFLAGS) -Hu \ -H=$(OBJS)\wxprec_xmllib.csm XMLLIB_OBJECTS = \ $(OBJS)\xmllib_dummy.obj \ - $(OBJS)\xmllib_xml.obj + $(OBJS)\xmllib_xml.obj \ + $(OBJS)\xmllib_xtixml.obj ### Conditionally set variables: ### +!if "$(SHARED)" == "0" +LIBDIRNAME = ..\..\lib\bcc_lib$(CFG) +!endif +!if "$(SHARED)" == "1" +LIBDIRNAME = ..\..\lib\bcc_dll$(CFG) +!endif !if "$(USE_GUI)" == "0" PORTNAME = base !endif @@ -856,19 +884,19 @@ __RUNTIME_LIBS = -tWR __RUNTIME_LIBS = !endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_9 = i +__RUNTIME_LIBS_10 = i !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_9 = +__RUNTIME_LIBS_10 = !endif !if "$(WXUNIV)" == "0" -__SETUP_H_DIR_FILENAMES = msw +__SETUP_H_SUBDIR_FILENAMES = msw !endif !if "$(WXUNIV)" == "1" -__SETUP_H_DIR_FILENAMES = univ +__SETUP_H_SUBDIR_FILENAMES = univ !endif !if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +__UNICODE_DEFINE_p = -D_UNICODE !endif !if "$(MSLU)" == "1" __UNICOWS_LIB_p = unicows.lib @@ -927,6 +955,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_palette.obj \ $(OBJS)\monolib_pen.obj \ $(OBJS)\monolib_popupwin.obj \ + $(OBJS)\monolib_printdlg.obj \ + $(OBJS)\monolib_printwin.obj \ $(OBJS)\monolib_region.obj \ $(OBJS)\monolib_renderer.obj \ $(OBJS)\monolib_settings.obj \ @@ -966,9 +996,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_notebook.obj \ $(OBJS)\monolib_access.obj \ $(OBJS)\monolib_ownerdrw.obj \ - $(OBJS)\monolib_penwin.obj \ - $(OBJS)\monolib_printdlg.obj \ - $(OBJS)\monolib_printwin.obj \ $(OBJS)\monolib_radiobox.obj \ $(OBJS)\monolib_radiobut.obj \ $(OBJS)\monolib_scrolbar.obj \ @@ -990,6 +1017,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_artprov.obj \ $(OBJS)\monolib_artstd.obj \ $(OBJS)\monolib_bmpbase.obj \ + $(OBJS)\monolib_bookctrl.obj \ $(OBJS)\monolib_choiccmn.obj \ $(OBJS)\monolib_clipcmn.obj \ $(OBJS)\monolib_cmdproc.obj \ @@ -1061,16 +1089,17 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dcpsg.obj \ $(OBJS)\monolib_dirctrlg.obj \ $(OBJS)\monolib_dragimgg.obj \ + $(OBJS)\monolib_listbkg.obj \ $(OBJS)\monolib_logg.obj \ $(OBJS)\monolib_numdlgg.obj \ $(OBJS)\monolib_panelg.obj \ $(OBJS)\monolib_progdlgg.obj \ + $(OBJS)\monolib_printps.obj \ $(OBJS)\monolib_renderg.obj \ $(OBJS)\monolib_scrlwing.obj \ $(OBJS)\monolib_selstore.obj \ $(OBJS)\monolib_spinctlg.obj \ $(OBJS)\monolib_splitter.obj \ - $(OBJS)\monolib_tbarsmpl.obj \ $(OBJS)\monolib_textdlgg.obj \ $(OBJS)\monolib_tipwin.obj \ $(OBJS)\monolib_treectlg.obj \ @@ -1117,6 +1146,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_palette.obj \ $(OBJS)\monolib_pen.obj \ $(OBJS)\monolib_popupwin.obj \ + $(OBJS)\monolib_printdlg.obj \ + $(OBJS)\monolib_printwin.obj \ $(OBJS)\monolib_region.obj \ $(OBJS)\monolib_renderer.obj \ $(OBJS)\monolib_settings.obj \ @@ -1180,6 +1211,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_artprov.obj \ $(OBJS)\monolib_artstd.obj \ $(OBJS)\monolib_bmpbase.obj \ + $(OBJS)\monolib_bookctrl.obj \ $(OBJS)\monolib_choiccmn.obj \ $(OBJS)\monolib_clipcmn.obj \ $(OBJS)\monolib_cmdproc.obj \ @@ -1251,16 +1283,17 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dcpsg.obj \ $(OBJS)\monolib_dirctrlg.obj \ $(OBJS)\monolib_dragimgg.obj \ + $(OBJS)\monolib_listbkg.obj \ $(OBJS)\monolib_logg.obj \ $(OBJS)\monolib_numdlgg.obj \ $(OBJS)\monolib_panelg.obj \ $(OBJS)\monolib_progdlgg.obj \ + $(OBJS)\monolib_printps.obj \ $(OBJS)\monolib_renderg.obj \ $(OBJS)\monolib_scrlwing.obj \ $(OBJS)\monolib_selstore.obj \ $(OBJS)\monolib_spinctlg.obj \ $(OBJS)\monolib_splitter.obj \ - $(OBJS)\monolib_tbarsmpl.obj \ $(OBJS)\monolib_textdlgg.obj \ $(OBJS)\monolib_tipwin.obj \ $(OBJS)\monolib_treectlg.obj \ @@ -1307,6 +1340,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_palette.obj \ $(OBJS)\coredll_pen.obj \ $(OBJS)\coredll_popupwin.obj \ + $(OBJS)\coredll_printdlg.obj \ + $(OBJS)\coredll_printwin.obj \ $(OBJS)\coredll_region.obj \ $(OBJS)\coredll_renderer.obj \ $(OBJS)\coredll_settings.obj \ @@ -1346,9 +1381,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_notebook.obj \ $(OBJS)\coredll_access.obj \ $(OBJS)\coredll_ownerdrw.obj \ - $(OBJS)\coredll_penwin.obj \ - $(OBJS)\coredll_printdlg.obj \ - $(OBJS)\coredll_printwin.obj \ $(OBJS)\coredll_radiobox.obj \ $(OBJS)\coredll_radiobut.obj \ $(OBJS)\coredll_scrolbar.obj \ @@ -1370,6 +1402,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_artprov.obj \ $(OBJS)\coredll_artstd.obj \ $(OBJS)\coredll_bmpbase.obj \ + $(OBJS)\coredll_bookctrl.obj \ $(OBJS)\coredll_choiccmn.obj \ $(OBJS)\coredll_clipcmn.obj \ $(OBJS)\coredll_cmdproc.obj \ @@ -1441,16 +1474,17 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dcpsg.obj \ $(OBJS)\coredll_dirctrlg.obj \ $(OBJS)\coredll_dragimgg.obj \ + $(OBJS)\coredll_listbkg.obj \ $(OBJS)\coredll_logg.obj \ $(OBJS)\coredll_numdlgg.obj \ $(OBJS)\coredll_panelg.obj \ $(OBJS)\coredll_progdlgg.obj \ + $(OBJS)\coredll_printps.obj \ $(OBJS)\coredll_renderg.obj \ $(OBJS)\coredll_scrlwing.obj \ $(OBJS)\coredll_selstore.obj \ $(OBJS)\coredll_spinctlg.obj \ $(OBJS)\coredll_splitter.obj \ - $(OBJS)\coredll_tbarsmpl.obj \ $(OBJS)\coredll_textdlgg.obj \ $(OBJS)\coredll_tipwin.obj \ $(OBJS)\coredll_treectlg.obj \ @@ -1497,6 +1531,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_palette.obj \ $(OBJS)\coredll_pen.obj \ $(OBJS)\coredll_popupwin.obj \ + $(OBJS)\coredll_printdlg.obj \ + $(OBJS)\coredll_printwin.obj \ $(OBJS)\coredll_region.obj \ $(OBJS)\coredll_renderer.obj \ $(OBJS)\coredll_settings.obj \ @@ -1560,6 +1596,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_artprov.obj \ $(OBJS)\coredll_artstd.obj \ $(OBJS)\coredll_bmpbase.obj \ + $(OBJS)\coredll_bookctrl.obj \ $(OBJS)\coredll_choiccmn.obj \ $(OBJS)\coredll_clipcmn.obj \ $(OBJS)\coredll_cmdproc.obj \ @@ -1631,16 +1668,17 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dcpsg.obj \ $(OBJS)\coredll_dirctrlg.obj \ $(OBJS)\coredll_dragimgg.obj \ + $(OBJS)\coredll_listbkg.obj \ $(OBJS)\coredll_logg.obj \ $(OBJS)\coredll_numdlgg.obj \ $(OBJS)\coredll_panelg.obj \ $(OBJS)\coredll_progdlgg.obj \ + $(OBJS)\coredll_printps.obj \ $(OBJS)\coredll_renderg.obj \ $(OBJS)\coredll_scrlwing.obj \ $(OBJS)\coredll_selstore.obj \ $(OBJS)\coredll_spinctlg.obj \ $(OBJS)\coredll_splitter.obj \ - $(OBJS)\coredll_tbarsmpl.obj \ $(OBJS)\coredll_textdlgg.obj \ $(OBJS)\coredll_tipwin.obj \ $(OBJS)\coredll_treectlg.obj \ @@ -1687,6 +1725,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_palette.obj \ $(OBJS)\corelib_pen.obj \ $(OBJS)\corelib_popupwin.obj \ + $(OBJS)\corelib_printdlg.obj \ + $(OBJS)\corelib_printwin.obj \ $(OBJS)\corelib_region.obj \ $(OBJS)\corelib_renderer.obj \ $(OBJS)\corelib_settings.obj \ @@ -1726,9 +1766,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_notebook.obj \ $(OBJS)\corelib_access.obj \ $(OBJS)\corelib_ownerdrw.obj \ - $(OBJS)\corelib_penwin.obj \ - $(OBJS)\corelib_printdlg.obj \ - $(OBJS)\corelib_printwin.obj \ $(OBJS)\corelib_radiobox.obj \ $(OBJS)\corelib_radiobut.obj \ $(OBJS)\corelib_scrolbar.obj \ @@ -1750,6 +1787,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_artprov.obj \ $(OBJS)\corelib_artstd.obj \ $(OBJS)\corelib_bmpbase.obj \ + $(OBJS)\corelib_bookctrl.obj \ $(OBJS)\corelib_choiccmn.obj \ $(OBJS)\corelib_clipcmn.obj \ $(OBJS)\corelib_cmdproc.obj \ @@ -1821,16 +1859,17 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dcpsg.obj \ $(OBJS)\corelib_dirctrlg.obj \ $(OBJS)\corelib_dragimgg.obj \ + $(OBJS)\corelib_listbkg.obj \ $(OBJS)\corelib_logg.obj \ $(OBJS)\corelib_numdlgg.obj \ $(OBJS)\corelib_panelg.obj \ $(OBJS)\corelib_progdlgg.obj \ + $(OBJS)\corelib_printps.obj \ $(OBJS)\corelib_renderg.obj \ $(OBJS)\corelib_scrlwing.obj \ $(OBJS)\corelib_selstore.obj \ $(OBJS)\corelib_spinctlg.obj \ $(OBJS)\corelib_splitter.obj \ - $(OBJS)\corelib_tbarsmpl.obj \ $(OBJS)\corelib_textdlgg.obj \ $(OBJS)\corelib_tipwin.obj \ $(OBJS)\corelib_treectlg.obj \ @@ -1877,6 +1916,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_palette.obj \ $(OBJS)\corelib_pen.obj \ $(OBJS)\corelib_popupwin.obj \ + $(OBJS)\corelib_printdlg.obj \ + $(OBJS)\corelib_printwin.obj \ $(OBJS)\corelib_region.obj \ $(OBJS)\corelib_renderer.obj \ $(OBJS)\corelib_settings.obj \ @@ -1940,6 +1981,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_artprov.obj \ $(OBJS)\corelib_artstd.obj \ $(OBJS)\corelib_bmpbase.obj \ + $(OBJS)\corelib_bookctrl.obj \ $(OBJS)\corelib_choiccmn.obj \ $(OBJS)\corelib_clipcmn.obj \ $(OBJS)\corelib_cmdproc.obj \ @@ -2011,16 +2053,17 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dcpsg.obj \ $(OBJS)\corelib_dirctrlg.obj \ $(OBJS)\corelib_dragimgg.obj \ + $(OBJS)\corelib_listbkg.obj \ $(OBJS)\corelib_logg.obj \ $(OBJS)\corelib_numdlgg.obj \ $(OBJS)\corelib_panelg.obj \ $(OBJS)\corelib_progdlgg.obj \ + $(OBJS)\corelib_printps.obj \ $(OBJS)\corelib_renderg.obj \ $(OBJS)\corelib_scrlwing.obj \ $(OBJS)\corelib_selstore.obj \ $(OBJS)\corelib_spinctlg.obj \ $(OBJS)\corelib_splitter.obj \ - $(OBJS)\corelib_tbarsmpl.obj \ $(OBJS)\corelib_textdlgg.obj \ $(OBJS)\corelib_tipwin.obj \ $(OBJS)\corelib_treectlg.obj \ @@ -2067,6 +2110,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_palette.obj \ $(OBJS)\monodll_pen.obj \ $(OBJS)\monodll_popupwin.obj \ + $(OBJS)\monodll_printdlg.obj \ + $(OBJS)\monodll_printwin.obj \ $(OBJS)\monodll_region.obj \ $(OBJS)\monodll_renderer.obj \ $(OBJS)\monodll_settings.obj \ @@ -2106,9 +2151,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_notebook.obj \ $(OBJS)\monodll_access.obj \ $(OBJS)\monodll_ownerdrw.obj \ - $(OBJS)\monodll_penwin.obj \ - $(OBJS)\monodll_printdlg.obj \ - $(OBJS)\monodll_printwin.obj \ $(OBJS)\monodll_radiobox.obj \ $(OBJS)\monodll_radiobut.obj \ $(OBJS)\monodll_scrolbar.obj \ @@ -2130,6 +2172,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_artprov.obj \ $(OBJS)\monodll_artstd.obj \ $(OBJS)\monodll_bmpbase.obj \ + $(OBJS)\monodll_bookctrl.obj \ $(OBJS)\monodll_choiccmn.obj \ $(OBJS)\monodll_clipcmn.obj \ $(OBJS)\monodll_cmdproc.obj \ @@ -2201,16 +2244,17 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dcpsg.obj \ $(OBJS)\monodll_dirctrlg.obj \ $(OBJS)\monodll_dragimgg.obj \ + $(OBJS)\monodll_listbkg.obj \ $(OBJS)\monodll_logg.obj \ $(OBJS)\monodll_numdlgg.obj \ $(OBJS)\monodll_panelg.obj \ $(OBJS)\monodll_progdlgg.obj \ + $(OBJS)\monodll_printps.obj \ $(OBJS)\monodll_renderg.obj \ $(OBJS)\monodll_scrlwing.obj \ $(OBJS)\monodll_selstore.obj \ $(OBJS)\monodll_spinctlg.obj \ $(OBJS)\monodll_splitter.obj \ - $(OBJS)\monodll_tbarsmpl.obj \ $(OBJS)\monodll_textdlgg.obj \ $(OBJS)\monodll_tipwin.obj \ $(OBJS)\monodll_treectlg.obj \ @@ -2257,6 +2301,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_palette.obj \ $(OBJS)\monodll_pen.obj \ $(OBJS)\monodll_popupwin.obj \ + $(OBJS)\monodll_printdlg.obj \ + $(OBJS)\monodll_printwin.obj \ $(OBJS)\monodll_region.obj \ $(OBJS)\monodll_renderer.obj \ $(OBJS)\monodll_settings.obj \ @@ -2320,6 +2366,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_artprov.obj \ $(OBJS)\monodll_artstd.obj \ $(OBJS)\monodll_bmpbase.obj \ + $(OBJS)\monodll_bookctrl.obj \ $(OBJS)\monodll_choiccmn.obj \ $(OBJS)\monodll_clipcmn.obj \ $(OBJS)\monodll_cmdproc.obj \ @@ -2391,22 +2438,29 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dcpsg.obj \ $(OBJS)\monodll_dirctrlg.obj \ $(OBJS)\monodll_dragimgg.obj \ + $(OBJS)\monodll_listbkg.obj \ $(OBJS)\monodll_logg.obj \ $(OBJS)\monodll_numdlgg.obj \ $(OBJS)\monodll_panelg.obj \ $(OBJS)\monodll_progdlgg.obj \ + $(OBJS)\monodll_printps.obj \ $(OBJS)\monodll_renderg.obj \ $(OBJS)\monodll_scrlwing.obj \ $(OBJS)\monodll_selstore.obj \ $(OBJS)\monodll_spinctlg.obj \ $(OBJS)\monodll_splitter.obj \ - $(OBJS)\monodll_tbarsmpl.obj \ $(OBJS)\monodll_textdlgg.obj \ $(OBJS)\monodll_tipwin.obj \ $(OBJS)\monodll_treectlg.obj \ $(OBJS)\monodll_vlbox.obj \ $(OBJS)\monodll_vscroll.obj !endif +!if "$(SHARED)" == "0" +____LIBDIRNAME_FILENAMES_6_p = -I..\..\lib\bcc_lib$(CFG) +!endif +!if "$(SHARED)" == "1" +____LIBDIRNAME_FILENAMES_6_p = -I..\..\lib\bcc_dll$(CFG) +!endif !if "$(USE_GUI)" == "1" ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(____CORE_SRC_FILENAMES_1_OBJECTS) \ @@ -2497,7 +2551,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" __advdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).dll !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" __advlib___depname = \ @@ -2505,7 +2559,7 @@ __advlib___depname = \ !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" __basedll___depname = \ - $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" __baselib___depname = \ @@ -2513,7 +2567,7 @@ __baselib___depname = \ !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" __coredll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" __corelib___depname = \ @@ -2521,7 +2575,7 @@ __corelib___depname = \ !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" __dbgriddll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).dll !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" __dbgridlib___depname = \ @@ -2529,7 +2583,7 @@ __dbgridlib___depname = \ !endif !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" __gldll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll !endif !if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" __gllib___depname = \ @@ -2537,7 +2591,7 @@ __gllib___depname = \ !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1" __htmldll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_HTML)" == "1" __htmllib___depname = \ @@ -2545,7 +2599,7 @@ __htmllib___depname = \ !endif !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" __monodll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll !endif !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0" __monolib___depname = \ @@ -2553,17 +2607,17 @@ __monolib___depname = \ !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" __netdll___depname = \ - $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" __netlib___depname = \ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib !endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1" __odbcdll___depname = \ - $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll !endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1" __odbclib___depname = \ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib !endif @@ -2578,7 +2632,7 @@ __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" __xmldll___depname = \ - $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).dll !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" __xmllib___depname = \ @@ -2891,6 +2945,12 @@ $(OBJS)\basedll_wfstream.obj: ..\..\src\common\wfstream.cpp $(OBJS)\basedll_wxchar.obj: ..\..\src\common\wxchar.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** +$(OBJS)\basedll_xti.obj: ..\..\src\common\xti.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + +$(OBJS)\basedll_xtistrm.obj: ..\..\src\common\xtistrm.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + $(OBJS)\basedll_zipstrm.obj: ..\..\src\common\zipstrm.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -3098,6 +3158,12 @@ $(OBJS)\baselib_wfstream.obj: ..\..\src\common\wfstream.cpp $(OBJS)\baselib_wxchar.obj: ..\..\src\common\wxchar.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** +$(OBJS)\baselib_xti.obj: ..\..\src\common\xti.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** + +$(OBJS)\baselib_xtistrm.obj: ..\..\src\common\xtistrm.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** + $(OBJS)\baselib_zipstrm.obj: ..\..\src\common\zipstrm.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** @@ -3167,6 +3233,11 @@ $(OBJS)\coredll_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_brush.obj: ..\..\src\msw\brush.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -3705,6 +3776,11 @@ $(OBJS)\coredll_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_listbkg.obj: ..\..\src\generic\listbkg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\coredll_listbox.obj: ..\..\src\msw\listbox.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -3836,9 +3912,6 @@ $(OBJS)\coredll_pen.obj: ..\..\src\msw\pen.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif -$(OBJS)\coredll_penwin.obj: ..\..\src\msw\penwin.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_popupcmn.obj: ..\..\src\common\popupcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -3849,11 +3922,20 @@ $(OBJS)\coredll_popupwin.obj: ..\..\src\msw\popupwin.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" $(OBJS)\coredll_printdlg.obj: ..\..\src\msw\printdlg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_printps.obj: ..\..\src\generic\printps.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif +!if "$(USE_GUI)" == "1" $(OBJS)\coredll_printwin.obj: ..\..\src\msw\printwin.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif !if "$(USE_GUI)" == "1" $(OBJS)\coredll_prntbase.obj: ..\..\src\common\prntbase.cpp @@ -4065,11 +4147,6 @@ $(OBJS)\coredll_tbarbase.obj: ..\..\src\common\tbarbase.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_tbarsmpl.obj: ..\..\src\generic\tbarsmpl.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_textcmn.obj: ..\..\src\common\textcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -4275,6 +4352,11 @@ $(OBJS)\corelib_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_bookctrl.obj: ..\..\src\common\bookctrl.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_brush.obj: ..\..\src\msw\brush.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -4813,6 +4895,11 @@ $(OBJS)\corelib_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_listbkg.obj: ..\..\src\generic\listbkg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\corelib_listbox.obj: ..\..\src\msw\listbox.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -4944,9 +5031,6 @@ $(OBJS)\corelib_pen.obj: ..\..\src\msw\pen.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif -$(OBJS)\corelib_penwin.obj: ..\..\src\msw\penwin.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_popupcmn.obj: ..\..\src\common\popupcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -4957,11 +5041,20 @@ $(OBJS)\corelib_popupwin.obj: ..\..\src\msw\popupwin.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" $(OBJS)\corelib_printdlg.obj: ..\..\src\msw\printdlg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_printps.obj: ..\..\src\generic\printps.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif +!if "$(USE_GUI)" == "1" $(OBJS)\corelib_printwin.obj: ..\..\src\msw\printwin.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif !if "$(USE_GUI)" == "1" $(OBJS)\corelib_prntbase.obj: ..\..\src\common\prntbase.cpp @@ -5173,11 +5266,6 @@ $(OBJS)\corelib_tbarbase.obj: ..\..\src\common\tbarbase.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_tbarsmpl.obj: ..\..\src\generic\tbarsmpl.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_textcmn.obj: ..\..\src\common\textcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -5551,6 +5639,11 @@ $(OBJS)\monodll_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_brush.obj: ..\..\src\msw\brush.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6251,6 +6344,11 @@ $(OBJS)\monodll_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp $(OBJS)\monodll_list.obj: ..\..\src\common\list.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_listbkg.obj: ..\..\src\generic\listbkg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monodll_listbox.obj: ..\..\src\msw\listbox.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6436,9 +6534,6 @@ $(OBJS)\monodll_pen.obj: ..\..\src\msw\pen.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif -$(OBJS)\monodll_penwin.obj: ..\..\src\msw\penwin.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_popupcmn.obj: ..\..\src\common\popupcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6449,11 +6544,20 @@ $(OBJS)\monodll_popupwin.obj: ..\..\src\msw\popupwin.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_printdlg.obj: ..\..\src\msw\printdlg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_printps.obj: ..\..\src\generic\printps.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_printwin.obj: ..\..\src\msw\printwin.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif !if "$(USE_GUI)" == "1" $(OBJS)\monodll_prntbase.obj: ..\..\src\common\prntbase.cpp @@ -6725,11 +6829,6 @@ $(OBJS)\monodll_tbarbase.obj: ..\..\src\common\tbarbase.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_tbarsmpl.obj: ..\..\src\generic\tbarsmpl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif - $(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6923,6 +7022,15 @@ $(OBJS)\monodll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +$(OBJS)\monodll_xti.obj: ..\..\src\common\xti.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xtistrm.obj: ..\..\src\common\xtistrm.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xtixml.obj: ..\..\src\common\xtixml.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_zipstrm.obj: ..\..\src\common\zipstrm.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6998,6 +7106,11 @@ $(OBJS)\monolib_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_brush.obj: ..\..\src\msw\brush.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7698,6 +7811,11 @@ $(OBJS)\monolib_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp $(OBJS)\monolib_list.obj: ..\..\src\common\list.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_listbkg.obj: ..\..\src\generic\listbkg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monolib_listbox.obj: ..\..\src\msw\listbox.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7883,9 +8001,6 @@ $(OBJS)\monolib_pen.obj: ..\..\src\msw\pen.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif -$(OBJS)\monolib_penwin.obj: ..\..\src\msw\penwin.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_popupcmn.obj: ..\..\src\common\popupcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7896,11 +8011,20 @@ $(OBJS)\monolib_popupwin.obj: ..\..\src\msw\popupwin.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_printdlg.obj: ..\..\src\msw\printdlg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_printps.obj: ..\..\src\generic\printps.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_printwin.obj: ..\..\src\msw\printwin.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif !if "$(USE_GUI)" == "1" $(OBJS)\monolib_prntbase.obj: ..\..\src\common\prntbase.cpp @@ -8172,11 +8296,6 @@ $(OBJS)\monolib_tbarbase.obj: ..\..\src\common\tbarbase.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_tbarsmpl.obj: ..\..\src\generic\tbarsmpl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif - $(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -8370,6 +8489,15 @@ $(OBJS)\monolib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +$(OBJS)\monolib_xti.obj: ..\..\src\common\xti.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xtistrm.obj: ..\..\src\common\xtistrm.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xtixml.obj: ..\..\src\common\xtixml.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_zipstrm.obj: ..\..\src\common\zipstrm.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -8823,16 +8951,22 @@ $(OBJS)\xmldll_dummy.obj: ..\..\src\msw\dummy.cpp $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp $(CXX) -q -c -P -o$@ $(XMLDLL_CXXFLAGS) $** +$(OBJS)\xmldll_xtixml.obj: ..\..\src\common\xtixml.cpp + $(CXX) -q -c -P -o$@ $(XMLDLL_CXXFLAGS) $** + $(OBJS)\xmllib_dummy.obj: ..\..\src\msw\dummy.cpp $(CXX) -q -c -P -o$@ $(XMLLIB_CXXFLAGS) -H $** $(OBJS)\xmllib_xml.obj: ..\..\src\xml\xml.cpp $(CXX) -q -c -P -o$@ $(XMLLIB_CXXFLAGS) $** +$(OBJS)\xmllib_xtixml.obj: ..\..\src\common\xtixml.cpp + $(CXX) -q -c -P -o$@ $(XMLLIB_CXXFLAGS) $** + !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) - ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(ADVDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) import32.lib ole2w32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,, +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + c0d32.obj $(ADVDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_10).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv $@ !endif @@ -8846,9 +8980,9 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib - ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(BASEDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) import32.lib ole2w32.lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,, +$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + c0d32.obj $(BASEDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_10).lib,, | implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@ !endif @@ -8870,41 +9004,91 @@ clean: -if exist $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib -if exist $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib -if exist $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).tds + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ilc + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ild + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ilf + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ils -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).tds + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ilc + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ild + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ilf + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ils -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).tds + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).ilc + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).ild + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).ilf + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).ils -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).tds + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).ilc + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).ild + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).ilf + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).ils -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).tds + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).ilc + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).ild + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).ilf + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).ils -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib - -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).tds + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).ilc + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).ild + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).ilf + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).ils -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).tds + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).ilc + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).ild + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).ilf + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).ils -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).tds + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).ilc + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).ild + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).ilf + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).ils -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib - -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).tds + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).ilc + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).ild + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).ilf + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).ils -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).tds + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).ilc + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).ild + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).ilf + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).ils -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) - ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(COREDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,, +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + c0d32.obj $(COREDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_10).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core $@ !endif @@ -8918,9 +9102,9 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.li !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).dll: $(OBJS)\dbgriddll_dummy.obj $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname) - ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(DBGRIDDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) import32.lib ole2w32.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 import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,, +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).dll: $(OBJS)\dbgriddll_dummy.obj $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname) + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + c0d32.obj $(DBGRIDDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.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 import32.lib cw32mt$(__RUNTIME_LIBS_10).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid $@ !endif @@ -8934,9 +9118,9 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid. !endif !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib - ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(GLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) import32.lib ole2w32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,, +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) $(__coredll___depname) + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + c0d32.obj $(GLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) import32.lib cw32mt$(__RUNTIME_LIBS_10).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl $@ !endif @@ -8950,9 +9134,9 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib: !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) - ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(HTMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) import32.lib ole2w32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,, +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + c0d32.obj $(HTMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_10).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html $@ !endif @@ -8968,16 +9152,19 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.li $(LIBDIRNAME): if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME) -$(LIBDIRNAME)\wx: $(LIBDIRNAME) - if not exist $(LIBDIRNAME)\wx mkdir $(LIBDIRNAME)\wx +$(SETUPHDIR): $(LIBDIRNAME) + if not exist $(SETUPHDIR) mkdir $(SETUPHDIR) + +$(SETUPHDIR)\wx: $(SETUPHDIR) + if not exist $(SETUPHDIR)\wx mkdir $(SETUPHDIR)\wx -..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup.h: - if not exist ..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup.h copy ..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup0.h ..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup.h +..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h: + if not exist ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup0.h ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib - ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(MONODLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) import32.lib ole2w32.lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,, +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + c0d32.obj $(MONODLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_10).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@ !endif @@ -8991,9 +9178,9 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $( !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) - ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(NETDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,, +$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + c0d32.obj $(NETDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_10).lib,, | implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net $@ !endif @@ -9006,15 +9193,15 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(OBJS)\netlib_dum | !endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" -$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll: $(OBJS)\odbcdll_dummy.obj $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) - ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(ODBCDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,, +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1" +$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll: $(OBJS)\odbcdll_dummy.obj $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + c0d32.obj $(ODBCDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_10).lib,, | implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc $@ !endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1" $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(OBJS)\odbclib_dummy.obj $(ODBCLIB_OBJECTS) if exist $@ del $@ tlib /a /p2048 $@ @&&| @@ -9027,10 +9214,10 @@ samples: $(MAKE) -f makefile.bcc $(MAKEARGS) all cd ..\..\.. -$(LIBDIRNAME)\wx\setup.h: - if not exist $(LIBDIRNAME)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup.h $(LIBDIRNAME)\wx\setup.h +$(SETUPHDIR)\wx\setup.h: + if not exist $(SETUPHDIR)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h -setup_h: $(LIBDIRNAME)\wx ..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup.h $(LIBDIRNAME)\wx\setup.h +setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib: $(WXEXPAT_OBJECTS) if exist $@ del $@ @@ -9075,9 +9262,9 @@ $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib: $(WXZLIB_OBJECTS) | !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) - ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(XMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,, +$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + c0d32.obj $(XMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_10).lib,, | implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml $@ !endif