X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53e5be64f6fd62f12399f26815ea4560f114abb6..f2ea42557b8570b18082542f043c26b9ba346d21:/build/mgl/makefile.wat diff --git a/build/mgl/makefile.wat b/build/mgl/makefile.wat index ad871bbb59..8a2574b27a 100644 --- a/build/mgl/makefile.wat +++ b/build/mgl/makefile.wat @@ -104,11 +104,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_splash.obj & $(OBJS)\monodll_tipdlg.obj & $(OBJS)\monodll_wizard.obj & - $(OBJS)\monodll_richtextctrl.obj & - $(OBJS)\monodll_richtextbuffer.obj & - $(OBJS)\monodll_richtextstyles.obj & - $(OBJS)\monodll_richtextxml.obj & - $(OBJS)\monodll_richtexthtml.obj & $(OBJS)\monodll_mediactrlcmn.obj & $(OBJS)\monodll_helpctrl.obj & $(OBJS)\monodll_helpdata.obj & @@ -191,18 +186,26 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_xmlrsall.obj & $(OBJS)\monodll_framemanager.obj & $(OBJS)\monodll_dockart.obj & - $(OBJS)\monodll_floatpane.obj + $(OBJS)\monodll_floatpane.obj & + $(OBJS)\monodll_auibook.obj & + $(OBJS)\monodll_tabmdi.obj & + $(OBJS)\monodll_richtextctrl.obj & + $(OBJS)\monodll_richtextbuffer.obj & + $(OBJS)\monodll_richtextstyles.obj & + $(OBJS)\monodll_richtextxml.obj & + $(OBJS)\monodll_richtexthtml.obj !endif ____CORE_SRC_FILENAMES_OBJECTS = !ifeq USE_GUI 1 ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_caret.obj & + $(OBJS)\monodll_colour.obj & + $(OBJS)\monodll_icon.obj & $(OBJS)\monodll_timer.obj & $(OBJS)\monodll_app.obj & $(OBJS)\monodll_bitmap.obj & $(OBJS)\monodll_brush.obj & $(OBJS)\monodll_clipbrd.obj & - $(OBJS)\monodll_colour.obj & $(OBJS)\monodll_cursor.obj & $(OBJS)\monodll_data.obj & $(OBJS)\monodll_dc.obj & @@ -214,8 +217,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_font.obj & $(OBJS)\monodll_fontenum.obj & $(OBJS)\monodll_fontutil.obj & - $(OBJS)\monodll_gdiobj.obj & - $(OBJS)\monodll_icon.obj & $(OBJS)\monodll_palette.obj & $(OBJS)\monodll_pen.obj & $(OBJS)\monodll_region.obj & @@ -412,11 +413,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_splash.obj & $(OBJS)\monolib_tipdlg.obj & $(OBJS)\monolib_wizard.obj & - $(OBJS)\monolib_richtextctrl.obj & - $(OBJS)\monolib_richtextbuffer.obj & - $(OBJS)\monolib_richtextstyles.obj & - $(OBJS)\monolib_richtextxml.obj & - $(OBJS)\monolib_richtexthtml.obj & $(OBJS)\monolib_mediactrlcmn.obj & $(OBJS)\monolib_helpctrl.obj & $(OBJS)\monolib_helpdata.obj & @@ -499,18 +495,26 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_xmlrsall.obj & $(OBJS)\monolib_framemanager.obj & $(OBJS)\monolib_dockart.obj & - $(OBJS)\monolib_floatpane.obj + $(OBJS)\monolib_floatpane.obj & + $(OBJS)\monolib_auibook.obj & + $(OBJS)\monolib_tabmdi.obj & + $(OBJS)\monolib_richtextctrl.obj & + $(OBJS)\monolib_richtextbuffer.obj & + $(OBJS)\monolib_richtextstyles.obj & + $(OBJS)\monolib_richtextxml.obj & + $(OBJS)\monolib_richtexthtml.obj !endif ____CORE_SRC_FILENAMES_1_OBJECTS = !ifeq USE_GUI 1 ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_caret.obj & + $(OBJS)\monolib_colour.obj & + $(OBJS)\monolib_icon.obj & $(OBJS)\monolib_timer.obj & $(OBJS)\monolib_app.obj & $(OBJS)\monolib_bitmap.obj & $(OBJS)\monolib_brush.obj & $(OBJS)\monolib_clipbrd.obj & - $(OBJS)\monolib_colour.obj & $(OBJS)\monolib_cursor.obj & $(OBJS)\monolib_data.obj & $(OBJS)\monolib_dc.obj & @@ -522,8 +526,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_font.obj & $(OBJS)\monolib_fontenum.obj & $(OBJS)\monolib_fontutil.obj & - $(OBJS)\monolib_gdiobj.obj & - $(OBJS)\monolib_icon.obj & $(OBJS)\monolib_palette.obj & $(OBJS)\monolib_pen.obj & $(OBJS)\monolib_region.obj & @@ -734,12 +736,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = !ifeq USE_GUI 1 ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_caret.obj & + $(OBJS)\coredll_colour.obj & + $(OBJS)\coredll_icon.obj & $(OBJS)\coredll_timer.obj & $(OBJS)\coredll_app.obj & $(OBJS)\coredll_bitmap.obj & $(OBJS)\coredll_brush.obj & $(OBJS)\coredll_clipbrd.obj & - $(OBJS)\coredll_colour.obj & $(OBJS)\coredll_cursor.obj & $(OBJS)\coredll_data.obj & $(OBJS)\coredll_dc.obj & @@ -751,8 +754,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_font.obj & $(OBJS)\coredll_fontenum.obj & $(OBJS)\coredll_fontutil.obj & - $(OBJS)\coredll_gdiobj.obj & - $(OBJS)\coredll_icon.obj & $(OBJS)\coredll_palette.obj & $(OBJS)\coredll_pen.obj & $(OBJS)\coredll_region.obj & @@ -935,12 +936,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = !ifeq USE_GUI 1 ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_caret.obj & + $(OBJS)\corelib_colour.obj & + $(OBJS)\corelib_icon.obj & $(OBJS)\corelib_timer.obj & $(OBJS)\corelib_app.obj & $(OBJS)\corelib_bitmap.obj & $(OBJS)\corelib_brush.obj & $(OBJS)\corelib_clipbrd.obj & - $(OBJS)\corelib_colour.obj & $(OBJS)\corelib_cursor.obj & $(OBJS)\corelib_data.obj & $(OBJS)\corelib_dc.obj & @@ -952,8 +954,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_font.obj & $(OBJS)\corelib_fontenum.obj & $(OBJS)\corelib_fontutil.obj & - $(OBJS)\corelib_gdiobj.obj & - $(OBJS)\corelib_icon.obj & $(OBJS)\corelib_palette.obj & $(OBJS)\corelib_pen.obj & $(OBJS)\corelib_region.obj & @@ -1297,6 +1297,24 @@ __auilib___depname = & !endif !endif !endif +__richtextdll___depname = +!ifeq MONOLITHIC 0 +!ifeq SHARED 1 +!ifeq USE_RICHTEXT 1 +__richtextdll___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.dll +!endif +!endif +!endif +__richtextlib___depname = +!ifeq MONOLITHIC 0 +!ifeq SHARED 0 +!ifeq USE_RICHTEXT 1 +__richtextlib___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib +!endif +!endif +!endif __gldll___depname = !ifeq SHARED 1 !ifeq USE_GUI 1 @@ -1457,7 +1475,8 @@ MAKEARGS = DOS32="$(DOS32)" CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" & DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" & MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" & USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" & - USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" & + USE_RICHTEXT="$(USE_RICHTEXT)" USE_OPENGL="$(USE_OPENGL)" & + USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" & USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" & OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" & WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" & @@ -1467,8 +1486,8 @@ OBJS = wat_$(PORTNAME)univ$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) LIBDIRNAME = ..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = $(LIBDIRNAME)\$(PORTNAME)univ$(WXUNICODEFLAG)$(WXDEBUGFLAG) WXREGEX_CFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) & - -i=..\..\include -i=$(SETUPHDIR) -d__WXMGL__ $(__UNICODE_DEFINE_p) & - $(CPPFLAGS) $(CFLAGS) + -i=..\..\include -i=$(SETUPHDIR) -d__WXMGL__ -d__WXUNIVERSAL__ & + $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS) WXREGEX_OBJECTS = & $(OBJS)\wxregex_regcomp.obj & $(OBJS)\wxregex_regexec.obj & @@ -1655,6 +1674,7 @@ MONODLL_OBJECTS = & $(OBJS)\monodll_module.obj & $(OBJS)\monodll_mstream.obj & $(OBJS)\monodll_object.obj & + $(OBJS)\monodll_platinfo.obj & $(OBJS)\monodll_powercmn.obj & $(OBJS)\monodll_process.obj & $(OBJS)\monodll_regex.obj & @@ -1749,6 +1769,7 @@ MONOLIB_OBJECTS = & $(OBJS)\monolib_module.obj & $(OBJS)\monolib_mstream.obj & $(OBJS)\monolib_object.obj & + $(OBJS)\monolib_platinfo.obj & $(OBJS)\monolib_powercmn.obj & $(OBJS)\monolib_process.obj & $(OBJS)\monolib_regex.obj & @@ -1843,6 +1864,7 @@ BASEDLL_OBJECTS = & $(OBJS)\basedll_module.obj & $(OBJS)\basedll_mstream.obj & $(OBJS)\basedll_object.obj & + $(OBJS)\basedll_platinfo.obj & $(OBJS)\basedll_powercmn.obj & $(OBJS)\basedll_process.obj & $(OBJS)\basedll_regex.obj & @@ -1924,6 +1946,7 @@ BASELIB_OBJECTS = & $(OBJS)\baselib_module.obj & $(OBJS)\baselib_mstream.obj & $(OBJS)\baselib_object.obj & + $(OBJS)\baselib_platinfo.obj & $(OBJS)\baselib_powercmn.obj & $(OBJS)\baselib_process.obj & $(OBJS)\baselib_regex.obj & @@ -2048,12 +2071,7 @@ ADVDLL_OBJECTS = & $(OBJS)\advdll_sashwin.obj & $(OBJS)\advdll_splash.obj & $(OBJS)\advdll_tipdlg.obj & - $(OBJS)\advdll_wizard.obj & - $(OBJS)\advdll_richtextctrl.obj & - $(OBJS)\advdll_richtextbuffer.obj & - $(OBJS)\advdll_richtextstyles.obj & - $(OBJS)\advdll_richtextxml.obj & - $(OBJS)\advdll_richtexthtml.obj + $(OBJS)\advdll_wizard.obj ADVLIB_CXXFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) & -d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) & @@ -2079,12 +2097,7 @@ ADVLIB_OBJECTS = & $(OBJS)\advlib_sashwin.obj & $(OBJS)\advlib_splash.obj & $(OBJS)\advlib_tipdlg.obj & - $(OBJS)\advlib_wizard.obj & - $(OBJS)\advlib_richtextctrl.obj & - $(OBJS)\advlib_richtextbuffer.obj & - $(OBJS)\advlib_richtextstyles.obj & - $(OBJS)\advlib_richtextxml.obj & - $(OBJS)\advlib_richtexthtml.obj + $(OBJS)\advlib_wizard.obj MEDIADLL_CXXFLAGS = $(____DOS_CFLAG_p) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) & -d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) & @@ -2401,7 +2414,9 @@ AUIDLL_OBJECTS = & $(OBJS)\auidll_dummy.obj & $(OBJS)\auidll_framemanager.obj & $(OBJS)\auidll_dockart.obj & - $(OBJS)\auidll_floatpane.obj + $(OBJS)\auidll_floatpane.obj & + $(OBJS)\auidll_auibook.obj & + $(OBJS)\auidll_tabmdi.obj AUILIB_CXXFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) & -d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) & @@ -2414,7 +2429,39 @@ AUILIB_OBJECTS = & $(OBJS)\auilib_dummy.obj & $(OBJS)\auilib_framemanager.obj & $(OBJS)\auilib_dockart.obj & - $(OBJS)\auilib_floatpane.obj + $(OBJS)\auilib_floatpane.obj & + $(OBJS)\auilib_auibook.obj & + $(OBJS)\auilib_tabmdi.obj +RICHTEXTDLL_CXXFLAGS = $(____DOS_CFLAG_p) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) & + -d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & + $(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) & + -i=..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & + -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png & + -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL & + -dWXMAKINGDLL_RICHTEXT /fh=$(OBJS)\wxprec_richtextdll.pch $(__RTTIFLAG) & + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) +RICHTEXTDLL_OBJECTS = & + $(OBJS)\richtextdll_dummy.obj & + $(OBJS)\richtextdll_richtextctrl.obj & + $(OBJS)\richtextdll_richtextbuffer.obj & + $(OBJS)\richtextdll_richtextstyles.obj & + $(OBJS)\richtextdll_richtextxml.obj & + $(OBJS)\richtextdll_richtexthtml.obj +RICHTEXTLIB_CXXFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) & + -d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & + $(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) & + -i=..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & + -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg -i=..\..\src\png & + -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib & + /fh=$(OBJS)\wxprec_richtextlib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & + $(CPPFLAGS) $(CXXFLAGS) +RICHTEXTLIB_OBJECTS = & + $(OBJS)\richtextlib_dummy.obj & + $(OBJS)\richtextlib_richtextctrl.obj & + $(OBJS)\richtextlib_richtextbuffer.obj & + $(OBJS)\richtextlib_richtextstyles.obj & + $(OBJS)\richtextlib_richtextxml.obj & + $(OBJS)\richtextlib_richtexthtml.obj GLDLL_CXXFLAGS = $(____DOS_CFLAG_p) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) & -d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) & @@ -2444,7 +2491,7 @@ $(OBJS) : ### Targets: ### -all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file +all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file clean : .SYMBOLIC -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -2497,6 +2544,9 @@ clean : .SYMBOLIC -del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.dll -del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib -del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib + -del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.dll + -del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib + -del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib -del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.dll -del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib -del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib @@ -2653,14 +2703,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG) !ifeq MONOLITHIC 0 !ifeq SHARED 1 !ifeq USE_GUI 1 -$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.dll : $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__htmldll___depname) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.dll : $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(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_3) libpath $(LIBDIRNAME) libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10 libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10\$(__MGLPMLIBPATH_FILENAMES) @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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) mgl.lib mglcpp.lib pm.lib $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\advdll.lbc library %i + @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) mgl.lib mglcpp.lib pm.lib $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\advdll.lbc library %i @%append $(OBJS)\advdll.lbc @%append $(OBJS)\advdll.lbc system wlink @$(OBJS)\advdll.lbc @@ -2932,6 +2982,36 @@ $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG) !endif !endif +!ifeq MONOLITHIC 0 +!ifeq SHARED 1 +!ifeq USE_RICHTEXT 1 +$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.dll : $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__htmldll___depname) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname) + @%create $(OBJS)\richtextdll.lbc + @%append $(OBJS)\richtextdll.lbc option quiet + @%append $(OBJS)\richtextdll.lbc name $^@ + @%append $(OBJS)\richtextdll.lbc option caseexact + @%append $(OBJS)\richtextdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10 libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10\$(__MGLPMLIBPATH_FILENAMES) + @for %i in ($(RICHTEXTDLL_OBJECTS)) do @%append $(OBJS)\richtextdll.lbc file %i + @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) mgl.lib mglcpp.lib pm.lib $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\richtextdll.lbc library %i + @%append $(OBJS)\richtextdll.lbc + @%append $(OBJS)\richtextdll.lbc system + wlink @$(OBJS)\richtextdll.lbc + wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib +$^@ +!endif +!endif +!endif + +!ifeq MONOLITHIC 0 +!ifeq SHARED 0 +!ifeq USE_RICHTEXT 1 +$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib : $(RICHTEXTLIB_OBJECTS) + @%create $(OBJS)\richtextlib.lbc + @for %i in ($(RICHTEXTLIB_OBJECTS)) do @%append $(OBJS)\richtextlib.lbc +%i + wlib -q -p4096 -n -b $^@ @$(OBJS)\richtextlib.lbc +!endif +!endif +!endif + !ifeq SHARED 1 !ifeq USE_GUI 1 !ifeq USE_OPENGL 1 @@ -3473,6 +3553,9 @@ $(OBJS)\monodll_mstream.obj : .AUTODEPEND ..\..\src\common\mstream.cpp $(OBJS)\monodll_object.obj : .AUTODEPEND ..\..\src\common\object.cpp $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_platinfo.obj : .AUTODEPEND ..\..\src\common\platinfo.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_powercmn.obj : .AUTODEPEND ..\..\src\common\powercmn.cpp $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -3593,6 +3676,12 @@ $(OBJS)\monodll_url.obj : .AUTODEPEND ..\..\src\common\url.cpp $(OBJS)\monodll_caret.obj : .AUTODEPEND ..\..\src\generic\caret.cpp $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_colour.obj : .AUTODEPEND ..\..\src\generic\colour.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_icon.obj : .AUTODEPEND ..\..\src\generic\icon.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_timer.obj : .AUTODEPEND ..\..\src\generic\timer.cpp $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -3608,9 +3697,6 @@ $(OBJS)\monodll_brush.obj : .AUTODEPEND ..\..\src\mgl\brush.cpp $(OBJS)\monodll_clipbrd.obj : .AUTODEPEND ..\..\src\mgl\clipbrd.cpp $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_colour.obj : .AUTODEPEND ..\..\src\mgl\colour.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_cursor.obj : .AUTODEPEND ..\..\src\mgl\cursor.cpp $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -3644,12 +3730,6 @@ $(OBJS)\monodll_fontenum.obj : .AUTODEPEND ..\..\src\mgl\fontenum.cpp $(OBJS)\monodll_fontutil.obj : .AUTODEPEND ..\..\src\mgl\fontutil.cpp $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_gdiobj.obj : .AUTODEPEND ..\..\src\mgl\gdiobj.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_icon.obj : .AUTODEPEND ..\..\src\mgl\icon.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_palette.obj : .AUTODEPEND ..\..\src\mgl\palette.cpp $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -4202,21 +4282,6 @@ $(OBJS)\monodll_tipdlg.obj : .AUTODEPEND ..\..\src\generic\tipdlg.cpp $(OBJS)\monodll_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_mediactrlcmn.obj : .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -4466,6 +4531,27 @@ $(OBJS)\monodll_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp $(OBJS)\monodll_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_auibook.obj : .AUTODEPEND ..\..\src\aui\auibook.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -4580,6 +4666,9 @@ $(OBJS)\monolib_mstream.obj : .AUTODEPEND ..\..\src\common\mstream.cpp $(OBJS)\monolib_object.obj : .AUTODEPEND ..\..\src\common\object.cpp $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_platinfo.obj : .AUTODEPEND ..\..\src\common\platinfo.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_powercmn.obj : .AUTODEPEND ..\..\src\common\powercmn.cpp $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -4700,6 +4789,12 @@ $(OBJS)\monolib_url.obj : .AUTODEPEND ..\..\src\common\url.cpp $(OBJS)\monolib_caret.obj : .AUTODEPEND ..\..\src\generic\caret.cpp $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_colour.obj : .AUTODEPEND ..\..\src\generic\colour.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_icon.obj : .AUTODEPEND ..\..\src\generic\icon.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_timer.obj : .AUTODEPEND ..\..\src\generic\timer.cpp $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -4715,9 +4810,6 @@ $(OBJS)\monolib_brush.obj : .AUTODEPEND ..\..\src\mgl\brush.cpp $(OBJS)\monolib_clipbrd.obj : .AUTODEPEND ..\..\src\mgl\clipbrd.cpp $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_colour.obj : .AUTODEPEND ..\..\src\mgl\colour.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_cursor.obj : .AUTODEPEND ..\..\src\mgl\cursor.cpp $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -4751,12 +4843,6 @@ $(OBJS)\monolib_fontenum.obj : .AUTODEPEND ..\..\src\mgl\fontenum.cpp $(OBJS)\monolib_fontutil.obj : .AUTODEPEND ..\..\src\mgl\fontutil.cpp $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_gdiobj.obj : .AUTODEPEND ..\..\src\mgl\gdiobj.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_icon.obj : .AUTODEPEND ..\..\src\mgl\icon.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_palette.obj : .AUTODEPEND ..\..\src\mgl\palette.cpp $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -5309,21 +5395,6 @@ $(OBJS)\monolib_tipdlg.obj : .AUTODEPEND ..\..\src\generic\tipdlg.cpp $(OBJS)\monolib_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_mediactrlcmn.obj : .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -5573,6 +5644,27 @@ $(OBJS)\monolib_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp $(OBJS)\monolib_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_auibook.obj : .AUTODEPEND ..\..\src\aui\auibook.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -5687,6 +5779,9 @@ $(OBJS)\basedll_mstream.obj : .AUTODEPEND ..\..\src\common\mstream.cpp $(OBJS)\basedll_object.obj : .AUTODEPEND ..\..\src\common\object.cpp $(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_platinfo.obj : .AUTODEPEND ..\..\src\common\platinfo.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_powercmn.obj : .AUTODEPEND ..\..\src\common\powercmn.cpp $(CXX) -bt=dos -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< @@ -5882,6 +5977,9 @@ $(OBJS)\baselib_mstream.obj : .AUTODEPEND ..\..\src\common\mstream.cpp $(OBJS)\baselib_object.obj : .AUTODEPEND ..\..\src\common\object.cpp $(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_platinfo.obj : .AUTODEPEND ..\..\src\common\platinfo.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_powercmn.obj : .AUTODEPEND ..\..\src\common\powercmn.cpp $(CXX) -bt=dos -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< @@ -6053,6 +6151,12 @@ $(OBJS)\coredll_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp $(OBJS)\coredll_caret.obj : .AUTODEPEND ..\..\src\generic\caret.cpp $(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_colour.obj : .AUTODEPEND ..\..\src\generic\colour.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + +$(OBJS)\coredll_icon.obj : .AUTODEPEND ..\..\src\generic\icon.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_timer.obj : .AUTODEPEND ..\..\src\generic\timer.cpp $(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -6068,9 +6172,6 @@ $(OBJS)\coredll_brush.obj : .AUTODEPEND ..\..\src\mgl\brush.cpp $(OBJS)\coredll_clipbrd.obj : .AUTODEPEND ..\..\src\mgl\clipbrd.cpp $(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_colour.obj : .AUTODEPEND ..\..\src\mgl\colour.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - $(OBJS)\coredll_cursor.obj : .AUTODEPEND ..\..\src\mgl\cursor.cpp $(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -6104,12 +6205,6 @@ $(OBJS)\coredll_fontenum.obj : .AUTODEPEND ..\..\src\mgl\fontenum.cpp $(OBJS)\coredll_fontutil.obj : .AUTODEPEND ..\..\src\mgl\fontutil.cpp $(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_gdiobj.obj : .AUTODEPEND ..\..\src\mgl\gdiobj.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_icon.obj : .AUTODEPEND ..\..\src\mgl\icon.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - $(OBJS)\coredll_palette.obj : .AUTODEPEND ..\..\src\mgl\palette.cpp $(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -6632,6 +6727,12 @@ $(OBJS)\corelib_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp $(OBJS)\corelib_caret.obj : .AUTODEPEND ..\..\src\generic\caret.cpp $(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_colour.obj : .AUTODEPEND ..\..\src\generic\colour.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + +$(OBJS)\corelib_icon.obj : .AUTODEPEND ..\..\src\generic\icon.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_timer.obj : .AUTODEPEND ..\..\src\generic\timer.cpp $(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -6647,9 +6748,6 @@ $(OBJS)\corelib_brush.obj : .AUTODEPEND ..\..\src\mgl\brush.cpp $(OBJS)\corelib_clipbrd.obj : .AUTODEPEND ..\..\src\mgl\clipbrd.cpp $(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_colour.obj : .AUTODEPEND ..\..\src\mgl\colour.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - $(OBJS)\corelib_cursor.obj : .AUTODEPEND ..\..\src\mgl\cursor.cpp $(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -6683,12 +6781,6 @@ $(OBJS)\corelib_fontenum.obj : .AUTODEPEND ..\..\src\mgl\fontenum.cpp $(OBJS)\corelib_fontutil.obj : .AUTODEPEND ..\..\src\mgl\fontutil.cpp $(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_gdiobj.obj : .AUTODEPEND ..\..\src\mgl\gdiobj.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_icon.obj : .AUTODEPEND ..\..\src\mgl\icon.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - $(OBJS)\corelib_palette.obj : .AUTODEPEND ..\..\src\mgl\palette.cpp $(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -7244,21 +7336,6 @@ $(OBJS)\advdll_tipdlg.obj : .AUTODEPEND ..\..\src\generic\tipdlg.cpp $(OBJS)\advdll_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp $(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< -$(OBJS)\advdll_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - $(OBJS)\advlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< @@ -7310,21 +7387,6 @@ $(OBJS)\advlib_tipdlg.obj : .AUTODEPEND ..\..\src\generic\tipdlg.cpp $(OBJS)\advlib_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp $(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< -$(OBJS)\advlib_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp - $(CXX) -bt=dos -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - $(OBJS)\mediadll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=dos -zq -fo=$^@ $(MEDIADLL_CXXFLAGS) $< @@ -7871,6 +7933,12 @@ $(OBJS)\auidll_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp $(OBJS)\auidll_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp $(CXX) -bt=dos -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $< +$(OBJS)\auidll_auibook.obj : .AUTODEPEND ..\..\src\aui\auibook.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $< + +$(OBJS)\auidll_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $< + $(OBJS)\auilib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=dos -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< @@ -7883,6 +7951,48 @@ $(OBJS)\auilib_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp $(OBJS)\auilib_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp $(CXX) -bt=dos -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< +$(OBJS)\auilib_auibook.obj : .AUTODEPEND ..\..\src\aui\auibook.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< + +$(OBJS)\auilib_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< + +$(OBJS)\richtextdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< + +$(OBJS)\richtextdll_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< + +$(OBJS)\richtextdll_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< + +$(OBJS)\richtextdll_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< + +$(OBJS)\richtextdll_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< + +$(OBJS)\richtextdll_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< + +$(OBJS)\richtextlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< + +$(OBJS)\richtextlib_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< + +$(OBJS)\richtextlib_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< + +$(OBJS)\richtextlib_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< + +$(OBJS)\richtextlib_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< + +$(OBJS)\richtextlib_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp + $(CXX) -bt=dos -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< + $(OBJS)\gldll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=dos -zq -fo=$^@ $(GLDLL_CXXFLAGS) $<