X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/232d895d8fec2b6d6f8900bd221022a9177d5670..5554b4bda9272758a0cce0bc7af960d17325ad2f:/build/msw/makefile.wat?ds=sidebyside diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index 44ddc5b837..c2d3fe2cab 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -86,22 +86,22 @@ __DEBUGINFO = -d0 !ifeq DEBUG_INFO 1 __DEBUGINFO = -d2 !endif -__DEBUGINFO_10 = +__DEBUGINFO_7 = !ifeq BUILD debug !ifeq DEBUG_INFO default -__DEBUGINFO_10 = debug all +__DEBUGINFO_7 = debug all !endif !endif !ifeq BUILD release !ifeq DEBUG_INFO default -__DEBUGINFO_10 = +__DEBUGINFO_7 = !endif !endif !ifeq DEBUG_INFO 0 -__DEBUGINFO_10 = +__DEBUGINFO_7 = !endif !ifeq DEBUG_INFO 1 -__DEBUGINFO_10 = debug all +__DEBUGINFO_7 = debug all !endif __DEBUG_DEFINE_p = !ifeq BUILD debug @@ -112,6 +112,13 @@ __DEBUG_DEFINE_p = -d__WXDEBUG__ !ifeq DEBUG_FLAG 1 __DEBUG_DEFINE_p = -d__WXDEBUG__ !endif +__EXCEPTIONSFLAG = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG = -xs +!endif __LIB_JPEG_p = !ifeq USE_GUI 1 __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib @@ -147,7 +154,7 @@ __SETUP_H_SUBDIR_FILENAMES = univ !endif __UNICODE_DEFINE_p = !ifeq UNICODE 1 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +__UNICODE_DEFINE_p = -d_UNICODE !endif __WXLIBGLDEP_BASE_p = !ifeq MONOLITHIC 0 @@ -221,6 +228,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_uxtheme.obj & $(OBJS)\monolib_window.obj & $(OBJS)\monolib_statusbr.obj & + $(OBJS)\monolib_prntdlgg.obj & $(OBJS)\monolib_accel.obj & $(OBJS)\monolib_bmpbuttn.obj & $(OBJS)\monolib_button.obj & @@ -343,7 +351,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_dcpsg.obj & $(OBJS)\monolib_dirctrlg.obj & $(OBJS)\monolib_dragimgg.obj & - $(OBJS)\monolib_listbook.obj & + $(OBJS)\monolib_listbkg.obj & $(OBJS)\monolib_logg.obj & $(OBJS)\monolib_numdlgg.obj & $(OBJS)\monolib_panelg.obj & @@ -539,7 +547,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_dcpsg.obj & $(OBJS)\monolib_dirctrlg.obj & $(OBJS)\monolib_dragimgg.obj & - $(OBJS)\monolib_listbook.obj & + $(OBJS)\monolib_listbkg.obj & $(OBJS)\monolib_logg.obj & $(OBJS)\monolib_numdlgg.obj & $(OBJS)\monolib_panelg.obj & @@ -611,6 +619,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_uxtheme.obj & $(OBJS)\coredll_window.obj & $(OBJS)\coredll_statusbr.obj & + $(OBJS)\coredll_prntdlgg.obj & $(OBJS)\coredll_accel.obj & $(OBJS)\coredll_bmpbuttn.obj & $(OBJS)\coredll_button.obj & @@ -733,7 +742,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_dcpsg.obj & $(OBJS)\coredll_dirctrlg.obj & $(OBJS)\coredll_dragimgg.obj & - $(OBJS)\coredll_listbook.obj & + $(OBJS)\coredll_listbkg.obj & $(OBJS)\coredll_logg.obj & $(OBJS)\coredll_numdlgg.obj & $(OBJS)\coredll_panelg.obj & @@ -929,7 +938,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_dcpsg.obj & $(OBJS)\coredll_dirctrlg.obj & $(OBJS)\coredll_dragimgg.obj & - $(OBJS)\coredll_listbook.obj & + $(OBJS)\coredll_listbkg.obj & $(OBJS)\coredll_logg.obj & $(OBJS)\coredll_numdlgg.obj & $(OBJS)\coredll_panelg.obj & @@ -1001,6 +1010,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_uxtheme.obj & $(OBJS)\corelib_window.obj & $(OBJS)\corelib_statusbr.obj & + $(OBJS)\corelib_prntdlgg.obj & $(OBJS)\corelib_accel.obj & $(OBJS)\corelib_bmpbuttn.obj & $(OBJS)\corelib_button.obj & @@ -1123,7 +1133,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_dcpsg.obj & $(OBJS)\corelib_dirctrlg.obj & $(OBJS)\corelib_dragimgg.obj & - $(OBJS)\corelib_listbook.obj & + $(OBJS)\corelib_listbkg.obj & $(OBJS)\corelib_logg.obj & $(OBJS)\corelib_numdlgg.obj & $(OBJS)\corelib_panelg.obj & @@ -1319,7 +1329,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_dcpsg.obj & $(OBJS)\corelib_dirctrlg.obj & $(OBJS)\corelib_dragimgg.obj & - $(OBJS)\corelib_listbook.obj & + $(OBJS)\corelib_listbkg.obj & $(OBJS)\corelib_logg.obj & $(OBJS)\corelib_numdlgg.obj & $(OBJS)\corelib_panelg.obj & @@ -1391,6 +1401,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_uxtheme.obj & $(OBJS)\monodll_window.obj & $(OBJS)\monodll_statusbr.obj & + $(OBJS)\monodll_prntdlgg.obj & $(OBJS)\monodll_accel.obj & $(OBJS)\monodll_bmpbuttn.obj & $(OBJS)\monodll_button.obj & @@ -1513,7 +1524,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_dcpsg.obj & $(OBJS)\monodll_dirctrlg.obj & $(OBJS)\monodll_dragimgg.obj & - $(OBJS)\monodll_listbook.obj & + $(OBJS)\monodll_listbkg.obj & $(OBJS)\monodll_logg.obj & $(OBJS)\monodll_numdlgg.obj & $(OBJS)\monodll_panelg.obj & @@ -1709,7 +1720,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_dcpsg.obj & $(OBJS)\monodll_dirctrlg.obj & $(OBJS)\monodll_dragimgg.obj & - $(OBJS)\monodll_listbook.obj & + $(OBJS)\monodll_listbkg.obj & $(OBJS)\monodll_logg.obj & $(OBJS)\monodll_numdlgg.obj & $(OBJS)\monodll_panelg.obj & @@ -1829,7 +1840,7 @@ __advdll___depname = !ifeq SHARED 1 !ifeq USE_GUI 1 __advdll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wat$(VENDORTAG).dll !endif !endif !endif @@ -1846,7 +1857,7 @@ __basedll___depname = !ifeq MONOLITHIC 0 !ifeq SHARED 1 __basedll___depname = & - $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll !endif !endif __baselib___depname = @@ -1861,7 +1872,7 @@ __coredll___depname = !ifeq SHARED 1 !ifeq USE_GUI 1 __coredll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_wat$(VENDORTAG).dll !endif !endif !endif @@ -1880,7 +1891,7 @@ __dbgriddll___depname = !ifeq USE_GUI 1 !ifeq USE_ODBC 1 __dbgriddll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_wat$(VENDORTAG).dll !endif !endif !endif @@ -1901,7 +1912,7 @@ __gldll___depname = !ifeq USE_GUI 1 !ifeq USE_OPENGL 1 __gldll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat$(VENDORTAG).dll !endif !endif !endif @@ -1919,7 +1930,7 @@ __htmldll___depname = !ifeq SHARED 1 !ifeq USE_HTML 1 __htmldll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_wat$(VENDORTAG).dll !endif !endif !endif @@ -1936,7 +1947,7 @@ __monodll___depname = !ifeq MONOLITHIC 1 !ifeq SHARED 1 __monodll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll !endif !endif __monolib___depname = @@ -1950,7 +1961,7 @@ __netdll___depname = !ifeq MONOLITHIC 0 !ifeq SHARED 1 __netdll___depname = & - $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll !endif !endif __netlib___depname = @@ -1965,7 +1976,7 @@ __odbcdll___depname = !ifeq SHARED 1 !ifeq USE_ODBC 1 __odbcdll___depname = & - $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll !endif !endif !endif @@ -1994,7 +2005,7 @@ __xmldll___depname = !ifeq MONOLITHIC 0 !ifeq SHARED 1 __xmldll___depname = & - $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll !endif !endif __xmllib___depname = @@ -2012,7 +2023,7 @@ ADVDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__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) & - /fh=$(OBJS)\wxprec_advdll.pch + /fh=$(OBJS)\wxprec_advdll.pch $(__EXCEPTIONSFLAG) ADVDLL_OBJECTS = & $(OBJS)\advdll_dummy.obj & $(OBJS)\advdll_calctrl.obj & @@ -2034,7 +2045,8 @@ ADVLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__RUNTIME_LIBS) -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) /fh=$(OBJS)\wxprec_advlib.pch + -i=..\..\src\expat\lib $(CXXFLAGS) /fh=$(OBJS)\wxprec_advlib.pch & + $(__EXCEPTIONSFLAG) ADVLIB_OBJECTS = & $(OBJS)\advlib_dummy.obj & $(OBJS)\advlib_calctrl.obj & @@ -2063,7 +2075,7 @@ BASEDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__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) /fh=$(OBJS)\wxprec_basedll.pch + $(CXXFLAGS) /fh=$(OBJS)\wxprec_basedll.pch $(__EXCEPTIONSFLAG) BASEDLL_OBJECTS = & $(OBJS)\basedll_dummy.obj & $(OBJS)\basedll_appbase.obj & @@ -2086,6 +2098,7 @@ BASEDLL_OBJECTS = & $(OBJS)\basedll_filesys.obj & $(OBJS)\basedll_fmapbase.obj & $(OBJS)\basedll_fs_zip.obj & + $(OBJS)\basedll_gzstream.obj & $(OBJS)\basedll_hash.obj & $(OBJS)\basedll_hashmap.obj & $(OBJS)\basedll_init.obj & @@ -2114,6 +2127,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 & @@ -2144,7 +2159,7 @@ BASELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__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) & - /fh=$(OBJS)\wxprec_baselib.pch + /fh=$(OBJS)\wxprec_baselib.pch $(__EXCEPTIONSFLAG) BASELIB_OBJECTS = & $(OBJS)\baselib_dummy.obj & $(OBJS)\baselib_appbase.obj & @@ -2167,6 +2182,7 @@ BASELIB_OBJECTS = & $(OBJS)\baselib_filesys.obj & $(OBJS)\baselib_fmapbase.obj & $(OBJS)\baselib_fs_zip.obj & + $(OBJS)\baselib_gzstream.obj & $(OBJS)\baselib_hash.obj & $(OBJS)\baselib_hashmap.obj & $(OBJS)\baselib_init.obj & @@ -2195,6 +2211,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 & @@ -2226,7 +2244,7 @@ COREDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__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) /fh=$(OBJS)\wxprec_coredll.pch + $(CXXFLAGS) /fh=$(OBJS)\wxprec_coredll.pch $(__EXCEPTIONSFLAG) COREDLL_OBJECTS = & $(OBJS)\coredll_dummy.obj & $(OBJS)\coredll_event.obj & @@ -2247,7 +2265,7 @@ CORELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__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) & - /fh=$(OBJS)\wxprec_corelib.pch + /fh=$(OBJS)\wxprec_corelib.pch $(__EXCEPTIONSFLAG) CORELIB_OBJECTS = & $(OBJS)\corelib_dummy.obj & $(OBJS)\corelib_event.obj & @@ -2263,7 +2281,7 @@ DBGRIDDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__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) & - /fh=$(OBJS)\wxprec_dbgriddll.pch + /fh=$(OBJS)\wxprec_dbgriddll.pch $(__EXCEPTIONSFLAG) DBGRIDDLL_OBJECTS = & $(OBJS)\dbgriddll_dummy.obj & $(OBJS)\dbgriddll_dbgrid.obj @@ -2271,7 +2289,8 @@ DBGRIDLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__RUNTIME_LIBS) -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) /fh=$(OBJS)\wxprec_dbgridlib.pch + -i=..\..\src\expat\lib $(CXXFLAGS) /fh=$(OBJS)\wxprec_dbgridlib.pch & + $(__EXCEPTIONSFLAG) DBGRIDLIB_OBJECTS = & $(OBJS)\dbgridlib_dummy.obj & $(OBJS)\dbgridlib_dbgrid.obj @@ -2280,7 +2299,7 @@ GLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__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) & - /fh=$(OBJS)\wxprec_gldll.pch + /fh=$(OBJS)\wxprec_gldll.pch $(__EXCEPTIONSFLAG) GLDLL_OBJECTS = & $(OBJS)\gldll_dummy.obj & $(OBJS)\gldll_glcanvas.obj @@ -2288,7 +2307,8 @@ GLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__RUNTIME_LIBS) -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) /fh=$(OBJS)\wxprec_gllib.pch + -i=..\..\src\expat\lib $(CXXFLAGS) /fh=$(OBJS)\wxprec_gllib.pch & + $(__EXCEPTIONSFLAG) GLLIB_OBJECTS = & $(OBJS)\gllib_dummy.obj & $(OBJS)\gllib_glcanvas.obj @@ -2297,7 +2317,7 @@ HTMLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__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) & - /fh=$(OBJS)\wxprec_htmldll.pch + /fh=$(OBJS)\wxprec_htmldll.pch $(__EXCEPTIONSFLAG) HTMLDLL_OBJECTS = & $(OBJS)\htmldll_dummy.obj & $(OBJS)\htmldll_helpbest.obj & @@ -2326,7 +2346,8 @@ HTMLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__RUNTIME_LIBS) -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) /fh=$(OBJS)\wxprec_htmllib.pch + -i=..\..\src\expat\lib $(CXXFLAGS) /fh=$(OBJS)\wxprec_htmllib.pch & + $(__EXCEPTIONSFLAG) HTMLLIB_OBJECTS = & $(OBJS)\htmllib_dummy.obj & $(OBJS)\htmllib_helpbest.obj & @@ -2351,13 +2372,14 @@ HTMLLIB_OBJECTS = & $(OBJS)\htmllib_m_tables.obj & $(OBJS)\htmllib_winpars.obj & $(OBJS)\htmllib_htmllbox.obj -MAKEARGS = CPPFLAGS="$(CPPFLAGS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" & - WXUNIV="$(WXUNIV)" DEBUG_FLAG="$(DEBUG_FLAG)" CFLAGS="$(CFLAGS)" & - RUNTIME_LIBS="$(RUNTIME_LIBS)" CXX="$(CXX)" CFG="$(CFG)" & - USE_GUI="$(USE_GUI)" MONOLITHIC="$(MONOLITHIC)" CXXFLAGS="$(CXXFLAGS)" & - CC="$(CC)" USE_HTML="$(USE_HTML)" BUILD="$(BUILD)" LDFLAGS="$(LDFLAGS)" & - DEBUG_INFO="$(DEBUG_INFO)" SHARED="$(SHARED)" VENDOR="$(VENDOR)" & - USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" UNICODE="$(UNICODE)" +MAKEARGS = CPPFLAGS="$(CPPFLAGS)" DEBUG_FLAG="$(DEBUG_FLAG)" & + LDFLAGS="$(LDFLAGS)" CC="$(CC)" USE_GUI="$(USE_GUI)" & + MONOLITHIC="$(MONOLITHIC)" CXXFLAGS="$(CXXFLAGS)" USE_HTML="$(USE_HTML)" & + BUILD="$(BUILD)" DEBUG_INFO="$(DEBUG_INFO)" & + USE_EXCEPTIONS="$(USE_EXCEPTIONS)" VENDOR="$(VENDOR)" UNICODE="$(UNICODE)" & + OFFICIAL_BUILD="$(OFFICIAL_BUILD)" WXUNIV="$(WXUNIV)" & + RUNTIME_LIBS="$(RUNTIME_LIBS)" CXX="$(CXX)" CFG="$(CFG)" CFLAGS="$(CFLAGS)" & + SHARED="$(SHARED)" USE_ODBC="$(USE_ODBC)" USE_OPENGL="$(USE_OPENGL)" MONODLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff & @@ -2368,7 +2390,7 @@ MONODLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__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) & - /fh=$(OBJS)\wxprec_monodll.pch + /fh=$(OBJS)\wxprec_monodll.pch $(__EXCEPTIONSFLAG) MONODLL_OBJECTS = & $(OBJS)\monodll_dummy.obj & $(OBJS)\monodll_appbase.obj & @@ -2391,6 +2413,7 @@ MONODLL_OBJECTS = & $(OBJS)\monodll_filesys.obj & $(OBJS)\monodll_fmapbase.obj & $(OBJS)\monodll_fs_zip.obj & + $(OBJS)\monodll_gzstream.obj & $(OBJS)\monodll_hash.obj & $(OBJS)\monodll_hashmap.obj & $(OBJS)\monodll_init.obj & @@ -2419,6 +2442,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 & @@ -2451,7 +2476,8 @@ MONODLL_OBJECTS = & $(OBJS)\monodll_url.obj & $(OBJS)\monodll_gsocket.obj & $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) & - $(OBJS)\monodll_xml.obj + $(OBJS)\monodll_xml.obj & + $(OBJS)\monodll_xtixml.obj MONOLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff & @@ -2462,7 +2488,7 @@ MONOLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__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) & - /fh=$(OBJS)\wxprec_monolib.pch + /fh=$(OBJS)\wxprec_monolib.pch $(__EXCEPTIONSFLAG) MONOLIB_OBJECTS = & $(OBJS)\monolib_dummy.obj & $(OBJS)\monolib_appbase.obj & @@ -2485,6 +2511,7 @@ MONOLIB_OBJECTS = & $(OBJS)\monolib_filesys.obj & $(OBJS)\monolib_fmapbase.obj & $(OBJS)\monolib_fs_zip.obj & + $(OBJS)\monolib_gzstream.obj & $(OBJS)\monolib_hash.obj & $(OBJS)\monolib_hashmap.obj & $(OBJS)\monolib_init.obj & @@ -2513,6 +2540,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 & @@ -2545,7 +2574,8 @@ MONOLIB_OBJECTS = & $(OBJS)\monolib_url.obj & $(OBJS)\monolib_gsocket.obj & $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) & - $(OBJS)\monolib_xml.obj + $(OBJS)\monolib_xml.obj & + $(OBJS)\monolib_xtixml.obj NETDLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff & @@ -2557,7 +2587,7 @@ NETDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__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) /fh=$(OBJS)\wxprec_netdll.pch + $(CXXFLAGS) /fh=$(OBJS)\wxprec_netdll.pch $(__EXCEPTIONSFLAG) NETDLL_OBJECTS = & $(OBJS)\netdll_dummy.obj & $(OBJS)\netdll_fs_inet.obj & @@ -2581,7 +2611,7 @@ NETLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__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) & - /fh=$(OBJS)\wxprec_netlib.pch + /fh=$(OBJS)\wxprec_netlib.pch $(__EXCEPTIONSFLAG) NETLIB_OBJECTS = & $(OBJS)\netlib_dummy.obj & $(OBJS)\netlib_fs_inet.obj & @@ -2602,7 +2632,7 @@ ODBCDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__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) /fh=$(OBJS)\wxprec_odbcdll.pch + $(CXXFLAGS) /fh=$(OBJS)\wxprec_odbcdll.pch $(__EXCEPTIONSFLAG) ODBCDLL_OBJECTS = & $(OBJS)\odbcdll_dummy.obj & $(OBJS)\odbcdll_db.obj & @@ -2612,7 +2642,7 @@ ODBCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__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) & - /fh=$(OBJS)\wxprec_odbclib.pch + /fh=$(OBJS)\wxprec_odbclib.pch $(__EXCEPTIONSFLAG) ODBCLIB_OBJECTS = & $(OBJS)\odbclib_dummy.obj & $(OBJS)\odbclib_db.obj & @@ -2760,19 +2790,21 @@ XMLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__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) /fh=$(OBJS)\wxprec_xmldll.pch + $(CXXFLAGS) /fh=$(OBJS)\wxprec_xmldll.pch $(__EXCEPTIONSFLAG) XMLDLL_OBJECTS = & $(OBJS)\xmldll_dummy.obj & - $(OBJS)\xmldll_xml.obj + $(OBJS)\xmldll_xml.obj & + $(OBJS)\xmldll_xtixml.obj XMLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__RUNTIME_LIBS) -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) & - /fh=$(OBJS)\wxprec_xmllib.pch + /fh=$(OBJS)\wxprec_xmllib.pch $(__EXCEPTIONSFLAG) XMLLIB_OBJECTS = & $(OBJS)\xmllib_dummy.obj & - $(OBJS)\xmllib_xml.obj + $(OBJS)\xmllib_xml.obj & + $(OBJS)\xmllib_xtixml.obj all : $(OBJS) @@ -2960,6 +2992,9 @@ $(OBJS)\basedll_fs_mem.obj : .AUTODEPEND ..\..\src\common\fs_mem.cpp $(OBJS)\basedll_fs_zip.obj : .AUTODEPEND ..\..\src\common\fs_zip.cpp $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_gzstream.obj : .AUTODEPEND ..\..\src\common\gzstream.cpp + $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_hash.obj : .AUTODEPEND ..\..\src\common\hash.cpp $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< @@ -3080,6 +3115,12 @@ $(OBJS)\basedll_wfstream.obj : .AUTODEPEND ..\..\src\common\wfstream.cpp $(OBJS)\basedll_wxchar.obj : .AUTODEPEND ..\..\src\common\wxchar.cpp $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp + $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + +$(OBJS)\basedll_xtistrm.obj : .AUTODEPEND ..\..\src\common\xtistrm.cpp + $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_zipstrm.obj : .AUTODEPEND ..\..\src\common\zipstrm.cpp $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< @@ -3167,6 +3208,9 @@ $(OBJS)\baselib_fs_mem.obj : .AUTODEPEND ..\..\src\common\fs_mem.cpp $(OBJS)\baselib_fs_zip.obj : .AUTODEPEND ..\..\src\common\fs_zip.cpp $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_gzstream.obj : .AUTODEPEND ..\..\src\common\gzstream.cpp + $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_hash.obj : .AUTODEPEND ..\..\src\common\hash.cpp $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< @@ -3287,6 +3331,12 @@ $(OBJS)\baselib_wfstream.obj : .AUTODEPEND ..\..\src\common\wfstream.cpp $(OBJS)\baselib_wxchar.obj : .AUTODEPEND ..\..\src\common\wxchar.cpp $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp + $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + +$(OBJS)\baselib_xtistrm.obj : .AUTODEPEND ..\..\src\common\xtistrm.cpp + $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_zipstrm.obj : .AUTODEPEND ..\..\src\common\zipstrm.cpp $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< @@ -3944,7 +3994,7 @@ $(OBJS)\coredll_lboxcmn.obj : .AUTODEPEND ..\..\src\common\lboxcmn.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\coredll_listbook.obj : .AUTODEPEND ..\..\src\generic\listbook.cpp +$(OBJS)\coredll_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif @@ -4125,8 +4175,10 @@ $(OBJS)\coredll_prntbase.obj : .AUTODEPEND ..\..\src\common\prntbase.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 $(OBJS)\coredll_prntdlgg.obj : .AUTODEPEND ..\..\src\generic\prntdlgg.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif !ifeq USE_GUI 1 $(OBJS)\coredll_progdlgg.obj : .AUTODEPEND ..\..\src\generic\progdlgg.cpp @@ -5163,7 +5215,7 @@ $(OBJS)\corelib_lboxcmn.obj : .AUTODEPEND ..\..\src\common\lboxcmn.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\corelib_listbook.obj : .AUTODEPEND ..\..\src\generic\listbook.cpp +$(OBJS)\corelib_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif @@ -5344,8 +5396,10 @@ $(OBJS)\corelib_prntbase.obj : .AUTODEPEND ..\..\src\common\prntbase.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 $(OBJS)\corelib_prntdlgg.obj : .AUTODEPEND ..\..\src\generic\prntdlgg.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif !ifeq USE_GUI 1 $(OBJS)\corelib_progdlgg.obj : .AUTODEPEND ..\..\src\generic\progdlgg.cpp @@ -6530,6 +6584,9 @@ $(OBJS)\monodll_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.c $(OBJS)\monodll_gtk.obj : .AUTODEPEND ..\..\src\univ\themes\gtk.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_gzstream.obj : .AUTODEPEND ..\..\src\common\gzstream.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_hash.obj : .AUTODEPEND ..\..\src\common\hash.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6712,7 +6769,7 @@ $(OBJS)\monodll_list.obj : .AUTODEPEND ..\..\src\common\list.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !ifeq USE_GUI 1 -$(OBJS)\monodll_listbook.obj : .AUTODEPEND ..\..\src\generic\listbook.cpp +$(OBJS)\monodll_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif @@ -6947,8 +7004,10 @@ $(OBJS)\monodll_prntbase.obj : .AUTODEPEND ..\..\src\common\prntbase.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 $(OBJS)\monodll_prntdlgg.obj : .AUTODEPEND ..\..\src\generic\prntdlgg.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif $(OBJS)\monodll_process.obj : .AUTODEPEND ..\..\src\common\process.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -7445,6 +7504,15 @@ $(OBJS)\monodll_xpmdecod.obj : .AUTODEPEND ..\..\src\common\xpmdecod.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +$(OBJS)\monodll_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xtistrm.obj : .AUTODEPEND ..\..\src\common\xtistrm.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xtixml.obj : .AUTODEPEND ..\..\src\common\xtixml.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_zipstrm.obj : .AUTODEPEND ..\..\src\common\zipstrm.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -8088,6 +8156,9 @@ $(OBJS)\monolib_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.c $(OBJS)\monolib_gtk.obj : .AUTODEPEND ..\..\src\univ\themes\gtk.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_gzstream.obj : .AUTODEPEND ..\..\src\common\gzstream.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_hash.obj : .AUTODEPEND ..\..\src\common\hash.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8270,7 +8341,7 @@ $(OBJS)\monolib_list.obj : .AUTODEPEND ..\..\src\common\list.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !ifeq USE_GUI 1 -$(OBJS)\monolib_listbook.obj : .AUTODEPEND ..\..\src\generic\listbook.cpp +$(OBJS)\monolib_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif @@ -8505,8 +8576,10 @@ $(OBJS)\monolib_prntbase.obj : .AUTODEPEND ..\..\src\common\prntbase.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 $(OBJS)\monolib_prntdlgg.obj : .AUTODEPEND ..\..\src\generic\prntdlgg.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif $(OBJS)\monolib_process.obj : .AUTODEPEND ..\..\src\common\process.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -9003,6 +9076,15 @@ $(OBJS)\monolib_xpmdecod.obj : .AUTODEPEND ..\..\src\common\xpmdecod.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +$(OBJS)\monolib_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xtistrm.obj : .AUTODEPEND ..\..\src\common\xtistrm.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xtixml.obj : .AUTODEPEND ..\..\src\common\xtixml.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_zipstrm.obj : .AUTODEPEND ..\..\src\common\zipstrm.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -9456,21 +9538,27 @@ $(OBJS)\xmldll_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp $(OBJS)\xmldll_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp $(CXX) -zq -fo=$^@ $(XMLDLL_CXXFLAGS) $< +$(OBJS)\xmldll_xtixml.obj : .AUTODEPEND ..\..\src\common\xtixml.cpp + $(CXX) -zq -fo=$^@ $(XMLDLL_CXXFLAGS) $< + $(OBJS)\xmllib_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp $(CXX) -zq -fo=$^@ $(XMLLIB_CXXFLAGS) $< $(OBJS)\xmllib_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp $(CXX) -zq -fo=$^@ $(XMLLIB_CXXFLAGS) $< +$(OBJS)\xmllib_xtixml.obj : .AUTODEPEND ..\..\src\common\xtixml.cpp + $(CXX) -zq -fo=$^@ $(XMLLIB_CXXFLAGS) $< + !ifeq MONOLITHIC 0 !ifeq SHARED 1 !ifeq USE_GUI 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wat$(VENDORTAG).dll : $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wat$(VENDORTAG).dll : $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) @%create $(OBJS)\advdll.lbc @%append $(OBJS)\advdll.lbc option quiet @%append $(OBJS)\advdll.lbc name $^@ @%append $(OBJS)\advdll.lbc option caseexact - @%append $(OBJS)\advdll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) + @%append $(OBJS)\advdll.lbc $(LDFLAGS) $(__DEBUGINFO_7) libpath $(LIBDIRNAME) @for %i in ($(ADVDLL_OBJECTS)) do @%append $(OBJS)\advdll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\advdll.lbc library %i @%append $(OBJS)\advdll.lbc @@ -9494,12 +9582,12 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib !ifeq MONOLITHIC 0 !ifeq SHARED 1 -$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll : $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib +$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll : $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib @%create $(OBJS)\basedll.lbc @%append $(OBJS)\basedll.lbc option quiet @%append $(OBJS)\basedll.lbc name $^@ @%append $(OBJS)\basedll.lbc option caseexact - @%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) + @%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGINFO_7) libpath $(LIBDIRNAME) @for %i in ($(BASEDLL_OBJECTS)) do @%append $(OBJS)\basedll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\basedll.lbc library %i @%append $(OBJS)\basedll.lbc @@ -9529,46 +9617,46 @@ clean : .SYMBOLIC -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)_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll -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)_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll -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_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll -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_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_wat$(VENDORTAG).dll -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_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wat$(VENDORTAG).dll -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_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll -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_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_wat$(VENDORTAG).dll -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_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_wat$(VENDORTAG).dll -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_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll -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_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat$(VENDORTAG).dll -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 !ifeq MONOLITHIC 0 !ifeq SHARED 1 !ifeq USE_GUI 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_wat$(VENDORTAG).dll : $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_wat$(VENDORTAG).dll : $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) @%create $(OBJS)\coredll.lbc @%append $(OBJS)\coredll.lbc option quiet @%append $(OBJS)\coredll.lbc name $^@ @%append $(OBJS)\coredll.lbc option caseexact - @%append $(OBJS)\coredll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) + @%append $(OBJS)\coredll.lbc $(LDFLAGS) $(__DEBUGINFO_7) libpath $(LIBDIRNAME) @for %i in ($(COREDLL_OBJECTS)) do @%append $(OBJS)\coredll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\coredll.lbc library %i @%append $(OBJS)\coredll.lbc @@ -9594,12 +9682,12 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.li !ifeq SHARED 1 !ifeq USE_GUI 1 !ifeq USE_ODBC 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_wat$(VENDORTAG).dll : $(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) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_wat$(VENDORTAG).dll : $(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) @%create $(OBJS)\dbgriddll.lbc @%append $(OBJS)\dbgriddll.lbc option quiet @%append $(OBJS)\dbgriddll.lbc name $^@ @%append $(OBJS)\dbgriddll.lbc option caseexact - @%append $(OBJS)\dbgriddll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) + @%append $(OBJS)\dbgriddll.lbc $(LDFLAGS) $(__DEBUGINFO_7) libpath $(LIBDIRNAME) @for %i in ($(DBGRIDDLL_OBJECTS)) do @%append $(OBJS)\dbgriddll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\dbgriddll.lbc library %i @%append $(OBJS)\dbgriddll.lbc @@ -9627,12 +9715,12 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid. !ifeq SHARED 1 !ifeq USE_GUI 1 !ifeq USE_OPENGL 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat$(VENDORTAG).dll : $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat$(VENDORTAG).dll : $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) $(__coredll___depname) @%create $(OBJS)\gldll.lbc @%append $(OBJS)\gldll.lbc option quiet @%append $(OBJS)\gldll.lbc name $^@ @%append $(OBJS)\gldll.lbc option caseexact - @%append $(OBJS)\gldll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) + @%append $(OBJS)\gldll.lbc $(LDFLAGS) $(__DEBUGINFO_7) libpath $(LIBDIRNAME) @for %i in ($(GLDLL_OBJECTS)) do @%append $(OBJS)\gldll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib) do @%append $(OBJS)\gldll.lbc library %i @%append $(OBJS)\gldll.lbc @@ -9657,12 +9745,12 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib !ifeq MONOLITHIC 0 !ifeq SHARED 1 !ifeq USE_HTML 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_wat$(VENDORTAG).dll : $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_wat$(VENDORTAG).dll : $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) @%create $(OBJS)\htmldll.lbc @%append $(OBJS)\htmldll.lbc option quiet @%append $(OBJS)\htmldll.lbc name $^@ @%append $(OBJS)\htmldll.lbc option caseexact - @%append $(OBJS)\htmldll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) + @%append $(OBJS)\htmldll.lbc $(LDFLAGS) $(__DEBUGINFO_7) libpath $(LIBDIRNAME) @for %i in ($(HTMLDLL_OBJECTS)) do @%append $(OBJS)\htmldll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\htmldll.lbc library %i @%append $(OBJS)\htmldll.lbc @@ -9698,12 +9786,12 @@ $(SETUPHDIR)\wx : $(SETUPHDIR) !ifeq MONOLITHIC 1 !ifeq SHARED 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll : $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll : $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib @%create $(OBJS)\monodll.lbc @%append $(OBJS)\monodll.lbc option quiet @%append $(OBJS)\monodll.lbc name $^@ @%append $(OBJS)\monodll.lbc option caseexact - @%append $(OBJS)\monodll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) + @%append $(OBJS)\monodll.lbc $(LDFLAGS) $(__DEBUGINFO_7) libpath $(LIBDIRNAME) @for %i in ($(MONODLL_OBJECTS)) do @%append $(OBJS)\monodll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\monodll.lbc library %i @%append $(OBJS)\monodll.lbc @@ -9724,12 +9812,12 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib : !ifeq MONOLITHIC 0 !ifeq SHARED 1 -$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll : $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) +$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll : $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) @%create $(OBJS)\netdll.lbc @%append $(OBJS)\netdll.lbc option quiet @%append $(OBJS)\netdll.lbc name $^@ @%append $(OBJS)\netdll.lbc option caseexact - @%append $(OBJS)\netdll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) + @%append $(OBJS)\netdll.lbc $(LDFLAGS) $(__DEBUGINFO_7) libpath $(LIBDIRNAME) @for %i in ($(NETDLL_OBJECTS)) do @%append $(OBJS)\netdll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\netdll.lbc library %i @%append $(OBJS)\netdll.lbc @@ -9751,12 +9839,12 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib : $(NETLIB_OBJECTS !ifeq MONOLITHIC 0 !ifeq SHARED 1 !ifeq USE_ODBC 1 -$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll : $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) +$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll : $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) @%create $(OBJS)\odbcdll.lbc @%append $(OBJS)\odbcdll.lbc option quiet @%append $(OBJS)\odbcdll.lbc name $^@ @%append $(OBJS)\odbcdll.lbc option caseexact - @%append $(OBJS)\odbcdll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) + @%append $(OBJS)\odbcdll.lbc $(LDFLAGS) $(__DEBUGINFO_7) libpath $(LIBDIRNAME) @for %i in ($(ODBCDLL_OBJECTS)) do @%append $(OBJS)\odbcdll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\odbcdll.lbc library %i @%append $(OBJS)\odbcdll.lbc @@ -9826,12 +9914,12 @@ $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib : $(WXZLIB_OBJECTS) !ifeq MONOLITHIC 0 !ifeq SHARED 1 -$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll : $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) +$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll : $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) @%create $(OBJS)\xmldll.lbc @%append $(OBJS)\xmldll.lbc option quiet @%append $(OBJS)\xmldll.lbc name $^@ @%append $(OBJS)\xmldll.lbc option caseexact - @%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) + @%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGINFO_7) libpath $(LIBDIRNAME) @for %i in ($(XMLDLL_OBJECTS)) do @%append $(OBJS)\xmldll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\xmldll.lbc library %i @%append $(OBJS)\xmldll.lbc