From: Włodzimierz Skiba Date: Mon, 3 Jul 2006 15:12:36 +0000 (+0000) Subject: Rich text lib separation. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2cb77cb18915185cdf41a94dd8462cfcad81e831 Rich text lib separation. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/build/os2/config.wat b/build/os2/config.wat index 68514b52e1..5013678b10 100644 --- a/build/os2/config.wat +++ b/build/os2/config.wat @@ -77,6 +77,9 @@ USE_XRC = 1 # Build wxAUI library (USE_GUI must be 1)? [0,1] USE_AUI = 1 +# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1] +USE_RICHTEXT = 1 + # Build OpenGL canvas library (USE_GUI must be 1)? [0,1] USE_OPENGL = 0 diff --git a/build/os2/makefile.wat b/build/os2/makefile.wat index 0ede091176..ca33823524 100644 --- a/build/os2/makefile.wat +++ b/build/os2/makefile.wat @@ -175,7 +175,12 @@ ____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_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 @@ -559,11 +564,6 @@ ____ADVANCED_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_joystick.obj & $(OBJS)\monodll_sound.obj !endif @@ -585,11 +585,6 @@ ____ADVANCED_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_joystick.obj & $(OBJS)\monodll_sound.obj !endif @@ -687,7 +682,12 @@ ____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_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 @@ -1071,11 +1071,6 @@ ____ADVANCED_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_joystick.obj & $(OBJS)\monolib_sound.obj !endif @@ -1097,11 +1092,6 @@ ____ADVANCED_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_joystick.obj & $(OBJS)\monolib_sound.obj !endif @@ -1905,11 +1895,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = & $(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_joystick.obj & $(OBJS)\advdll_sound.obj !endif @@ -1931,11 +1916,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = & $(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_joystick.obj & $(OBJS)\advdll_sound.obj !endif @@ -1967,11 +1947,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = & $(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_joystick.obj & $(OBJS)\advlib_sound.obj !endif @@ -1993,11 +1968,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = & $(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_joystick.obj & $(OBJS)\advlib_sound.obj !endif @@ -2157,6 +2127,24 @@ __auilib___depname = & !endif !endif !endif +__richtextdll___depname = +!ifeq MONOLITHIC 0 +!ifeq SHARED 1 +!ifeq USE_RICHTEXT 1 +__richtextdll___depname = & + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(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)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib +!endif +!endif +!endif __gldll___depname = !ifeq SHARED 1 !ifeq USE_GUI 1 @@ -2316,7 +2304,8 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & 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)" & USE_THREADS="$(USE_THREADS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" & VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" & @@ -3254,6 +3243,36 @@ AUILIB_OBJECTS = & $(OBJS)\auilib_framemanager.obj & $(OBJS)\auilib_dockart.obj & $(OBJS)\auilib_floatpane.obj +RICHTEXTDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 & + -wcd=657 -wcd=667 -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 = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & + $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 & + -wcd=657 -wcd=667 -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 = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & @@ -3285,7 +3304,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 @@ -3338,6 +3357,9 @@ clean : .SYMBOLIC -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.dll -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.dll + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib + -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.dll -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib @@ -3773,6 +3795,36 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !endif !endif +!ifeq MONOLITHIC 0 +!ifeq SHARED 1 +!ifeq USE_RICHTEXT 1 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(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) $(__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) + @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) upm32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(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 os2v2 dll + wlink @$(OBJS)\richtextdll.lbc + wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(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)$(WXUNIVNAME)$(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 @@ -4884,6 +4936,21 @@ $(OBJS)\monodll_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp $(OBJS)\monodll_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -5924,31 +5991,6 @@ $(OBJS)\monodll_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monodll_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monodll_joystick.obj : .AUTODEPEND ..\..\src\os2\joystick.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6637,6 +6679,21 @@ $(OBJS)\monolib_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp $(OBJS)\monolib_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -7677,31 +7734,6 @@ $(OBJS)\monolib_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monolib_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monolib_joystick.obj : .AUTODEPEND ..\..\src\os2\joystick.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -10565,21 +10597,6 @@ $(OBJS)\advdll_tipdlg.obj : .AUTODEPEND ..\..\src\generic\tipdlg.cpp $(OBJS)\advdll_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< -$(OBJS)\advdll_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - $(OBJS)\advdll_joystick.obj : .AUTODEPEND ..\..\src\os2\joystick.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< @@ -10637,21 +10654,6 @@ $(OBJS)\advlib_tipdlg.obj : .AUTODEPEND ..\..\src\generic\tipdlg.cpp $(OBJS)\advlib_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< -$(OBJS)\advlib_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp - $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - $(OBJS)\advlib_joystick.obj : .AUTODEPEND ..\..\src\os2\joystick.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< @@ -11216,6 +11218,42 @@ $(OBJS)\auilib_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp $(OBJS)\auilib_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< +$(OBJS)\richtextdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< + +$(OBJS)\richtextdll_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< + +$(OBJS)\richtextdll_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< + +$(OBJS)\richtextdll_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< + +$(OBJS)\richtextdll_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< + +$(OBJS)\richtextdll_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< + +$(OBJS)\richtextlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< + +$(OBJS)\richtextlib_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< + +$(OBJS)\richtextlib_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< + +$(OBJS)\richtextlib_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< + +$(OBJS)\richtextlib_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< + +$(OBJS)\richtextlib_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp + $(CXX) -bt=os2 -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< + $(OBJS)\gldll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=os2 -zq -fo=$^@ $(GLDLL_CXXFLAGS) $<