X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/98d689e4030141723e076ea01a083407d78dbde5..76e7cfab8fdb0c7862fd07e427af54181717fc62:/build/msw/makefile.gcc diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 444ca42623..e3581f1e7e 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -15,7 +15,8 @@ include config.gcc MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ - LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \ + LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \ + TOOLKIT_VERSION="$(TOOLKIT_VERSION)" WXUNIV="$(WXUNIV)" \ UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \ DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \ MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ @@ -31,11 +32,12 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5 COMPILER_PREFIX = gcc OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = ..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) + $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = \ + ..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) WXREGEX_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ @@ -149,8 +151,11 @@ WXTIFF_OBJECTS = \ $(OBJS)\wxtiff_tif_fax3sm.o \ $(OBJS)\wxtiff_tif_flush.o \ $(OBJS)\wxtiff_tif_getimage.o \ + $(OBJS)\wxtiff_tif_jbig.o \ $(OBJS)\wxtiff_tif_jpeg.o \ + $(OBJS)\wxtiff_tif_jpeg_12.o \ $(OBJS)\wxtiff_tif_luv.o \ + $(OBJS)\wxtiff_tif_lzma.o \ $(OBJS)\wxtiff_tif_lzw.o \ $(OBJS)\wxtiff_tif_next.o \ $(OBJS)\wxtiff_tif_ojpeg.o \ @@ -177,115 +182,130 @@ WXEXPAT_OBJECTS = \ $(OBJS)\wxexpat_xmltok.o WXSCINTILLA_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ $(GCCFLAGS) -DHAVE_W32API_H -DNDEBUG -I..\..\src\stc\scintilla\include \ - -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ - -I$(SETUPHDIR) -I..\..\include $(__wxscintilla_usingdll_p) -D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) + -I..\..\src\stc\scintilla\lexlib -I..\..\src\stc\scintilla\src -D__WX__ \ + -DSCI_LEXER -DLINK_LEXERS -I$(SETUPHDIR) -I..\..\include \ + $(__wxscintilla_usingdll_p) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + $(CPPFLAGS) $(CXXFLAGS) WXSCINTILLA_OBJECTS = \ - $(OBJS)\wxscintilla_AutoComplete.o \ - $(OBJS)\wxscintilla_CallTip.o \ - $(OBJS)\wxscintilla_CellBuffer.o \ - $(OBJS)\wxscintilla_CharClassify.o \ - $(OBJS)\wxscintilla_ContractionState.o \ - $(OBJS)\wxscintilla_Decoration.o \ - $(OBJS)\wxscintilla_Document.o \ - $(OBJS)\wxscintilla_DocumentAccessor.o \ - $(OBJS)\wxscintilla_Editor.o \ - $(OBJS)\wxscintilla_ExternalLexer.o \ - $(OBJS)\wxscintilla_Indicator.o \ - $(OBJS)\wxscintilla_KeyMap.o \ - $(OBJS)\wxscintilla_KeyWords.o \ - $(OBJS)\wxscintilla_LexAPDL.o \ - $(OBJS)\wxscintilla_LexASY.o \ - $(OBJS)\wxscintilla_LexAU3.o \ - $(OBJS)\wxscintilla_LexAVE.o \ + $(OBJS)\wxscintilla_LexA68k.o \ $(OBJS)\wxscintilla_LexAbaqus.o \ $(OBJS)\wxscintilla_LexAda.o \ + $(OBJS)\wxscintilla_LexAPDL.o \ $(OBJS)\wxscintilla_LexAsm.o \ $(OBJS)\wxscintilla_LexAsn1.o \ + $(OBJS)\wxscintilla_LexASY.o \ + $(OBJS)\wxscintilla_LexAU3.o \ + $(OBJS)\wxscintilla_LexAVE.o \ + $(OBJS)\wxscintilla_LexAVS.o \ $(OBJS)\wxscintilla_LexBaan.o \ $(OBJS)\wxscintilla_LexBash.o \ $(OBJS)\wxscintilla_LexBasic.o \ $(OBJS)\wxscintilla_LexBullant.o \ - $(OBJS)\wxscintilla_LexCLW.o \ - $(OBJS)\wxscintilla_LexCOBOL.o \ - $(OBJS)\wxscintilla_LexCPP.o \ - $(OBJS)\wxscintilla_LexCSS.o \ $(OBJS)\wxscintilla_LexCaml.o \ + $(OBJS)\wxscintilla_LexCLW.o \ $(OBJS)\wxscintilla_LexCmake.o \ + $(OBJS)\wxscintilla_LexCOBOL.o \ + $(OBJS)\wxscintilla_LexCoffeeScript.o \ $(OBJS)\wxscintilla_LexConf.o \ + $(OBJS)\wxscintilla_LexCPP.o \ $(OBJS)\wxscintilla_LexCrontab.o \ $(OBJS)\wxscintilla_LexCsound.o \ + $(OBJS)\wxscintilla_LexCSS.o \ $(OBJS)\wxscintilla_LexD.o \ - $(OBJS)\wxscintilla_LexEScript.o \ + $(OBJS)\wxscintilla_LexECL.o \ $(OBJS)\wxscintilla_LexEiffel.o \ $(OBJS)\wxscintilla_LexErlang.o \ + $(OBJS)\wxscintilla_LexEScript.o \ $(OBJS)\wxscintilla_LexFlagship.o \ $(OBJS)\wxscintilla_LexForth.o \ $(OBJS)\wxscintilla_LexFortran.o \ $(OBJS)\wxscintilla_LexGAP.o \ $(OBJS)\wxscintilla_LexGui4Cli.o \ - $(OBJS)\wxscintilla_LexHTML.o \ $(OBJS)\wxscintilla_LexHaskell.o \ + $(OBJS)\wxscintilla_LexHTML.o \ $(OBJS)\wxscintilla_LexInno.o \ $(OBJS)\wxscintilla_LexKix.o \ $(OBJS)\wxscintilla_LexLisp.o \ $(OBJS)\wxscintilla_LexLout.o \ $(OBJS)\wxscintilla_LexLua.o \ - $(OBJS)\wxscintilla_LexMMIXAL.o \ - $(OBJS)\wxscintilla_LexMPT.o \ - $(OBJS)\wxscintilla_LexMSSQL.o \ $(OBJS)\wxscintilla_LexMagik.o \ $(OBJS)\wxscintilla_LexMarkdown.o \ $(OBJS)\wxscintilla_LexMatlab.o \ $(OBJS)\wxscintilla_LexMetapost.o \ + $(OBJS)\wxscintilla_LexMMIXAL.o \ + $(OBJS)\wxscintilla_LexModula.o \ + $(OBJS)\wxscintilla_LexMPT.o \ + $(OBJS)\wxscintilla_LexMSSQL.o \ $(OBJS)\wxscintilla_LexMySQL.o \ $(OBJS)\wxscintilla_LexNimrod.o \ $(OBJS)\wxscintilla_LexNsis.o \ $(OBJS)\wxscintilla_LexOpal.o \ + $(OBJS)\wxscintilla_LexOScript.o \ $(OBJS)\wxscintilla_LexOthers.o \ + $(OBJS)\wxscintilla_LexPascal.o \ $(OBJS)\wxscintilla_LexPB.o \ + $(OBJS)\wxscintilla_LexPerl.o \ $(OBJS)\wxscintilla_LexPLM.o \ $(OBJS)\wxscintilla_LexPOV.o \ - $(OBJS)\wxscintilla_LexPS.o \ - $(OBJS)\wxscintilla_LexPascal.o \ - $(OBJS)\wxscintilla_LexPerl.o \ $(OBJS)\wxscintilla_LexPowerPro.o \ $(OBJS)\wxscintilla_LexPowerShell.o \ $(OBJS)\wxscintilla_LexProgress.o \ + $(OBJS)\wxscintilla_LexPS.o \ $(OBJS)\wxscintilla_LexPython.o \ $(OBJS)\wxscintilla_LexR.o \ $(OBJS)\wxscintilla_LexRebol.o \ $(OBJS)\wxscintilla_LexRuby.o \ - $(OBJS)\wxscintilla_LexSML.o \ - $(OBJS)\wxscintilla_LexSQL.o \ $(OBJS)\wxscintilla_LexScriptol.o \ $(OBJS)\wxscintilla_LexSmalltalk.o \ + $(OBJS)\wxscintilla_LexSML.o \ $(OBJS)\wxscintilla_LexSorcus.o \ $(OBJS)\wxscintilla_LexSpecman.o \ $(OBJS)\wxscintilla_LexSpice.o \ + $(OBJS)\wxscintilla_LexSQL.o \ $(OBJS)\wxscintilla_LexTACL.o \ $(OBJS)\wxscintilla_LexTADS3.o \ $(OBJS)\wxscintilla_LexTAL.o \ $(OBJS)\wxscintilla_LexTCL.o \ + $(OBJS)\wxscintilla_LexTCMD.o \ $(OBJS)\wxscintilla_LexTeX.o \ + $(OBJS)\wxscintilla_LexTxt2tags.o \ $(OBJS)\wxscintilla_LexVB.o \ - $(OBJS)\wxscintilla_LexVHDL.o \ $(OBJS)\wxscintilla_LexVerilog.o \ + $(OBJS)\wxscintilla_LexVHDL.o \ + $(OBJS)\wxscintilla_LexVisualProlog.o \ $(OBJS)\wxscintilla_LexYAML.o \ + $(OBJS)\wxscintilla_Accessor.o \ + $(OBJS)\wxscintilla_CharacterSet.o \ + $(OBJS)\wxscintilla_LexerBase.o \ + $(OBJS)\wxscintilla_LexerModule.o \ + $(OBJS)\wxscintilla_LexerNoExceptions.o \ + $(OBJS)\wxscintilla_LexerSimple.o \ + $(OBJS)\wxscintilla_PropSetSimple.o \ + $(OBJS)\wxscintilla_StyleContext.o \ + $(OBJS)\wxscintilla_WordList.o \ + $(OBJS)\wxscintilla_AutoComplete.o \ + $(OBJS)\wxscintilla_CallTip.o \ + $(OBJS)\wxscintilla_Catalogue.o \ + $(OBJS)\wxscintilla_CellBuffer.o \ + $(OBJS)\wxscintilla_CharClassify.o \ + $(OBJS)\wxscintilla_ContractionState.o \ + $(OBJS)\wxscintilla_Decoration.o \ + $(OBJS)\wxscintilla_Document.o \ + $(OBJS)\wxscintilla_Editor.o \ + $(OBJS)\wxscintilla_ExternalLexer.o \ + $(OBJS)\wxscintilla_Indicator.o \ + $(OBJS)\wxscintilla_KeyMap.o \ $(OBJS)\wxscintilla_LineMarker.o \ $(OBJS)\wxscintilla_PerLine.o \ $(OBJS)\wxscintilla_PositionCache.o \ - $(OBJS)\wxscintilla_PropSet.o \ $(OBJS)\wxscintilla_RESearch.o \ $(OBJS)\wxscintilla_RunStyles.o \ $(OBJS)\wxscintilla_ScintillaBase.o \ $(OBJS)\wxscintilla_Selection.o \ $(OBJS)\wxscintilla_Style.o \ - $(OBJS)\wxscintilla_StyleContext.o \ $(OBJS)\wxscintilla_UniConversion.o \ $(OBJS)\wxscintilla_ViewStyle.o \ - $(OBJS)\wxscintilla_WindowAccessor.o \ $(OBJS)\wxscintilla_XPM.o MONODLL_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ @@ -294,8 +314,9 @@ MONODLL_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ -I$(SETUPHDIR) -I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \ -DWXBUILDING -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\src -D__WX__ \ - -DSCI_LEXER -DLINK_LEXERS -DwxUSE_BASE=1 -DWXMAKINGDLL $(CPPFLAGS) $(CFLAGS) + -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\lexlib \ + -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ + -DwxUSE_BASE=1 -DWXMAKINGDLL $(CPPFLAGS) $(CFLAGS) MONODLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -304,9 +325,9 @@ MONODLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ -I..\..\src\regex -I..\..\src\expat\lib -I..\..\src\stc\scintilla\include \ - -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ - -DwxUSE_BASE=1 -DWXMAKINGDLL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) + -I..\..\src\stc\scintilla\lexlib -I..\..\src\stc\scintilla\src -D__WX__ \ + -DSCI_LEXER -DLINK_LEXERS -DwxUSE_BASE=1 -DWXMAKINGDLL $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) MONODLL_OBJECTS = \ $(OBJS)\monodll_dummy.o \ $(OBJS)\monodll_any.o \ @@ -375,6 +396,7 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_tarstrm.o \ $(OBJS)\monodll_textbuf.o \ $(OBJS)\monodll_textfile.o \ + $(OBJS)\monodll_time.o \ $(OBJS)\monodll_timercmn.o \ $(OBJS)\monodll_timerimpl.o \ $(OBJS)\monodll_tokenzr.o \ @@ -400,6 +422,7 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_dde.o \ $(OBJS)\monodll_dir.o \ $(OBJS)\monodll_dlmsw.o \ + $(OBJS)\monodll_evtloopconsole.o \ $(OBJS)\monodll_mimetype.o \ $(OBJS)\monodll_power.o \ $(OBJS)\monodll_regconf.o \ @@ -416,7 +439,6 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_fs_mem.o \ $(OBJS)\monodll_msgout.o \ $(OBJS)\monodll_utilscmn.o \ - $(OBJS)\monodll_evtloop.o \ $(OBJS)\monodll_main.o \ $(OBJS)\monodll_mslu.o \ $(OBJS)\monodll_volume.o \ @@ -443,8 +465,9 @@ MONOLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ -I$(SETUPHDIR) -I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \ -DWXBUILDING -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\src -D__WX__ \ - -DSCI_LEXER -DLINK_LEXERS -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) + -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\lexlib \ + -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ + -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) MONOLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -453,9 +476,9 @@ MONOLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ -I..\..\src\regex -I..\..\src\expat\lib -I..\..\src\stc\scintilla\include \ - -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ - -DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \ - $(CPPFLAGS) $(CXXFLAGS) + -I..\..\src\stc\scintilla\lexlib -I..\..\src\stc\scintilla\src -D__WX__ \ + -DSCI_LEXER -DLINK_LEXERS -DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) MONOLIB_OBJECTS = \ $(OBJS)\monolib_dummy.o \ $(OBJS)\monolib_any.o \ @@ -524,6 +547,7 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_tarstrm.o \ $(OBJS)\monolib_textbuf.o \ $(OBJS)\monolib_textfile.o \ + $(OBJS)\monolib_time.o \ $(OBJS)\monolib_timercmn.o \ $(OBJS)\monolib_timerimpl.o \ $(OBJS)\monolib_tokenzr.o \ @@ -549,6 +573,7 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_dde.o \ $(OBJS)\monolib_dir.o \ $(OBJS)\monolib_dlmsw.o \ + $(OBJS)\monolib_evtloopconsole.o \ $(OBJS)\monolib_mimetype.o \ $(OBJS)\monolib_power.o \ $(OBJS)\monolib_regconf.o \ @@ -565,7 +590,6 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_fs_mem.o \ $(OBJS)\monolib_msgout.o \ $(OBJS)\monolib_utilscmn.o \ - $(OBJS)\monolib_evtloop.o \ $(OBJS)\monolib_main.o \ $(OBJS)\monolib_mslu.o \ $(OBJS)\monolib_volume.o \ @@ -671,6 +695,7 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_tarstrm.o \ $(OBJS)\basedll_textbuf.o \ $(OBJS)\basedll_textfile.o \ + $(OBJS)\basedll_time.o \ $(OBJS)\basedll_timercmn.o \ $(OBJS)\basedll_timerimpl.o \ $(OBJS)\basedll_tokenzr.o \ @@ -696,6 +721,7 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_dde.o \ $(OBJS)\basedll_dir.o \ $(OBJS)\basedll_dlmsw.o \ + $(OBJS)\basedll_evtloopconsole.o \ $(OBJS)\basedll_mimetype.o \ $(OBJS)\basedll_power.o \ $(OBJS)\basedll_regconf.o \ @@ -712,7 +738,6 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_fs_mem.o \ $(OBJS)\basedll_msgout.o \ $(OBJS)\basedll_utilscmn.o \ - $(OBJS)\basedll_evtloop.o \ $(OBJS)\basedll_main.o \ $(OBJS)\basedll_mslu.o \ $(OBJS)\basedll_volume.o @@ -802,6 +827,7 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_tarstrm.o \ $(OBJS)\baselib_textbuf.o \ $(OBJS)\baselib_textfile.o \ + $(OBJS)\baselib_time.o \ $(OBJS)\baselib_timercmn.o \ $(OBJS)\baselib_timerimpl.o \ $(OBJS)\baselib_tokenzr.o \ @@ -827,6 +853,7 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_dde.o \ $(OBJS)\baselib_dir.o \ $(OBJS)\baselib_dlmsw.o \ + $(OBJS)\baselib_evtloopconsole.o \ $(OBJS)\baselib_mimetype.o \ $(OBJS)\baselib_power.o \ $(OBJS)\baselib_regconf.o \ @@ -843,7 +870,6 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_fs_mem.o \ $(OBJS)\baselib_msgout.o \ $(OBJS)\baselib_utilscmn.o \ - $(OBJS)\baselib_evtloop.o \ $(OBJS)\baselib_main.o \ $(OBJS)\baselib_mslu.o \ $(OBJS)\baselib_volume.o @@ -911,7 +937,6 @@ COREDLL_OBJECTS = \ $(OBJS)\coredll_fs_mem.o \ $(OBJS)\coredll_msgout.o \ $(OBJS)\coredll_utilscmn.o \ - $(OBJS)\coredll_evtloop.o \ $(OBJS)\coredll_main.o \ $(OBJS)\coredll_mslu.o \ $(OBJS)\coredll_volume.o \ @@ -931,7 +956,6 @@ CORELIB_OBJECTS = \ $(OBJS)\corelib_fs_mem.o \ $(OBJS)\corelib_msgout.o \ $(OBJS)\corelib_utilscmn.o \ - $(OBJS)\corelib_evtloop.o \ $(OBJS)\corelib_main.o \ $(OBJS)\corelib_mslu.o \ $(OBJS)\corelib_volume.o \ @@ -1083,7 +1107,8 @@ WEBVIEWDLL_OBJECTS = \ $(OBJS)\webviewdll_version_rc.o \ $(OBJS)\webviewdll_webview_ie.o \ $(OBJS)\webviewdll_webview.o \ - $(OBJS)\webviewdll_webviewarchivehandler.o + $(OBJS)\webviewdll_webviewarchivehandler.o \ + $(OBJS)\webviewdll_webviewfshandler.o WEBVIEWLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -1097,7 +1122,8 @@ WEBVIEWLIB_OBJECTS = \ $(OBJS)\webviewlib_dummy.o \ $(OBJS)\webviewlib_webview_ie.o \ $(OBJS)\webviewlib_webview.o \ - $(OBJS)\webviewlib_webviewarchivehandler.o + $(OBJS)\webviewlib_webviewarchivehandler.o \ + $(OBJS)\webviewlib_webviewfshandler.o QADLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ @@ -1164,6 +1190,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_dummy.o \ $(OBJS)\xrcdll_version_rc.o \ $(OBJS)\xrcdll_xh_animatctrl.o \ + $(OBJS)\xrcdll_xh_bannerwindow.o \ $(OBJS)\xrcdll_xh_bmp.o \ $(OBJS)\xrcdll_xh_bmpcbox.o \ $(OBJS)\xrcdll_xh_bmpbt.o \ @@ -1217,6 +1244,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_sttxt.o \ $(OBJS)\xrcdll_xh_text.o \ $(OBJS)\xrcdll_xh_tglbtn.o \ + $(OBJS)\xrcdll_xh_timectrl.o \ $(OBJS)\xrcdll_xh_toolb.o \ $(OBJS)\xrcdll_xh_toolbk.o \ $(OBJS)\xrcdll_xh_tree.o \ @@ -1237,6 +1265,7 @@ XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) XRCLIB_OBJECTS = \ $(OBJS)\xrclib_dummy.o \ $(OBJS)\xrclib_xh_animatctrl.o \ + $(OBJS)\xrclib_xh_bannerwindow.o \ $(OBJS)\xrclib_xh_bmp.o \ $(OBJS)\xrclib_xh_bmpcbox.o \ $(OBJS)\xrclib_xh_bmpbt.o \ @@ -1290,6 +1319,7 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_sttxt.o \ $(OBJS)\xrclib_xh_text.o \ $(OBJS)\xrclib_xh_tglbtn.o \ + $(OBJS)\xrclib_xh_timectrl.o \ $(OBJS)\xrclib_xh_toolb.o \ $(OBJS)\xrclib_xh_toolbk.o \ $(OBJS)\xrclib_xh_tree.o \ @@ -1316,7 +1346,9 @@ AUIDLL_OBJECTS = \ $(OBJS)\auidll_floatpane.o \ $(OBJS)\auidll_auibook.o \ $(OBJS)\auidll_auibar.o \ - $(OBJS)\auidll_tabmdi.o + $(OBJS)\auidll_tabmdi.o \ + $(OBJS)\auidll_tabart.o \ + $(OBJS)\auidll_xh_auinotbk.o AUILIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ @@ -1332,7 +1364,9 @@ AUILIB_OBJECTS = \ $(OBJS)\auilib_floatpane.o \ $(OBJS)\auilib_auibook.o \ $(OBJS)\auilib_auibar.o \ - $(OBJS)\auilib_tabmdi.o + $(OBJS)\auilib_tabmdi.o \ + $(OBJS)\auilib_tabart.o \ + $(OBJS)\auilib_xh_auinotbk.o RIBBONDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -1355,7 +1389,8 @@ RIBBONDLL_OBJECTS = \ $(OBJS)\ribbondll_gallery.o \ $(OBJS)\ribbondll_page.o \ $(OBJS)\ribbondll_panel.o \ - $(OBJS)\ribbondll_toolbar.o + $(OBJS)\ribbondll_toolbar.o \ + $(OBJS)\ribbondll_xh_ribbon.o RIBBONLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -1376,7 +1411,8 @@ RIBBONLIB_OBJECTS = \ $(OBJS)\ribbonlib_gallery.o \ $(OBJS)\ribbonlib_page.o \ $(OBJS)\ribbonlib_panel.o \ - $(OBJS)\ribbonlib_toolbar.o + $(OBJS)\ribbonlib_toolbar.o \ + $(OBJS)\ribbonlib_xh_ribbon.o PROPGRIDDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -1439,7 +1475,8 @@ RICHTEXTDLL_OBJECTS = \ $(OBJS)\richtextdll_richtextstyledlg.o \ $(OBJS)\richtextdll_richtextstyles.o \ $(OBJS)\richtextdll_richtextsymboldlg.o \ - $(OBJS)\richtextdll_richtextxml.o + $(OBJS)\richtextdll_richtextxml.o \ + $(OBJS)\richtextdll_xh_richtext.o RICHTEXTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -1460,7 +1497,8 @@ RICHTEXTLIB_OBJECTS = \ $(OBJS)\richtextlib_richtextstyledlg.o \ $(OBJS)\richtextlib_richtextstyles.o \ $(OBJS)\richtextlib_richtextsymboldlg.o \ - $(OBJS)\richtextlib_richtextxml.o + $(OBJS)\richtextlib_richtextxml.o \ + $(OBJS)\richtextlib_xh_richtext.o STCDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ @@ -1468,9 +1506,10 @@ STCDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) -I$(SETUPHDIR) -I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \ -DWXBUILDING -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\src -D__WX__ \ - -DSCI_LEXER -DLINK_LEXERS -DWXUSINGDLL -DWXMAKINGDLL_STC $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) + -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\lexlib \ + -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ + -DWXUSINGDLL -DWXMAKINGDLL_STC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) STCDLL_OBJECTS = \ $(OBJS)\stcdll_dummy.o \ $(OBJS)\stcdll_version_rc.o \ @@ -1484,9 +1523,10 @@ STCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) -I$(SETUPHDIR) -I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \ -DWXBUILDING -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\src -D__WX__ \ - -DSCI_LEXER -DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) + -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\lexlib \ + -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ + $(CXXFLAGS) STCLIB_OBJECTS = \ $(OBJS)\stclib_dummy.o \ $(OBJS)\stclib_stc.o \ @@ -1529,7 +1569,16 @@ ifeq ($(USE_GUI),0) PORTNAME = base endif ifeq ($(USE_GUI),1) -PORTNAME = msw +PORTNAME = msw$(TOOLKIT_VERSION) +endif +ifeq ($(OFFICIAL_BUILD),1) +COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD +endif +ifeq ($(OFFICIAL_BUILD),0) +WXCOMPILER = _gcc +endif +ifeq ($(OFFICIAL_BUILD),1) +WXCOMPILER = _gcc$(COMPILER_VERSION) endif ifeq ($(OFFICIAL_BUILD),0) VENDORTAG = _$(VENDOR) @@ -1573,12 +1622,12 @@ ifeq ($(MONOLITHIC),0) EXTRALIBS_FOR_BASE = endif ifeq ($(MONOLITHIC),1) -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = endif ifeq ($(MONOLITHIC),1) ifeq ($(SHARED),1) __monodll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll endif endif ifeq ($(USE_GUI),1) @@ -1618,9 +1667,11 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_webview_ie.o \ $(OBJS)\monodll_webview.o \ $(OBJS)\monodll_webviewarchivehandler.o \ + $(OBJS)\monodll_webviewfshandler.o \ $(OBJS)\monodll_debugrpt.o \ $(OBJS)\monodll_dbgrptg.o \ $(OBJS)\monodll_xh_animatctrl.o \ + $(OBJS)\monodll_xh_bannerwindow.o \ $(OBJS)\monodll_xh_bmp.o \ $(OBJS)\monodll_xh_bmpcbox.o \ $(OBJS)\monodll_xh_bmpbt.o \ @@ -1674,6 +1725,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_sttxt.o \ $(OBJS)\monodll_xh_text.o \ $(OBJS)\monodll_xh_tglbtn.o \ + $(OBJS)\monodll_xh_timectrl.o \ $(OBJS)\monodll_xh_toolb.o \ $(OBJS)\monodll_xh_toolbk.o \ $(OBJS)\monodll_xh_tree.o \ @@ -1689,6 +1741,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_auibook.o \ $(OBJS)\monodll_auibar.o \ $(OBJS)\monodll_tabmdi.o \ + $(OBJS)\monodll_tabart.o \ + $(OBJS)\monodll_xh_auinotbk.o \ $(OBJS)\monodll_advprops.o \ $(OBJS)\monodll_editors.o \ $(OBJS)\monodll_manager.o \ @@ -1707,6 +1761,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_page.o \ $(OBJS)\monodll_ribbon_panel.o \ $(OBJS)\monodll_ribbon_toolbar.o \ + $(OBJS)\monodll_xh_ribbon.o \ $(OBJS)\monodll_richtextbuffer.o \ $(OBJS)\monodll_richtextctrl.o \ $(OBJS)\monodll_richtextformatdlg.o \ @@ -1717,6 +1772,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_richtextstyles.o \ $(OBJS)\monodll_richtextsymboldlg.o \ $(OBJS)\monodll_richtextxml.o \ + $(OBJS)\monodll_xh_richtext.o \ $(OBJS)\monodll_stc.o \ $(OBJS)\monodll_PlatWX.o \ $(OBJS)\monodll_ScintillaWX.o @@ -1752,10 +1808,12 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_icon.o \ $(OBJS)\monodll_imaglist.o \ $(OBJS)\monodll_minifram.o \ + $(OBJS)\monodll_nonownedwnd.o \ $(OBJS)\monodll_dataobj.o \ $(OBJS)\monodll_dropsrc.o \ $(OBJS)\monodll_droptgt.o \ $(OBJS)\monodll_oleutils.o \ + $(OBJS)\monodll_safearray.o \ $(OBJS)\monodll_palette.o \ $(OBJS)\monodll_pen.o \ $(OBJS)\monodll_popupwin.o \ @@ -1764,10 +1822,12 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_region.o \ $(OBJS)\monodll_renderer.o \ $(OBJS)\monodll_settings.o \ + $(OBJS)\monodll_textmeasure.o \ $(OBJS)\monodll_tooltip.o \ $(OBJS)\monodll_toplevel.o \ $(OBJS)\monodll_uiaction.o \ $(OBJS)\monodll_utilsgui.o \ + $(OBJS)\monodll_utilswin.o \ $(OBJS)\monodll_uxtheme.o \ $(OBJS)\monodll_window.o \ $(OBJS)\monodll_helpchm.o \ @@ -1794,6 +1854,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_msw_dialog.o \ $(OBJS)\monodll_dirdlg.o \ $(OBJS)\monodll_dragimag.o \ + $(OBJS)\monodll_evtloop.o \ $(OBJS)\monodll_filedlg.o \ $(OBJS)\monodll_frame.o \ $(OBJS)\monodll_msw_gauge.o \ @@ -1915,6 +1976,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_markupparser.o \ $(OBJS)\monodll_matrix.o \ $(OBJS)\monodll_menucmn.o \ + $(OBJS)\monodll_modalhook.o \ $(OBJS)\monodll_mousemanager.o \ $(OBJS)\monodll_nbkbase.o \ $(OBJS)\monodll_overlaycmn.o \ @@ -1924,6 +1986,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_persist.o \ $(OBJS)\monodll_pickerbase.o \ $(OBJS)\monodll_popupcmn.o \ + $(OBJS)\monodll_preferencescmn.o \ $(OBJS)\monodll_prntbase.o \ $(OBJS)\monodll_quantize.o \ $(OBJS)\monodll_radiobtncmn.o \ @@ -1947,6 +2010,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_tbarbase.o \ $(OBJS)\monodll_textcmn.o \ $(OBJS)\monodll_textentrycmn.o \ + $(OBJS)\monodll_textmeasurecmn.o \ $(OBJS)\monodll_toplvcmn.o \ $(OBJS)\monodll_treebase.o \ $(OBJS)\monodll_uiactioncmn.o \ @@ -1974,8 +2038,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_markuptext.o \ $(OBJS)\monodll_msgdlgg.o \ $(OBJS)\monodll_numdlgg.o \ - $(OBJS)\monodll_panelg.o \ $(OBJS)\monodll_progdlgg.o \ + $(OBJS)\monodll_preferencesg.o \ $(OBJS)\monodll_printps.o \ $(OBJS)\monodll_renderg.o \ $(OBJS)\monodll_richmsgdlgg.o \ @@ -1992,7 +2056,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_treectlg.o \ $(OBJS)\monodll_treebkg.o \ $(OBJS)\monodll_vlbox.o \ - $(OBJS)\monodll_vscroll.o + $(OBJS)\monodll_vscroll.o \ + $(OBJS)\monodll_xmlreshandler.o endif endif ifeq ($(USE_GUI),1) @@ -2026,10 +2091,12 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_icon.o \ $(OBJS)\monodll_imaglist.o \ $(OBJS)\monodll_minifram.o \ + $(OBJS)\monodll_nonownedwnd.o \ $(OBJS)\monodll_dataobj.o \ $(OBJS)\monodll_dropsrc.o \ $(OBJS)\monodll_droptgt.o \ $(OBJS)\monodll_oleutils.o \ + $(OBJS)\monodll_safearray.o \ $(OBJS)\monodll_palette.o \ $(OBJS)\monodll_pen.o \ $(OBJS)\monodll_popupwin.o \ @@ -2038,16 +2105,19 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_region.o \ $(OBJS)\monodll_renderer.o \ $(OBJS)\monodll_settings.o \ + $(OBJS)\monodll_textmeasure.o \ $(OBJS)\monodll_tooltip.o \ $(OBJS)\monodll_toplevel.o \ $(OBJS)\monodll_uiaction.o \ $(OBJS)\monodll_utilsgui.o \ + $(OBJS)\monodll_utilswin.o \ $(OBJS)\monodll_uxtheme.o \ $(OBJS)\monodll_window.o \ $(OBJS)\monodll_helpchm.o \ $(OBJS)\monodll_helpwin.o \ $(OBJS)\monodll_automtn.o \ $(OBJS)\monodll_uuid.o \ + $(OBJS)\monodll_evtloop.o \ $(OBJS)\monodll_generic_accel.o \ $(OBJS)\monodll_clrpickerg.o \ $(OBJS)\monodll_collpaneg.o \ @@ -2183,6 +2253,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_markupparser.o \ $(OBJS)\monodll_matrix.o \ $(OBJS)\monodll_menucmn.o \ + $(OBJS)\monodll_modalhook.o \ $(OBJS)\monodll_mousemanager.o \ $(OBJS)\monodll_nbkbase.o \ $(OBJS)\monodll_overlaycmn.o \ @@ -2192,6 +2263,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_persist.o \ $(OBJS)\monodll_pickerbase.o \ $(OBJS)\monodll_popupcmn.o \ + $(OBJS)\monodll_preferencescmn.o \ $(OBJS)\monodll_prntbase.o \ $(OBJS)\monodll_quantize.o \ $(OBJS)\monodll_radiobtncmn.o \ @@ -2215,6 +2287,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_tbarbase.o \ $(OBJS)\monodll_textcmn.o \ $(OBJS)\monodll_textentrycmn.o \ + $(OBJS)\monodll_textmeasurecmn.o \ $(OBJS)\monodll_toplvcmn.o \ $(OBJS)\monodll_treebase.o \ $(OBJS)\monodll_uiactioncmn.o \ @@ -2242,8 +2315,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_markuptext.o \ $(OBJS)\monodll_msgdlgg.o \ $(OBJS)\monodll_numdlgg.o \ - $(OBJS)\monodll_panelg.o \ $(OBJS)\monodll_progdlgg.o \ + $(OBJS)\monodll_preferencesg.o \ $(OBJS)\monodll_printps.o \ $(OBJS)\monodll_renderg.o \ $(OBJS)\monodll_richmsgdlgg.o \ @@ -2260,7 +2333,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_treectlg.o \ $(OBJS)\monodll_treebkg.o \ $(OBJS)\monodll_vlbox.o \ - $(OBJS)\monodll_vscroll.o + $(OBJS)\monodll_vscroll.o \ + $(OBJS)\monodll_xmlreshandler.o endif endif ifeq ($(WXUNIV),0) @@ -2272,7 +2346,9 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gridcmn.o \ $(OBJS)\monodll_hyperlnkcmn.o \ $(OBJS)\monodll_odcombocmn.o \ + $(OBJS)\monodll_richtooltipcmn.o \ $(OBJS)\monodll_aboutdlgg.o \ + $(OBJS)\monodll_bannerwindow.o \ $(OBJS)\monodll_bmpcboxg.o \ $(OBJS)\monodll_calctrlg.o \ $(OBJS)\monodll_commandlinkbuttong.o \ @@ -2289,13 +2365,17 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_notifmsgg.o \ $(OBJS)\monodll_odcombo.o \ $(OBJS)\monodll_propdlg.o \ + $(OBJS)\monodll_richtooltipg.o \ $(OBJS)\monodll_sashwin.o \ $(OBJS)\monodll_splash.o \ + $(OBJS)\monodll_timectrlg.o \ $(OBJS)\monodll_tipdlg.o \ + $(OBJS)\monodll_treelist.o \ $(OBJS)\monodll_wizard.o \ $(OBJS)\monodll_taskbarcmn.o \ $(OBJS)\monodll_aboutdlg.o \ $(OBJS)\monodll_notifmsg.o \ + $(OBJS)\monodll_richtooltip.o \ $(OBJS)\monodll_sound.o \ $(OBJS)\monodll_taskbar.o \ $(OBJS)\monodll_joystick.o \ @@ -2305,7 +2385,9 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_commandlinkbutton.o \ $(OBJS)\monodll_datecontrols.o \ $(OBJS)\monodll_datectrl.o \ - $(OBJS)\monodll_hyperlink.o + $(OBJS)\monodll_datetimectrl.o \ + $(OBJS)\monodll_hyperlink.o \ + $(OBJS)\monodll_timectrl.o endif ifeq ($(WXUNIV),1) ____ADVANCED_SRC_FILENAMES_OBJECTS = \ @@ -2316,7 +2398,9 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gridcmn.o \ $(OBJS)\monodll_hyperlnkcmn.o \ $(OBJS)\monodll_odcombocmn.o \ + $(OBJS)\monodll_richtooltipcmn.o \ $(OBJS)\monodll_aboutdlgg.o \ + $(OBJS)\monodll_bannerwindow.o \ $(OBJS)\monodll_bmpcboxg.o \ $(OBJS)\monodll_calctrlg.o \ $(OBJS)\monodll_commandlinkbuttong.o \ @@ -2333,13 +2417,17 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_notifmsgg.o \ $(OBJS)\monodll_odcombo.o \ $(OBJS)\monodll_propdlg.o \ + $(OBJS)\monodll_richtooltipg.o \ $(OBJS)\monodll_sashwin.o \ $(OBJS)\monodll_splash.o \ + $(OBJS)\monodll_timectrlg.o \ $(OBJS)\monodll_tipdlg.o \ + $(OBJS)\monodll_treelist.o \ $(OBJS)\monodll_wizard.o \ $(OBJS)\monodll_taskbarcmn.o \ $(OBJS)\monodll_aboutdlg.o \ $(OBJS)\monodll_notifmsg.o \ + $(OBJS)\monodll_richtooltip.o \ $(OBJS)\monodll_sound.o \ $(OBJS)\monodll_taskbar.o \ $(OBJS)\monodll_joystick.o \ @@ -2391,9 +2479,11 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_webview_ie.o \ $(OBJS)\monolib_webview.o \ $(OBJS)\monolib_webviewarchivehandler.o \ + $(OBJS)\monolib_webviewfshandler.o \ $(OBJS)\monolib_debugrpt.o \ $(OBJS)\monolib_dbgrptg.o \ $(OBJS)\monolib_xh_animatctrl.o \ + $(OBJS)\monolib_xh_bannerwindow.o \ $(OBJS)\monolib_xh_bmp.o \ $(OBJS)\monolib_xh_bmpcbox.o \ $(OBJS)\monolib_xh_bmpbt.o \ @@ -2447,6 +2537,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_sttxt.o \ $(OBJS)\monolib_xh_text.o \ $(OBJS)\monolib_xh_tglbtn.o \ + $(OBJS)\monolib_xh_timectrl.o \ $(OBJS)\monolib_xh_toolb.o \ $(OBJS)\monolib_xh_toolbk.o \ $(OBJS)\monolib_xh_tree.o \ @@ -2462,6 +2553,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_auibook.o \ $(OBJS)\monolib_auibar.o \ $(OBJS)\monolib_tabmdi.o \ + $(OBJS)\monolib_tabart.o \ + $(OBJS)\monolib_xh_auinotbk.o \ $(OBJS)\monolib_advprops.o \ $(OBJS)\monolib_editors.o \ $(OBJS)\monolib_manager.o \ @@ -2480,6 +2573,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_page.o \ $(OBJS)\monolib_ribbon_panel.o \ $(OBJS)\monolib_ribbon_toolbar.o \ + $(OBJS)\monolib_xh_ribbon.o \ $(OBJS)\monolib_richtextbuffer.o \ $(OBJS)\monolib_richtextctrl.o \ $(OBJS)\monolib_richtextformatdlg.o \ @@ -2490,6 +2584,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_richtextstyles.o \ $(OBJS)\monolib_richtextsymboldlg.o \ $(OBJS)\monolib_richtextxml.o \ + $(OBJS)\monolib_xh_richtext.o \ $(OBJS)\monolib_stc.o \ $(OBJS)\monolib_PlatWX.o \ $(OBJS)\monolib_ScintillaWX.o @@ -2525,10 +2620,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_icon.o \ $(OBJS)\monolib_imaglist.o \ $(OBJS)\monolib_minifram.o \ + $(OBJS)\monolib_nonownedwnd.o \ $(OBJS)\monolib_dataobj.o \ $(OBJS)\monolib_dropsrc.o \ $(OBJS)\monolib_droptgt.o \ $(OBJS)\monolib_oleutils.o \ + $(OBJS)\monolib_safearray.o \ $(OBJS)\monolib_palette.o \ $(OBJS)\monolib_pen.o \ $(OBJS)\monolib_popupwin.o \ @@ -2537,10 +2634,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_region.o \ $(OBJS)\monolib_renderer.o \ $(OBJS)\monolib_settings.o \ + $(OBJS)\monolib_textmeasure.o \ $(OBJS)\monolib_tooltip.o \ $(OBJS)\monolib_toplevel.o \ $(OBJS)\monolib_uiaction.o \ $(OBJS)\monolib_utilsgui.o \ + $(OBJS)\monolib_utilswin.o \ $(OBJS)\monolib_uxtheme.o \ $(OBJS)\monolib_window.o \ $(OBJS)\monolib_helpchm.o \ @@ -2567,6 +2666,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_msw_dialog.o \ $(OBJS)\monolib_dirdlg.o \ $(OBJS)\monolib_dragimag.o \ + $(OBJS)\monolib_evtloop.o \ $(OBJS)\monolib_filedlg.o \ $(OBJS)\monolib_frame.o \ $(OBJS)\monolib_msw_gauge.o \ @@ -2688,6 +2788,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_markupparser.o \ $(OBJS)\monolib_matrix.o \ $(OBJS)\monolib_menucmn.o \ + $(OBJS)\monolib_modalhook.o \ $(OBJS)\monolib_mousemanager.o \ $(OBJS)\monolib_nbkbase.o \ $(OBJS)\monolib_overlaycmn.o \ @@ -2697,6 +2798,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_persist.o \ $(OBJS)\monolib_pickerbase.o \ $(OBJS)\monolib_popupcmn.o \ + $(OBJS)\monolib_preferencescmn.o \ $(OBJS)\monolib_prntbase.o \ $(OBJS)\monolib_quantize.o \ $(OBJS)\monolib_radiobtncmn.o \ @@ -2720,6 +2822,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_tbarbase.o \ $(OBJS)\monolib_textcmn.o \ $(OBJS)\monolib_textentrycmn.o \ + $(OBJS)\monolib_textmeasurecmn.o \ $(OBJS)\monolib_toplvcmn.o \ $(OBJS)\monolib_treebase.o \ $(OBJS)\monolib_uiactioncmn.o \ @@ -2747,8 +2850,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_markuptext.o \ $(OBJS)\monolib_msgdlgg.o \ $(OBJS)\monolib_numdlgg.o \ - $(OBJS)\monolib_panelg.o \ $(OBJS)\monolib_progdlgg.o \ + $(OBJS)\monolib_preferencesg.o \ $(OBJS)\monolib_printps.o \ $(OBJS)\monolib_renderg.o \ $(OBJS)\monolib_richmsgdlgg.o \ @@ -2765,7 +2868,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_treectlg.o \ $(OBJS)\monolib_treebkg.o \ $(OBJS)\monolib_vlbox.o \ - $(OBJS)\monolib_vscroll.o + $(OBJS)\monolib_vscroll.o \ + $(OBJS)\monolib_xmlreshandler.o endif endif ifeq ($(USE_GUI),1) @@ -2799,10 +2903,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_icon.o \ $(OBJS)\monolib_imaglist.o \ $(OBJS)\monolib_minifram.o \ + $(OBJS)\monolib_nonownedwnd.o \ $(OBJS)\monolib_dataobj.o \ $(OBJS)\monolib_dropsrc.o \ $(OBJS)\monolib_droptgt.o \ $(OBJS)\monolib_oleutils.o \ + $(OBJS)\monolib_safearray.o \ $(OBJS)\monolib_palette.o \ $(OBJS)\monolib_pen.o \ $(OBJS)\monolib_popupwin.o \ @@ -2811,16 +2917,19 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_region.o \ $(OBJS)\monolib_renderer.o \ $(OBJS)\monolib_settings.o \ + $(OBJS)\monolib_textmeasure.o \ $(OBJS)\monolib_tooltip.o \ $(OBJS)\monolib_toplevel.o \ $(OBJS)\monolib_uiaction.o \ $(OBJS)\monolib_utilsgui.o \ + $(OBJS)\monolib_utilswin.o \ $(OBJS)\monolib_uxtheme.o \ $(OBJS)\monolib_window.o \ $(OBJS)\monolib_helpchm.o \ $(OBJS)\monolib_helpwin.o \ $(OBJS)\monolib_automtn.o \ $(OBJS)\monolib_uuid.o \ + $(OBJS)\monolib_evtloop.o \ $(OBJS)\monolib_generic_accel.o \ $(OBJS)\monolib_clrpickerg.o \ $(OBJS)\monolib_collpaneg.o \ @@ -2956,6 +3065,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_markupparser.o \ $(OBJS)\monolib_matrix.o \ $(OBJS)\monolib_menucmn.o \ + $(OBJS)\monolib_modalhook.o \ $(OBJS)\monolib_mousemanager.o \ $(OBJS)\monolib_nbkbase.o \ $(OBJS)\monolib_overlaycmn.o \ @@ -2965,6 +3075,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_persist.o \ $(OBJS)\monolib_pickerbase.o \ $(OBJS)\monolib_popupcmn.o \ + $(OBJS)\monolib_preferencescmn.o \ $(OBJS)\monolib_prntbase.o \ $(OBJS)\monolib_quantize.o \ $(OBJS)\monolib_radiobtncmn.o \ @@ -2988,6 +3099,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_tbarbase.o \ $(OBJS)\monolib_textcmn.o \ $(OBJS)\monolib_textentrycmn.o \ + $(OBJS)\monolib_textmeasurecmn.o \ $(OBJS)\monolib_toplvcmn.o \ $(OBJS)\monolib_treebase.o \ $(OBJS)\monolib_uiactioncmn.o \ @@ -3015,8 +3127,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_markuptext.o \ $(OBJS)\monolib_msgdlgg.o \ $(OBJS)\monolib_numdlgg.o \ - $(OBJS)\monolib_panelg.o \ $(OBJS)\monolib_progdlgg.o \ + $(OBJS)\monolib_preferencesg.o \ $(OBJS)\monolib_printps.o \ $(OBJS)\monolib_renderg.o \ $(OBJS)\monolib_richmsgdlgg.o \ @@ -3033,7 +3145,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_treectlg.o \ $(OBJS)\monolib_treebkg.o \ $(OBJS)\monolib_vlbox.o \ - $(OBJS)\monolib_vscroll.o + $(OBJS)\monolib_vscroll.o \ + $(OBJS)\monolib_xmlreshandler.o endif endif ifeq ($(WXUNIV),0) @@ -3045,7 +3158,9 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gridcmn.o \ $(OBJS)\monolib_hyperlnkcmn.o \ $(OBJS)\monolib_odcombocmn.o \ + $(OBJS)\monolib_richtooltipcmn.o \ $(OBJS)\monolib_aboutdlgg.o \ + $(OBJS)\monolib_bannerwindow.o \ $(OBJS)\monolib_bmpcboxg.o \ $(OBJS)\monolib_calctrlg.o \ $(OBJS)\monolib_commandlinkbuttong.o \ @@ -3062,13 +3177,17 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_notifmsgg.o \ $(OBJS)\monolib_odcombo.o \ $(OBJS)\monolib_propdlg.o \ + $(OBJS)\monolib_richtooltipg.o \ $(OBJS)\monolib_sashwin.o \ $(OBJS)\monolib_splash.o \ + $(OBJS)\monolib_timectrlg.o \ $(OBJS)\monolib_tipdlg.o \ + $(OBJS)\monolib_treelist.o \ $(OBJS)\monolib_wizard.o \ $(OBJS)\monolib_taskbarcmn.o \ $(OBJS)\monolib_aboutdlg.o \ $(OBJS)\monolib_notifmsg.o \ + $(OBJS)\monolib_richtooltip.o \ $(OBJS)\monolib_sound.o \ $(OBJS)\monolib_taskbar.o \ $(OBJS)\monolib_joystick.o \ @@ -3078,7 +3197,9 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_commandlinkbutton.o \ $(OBJS)\monolib_datecontrols.o \ $(OBJS)\monolib_datectrl.o \ - $(OBJS)\monolib_hyperlink.o + $(OBJS)\monolib_datetimectrl.o \ + $(OBJS)\monolib_hyperlink.o \ + $(OBJS)\monolib_timectrl.o endif ifeq ($(WXUNIV),1) ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ @@ -3089,7 +3210,9 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gridcmn.o \ $(OBJS)\monolib_hyperlnkcmn.o \ $(OBJS)\monolib_odcombocmn.o \ + $(OBJS)\monolib_richtooltipcmn.o \ $(OBJS)\monolib_aboutdlgg.o \ + $(OBJS)\monolib_bannerwindow.o \ $(OBJS)\monolib_bmpcboxg.o \ $(OBJS)\monolib_calctrlg.o \ $(OBJS)\monolib_commandlinkbuttong.o \ @@ -3106,13 +3229,17 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_notifmsgg.o \ $(OBJS)\monolib_odcombo.o \ $(OBJS)\monolib_propdlg.o \ + $(OBJS)\monolib_richtooltipg.o \ $(OBJS)\monolib_sashwin.o \ $(OBJS)\monolib_splash.o \ + $(OBJS)\monolib_timectrlg.o \ $(OBJS)\monolib_tipdlg.o \ + $(OBJS)\monolib_treelist.o \ $(OBJS)\monolib_wizard.o \ $(OBJS)\monolib_taskbarcmn.o \ $(OBJS)\monolib_aboutdlg.o \ $(OBJS)\monolib_notifmsg.o \ + $(OBJS)\monolib_richtooltip.o \ $(OBJS)\monolib_sound.o \ $(OBJS)\monolib_taskbar.o \ $(OBJS)\monolib_joystick.o \ @@ -3121,7 +3248,7 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) __basedll___depname = \ - $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll endif endif ifeq ($(MONOLITHIC),0) @@ -3139,7 +3266,7 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) __netdll___depname = \ - $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll endif endif ifeq ($(MONOLITHIC),0) @@ -3158,7 +3285,7 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) __coredll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll endif endif endif @@ -3193,10 +3320,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_icon.o \ $(OBJS)\coredll_imaglist.o \ $(OBJS)\coredll_minifram.o \ + $(OBJS)\coredll_nonownedwnd.o \ $(OBJS)\coredll_dataobj.o \ $(OBJS)\coredll_dropsrc.o \ $(OBJS)\coredll_droptgt.o \ $(OBJS)\coredll_oleutils.o \ + $(OBJS)\coredll_safearray.o \ $(OBJS)\coredll_palette.o \ $(OBJS)\coredll_pen.o \ $(OBJS)\coredll_popupwin.o \ @@ -3205,10 +3334,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_region.o \ $(OBJS)\coredll_renderer.o \ $(OBJS)\coredll_settings.o \ + $(OBJS)\coredll_textmeasure.o \ $(OBJS)\coredll_tooltip.o \ $(OBJS)\coredll_toplevel.o \ $(OBJS)\coredll_uiaction.o \ $(OBJS)\coredll_utilsgui.o \ + $(OBJS)\coredll_utilswin.o \ $(OBJS)\coredll_uxtheme.o \ $(OBJS)\coredll_window.o \ $(OBJS)\coredll_helpchm.o \ @@ -3235,6 +3366,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_msw_dialog.o \ $(OBJS)\coredll_dirdlg.o \ $(OBJS)\coredll_dragimag.o \ + $(OBJS)\coredll_evtloop.o \ $(OBJS)\coredll_filedlg.o \ $(OBJS)\coredll_frame.o \ $(OBJS)\coredll_msw_gauge.o \ @@ -3356,6 +3488,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_markupparser.o \ $(OBJS)\coredll_matrix.o \ $(OBJS)\coredll_menucmn.o \ + $(OBJS)\coredll_modalhook.o \ $(OBJS)\coredll_mousemanager.o \ $(OBJS)\coredll_nbkbase.o \ $(OBJS)\coredll_overlaycmn.o \ @@ -3365,6 +3498,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_persist.o \ $(OBJS)\coredll_pickerbase.o \ $(OBJS)\coredll_popupcmn.o \ + $(OBJS)\coredll_preferencescmn.o \ $(OBJS)\coredll_prntbase.o \ $(OBJS)\coredll_quantize.o \ $(OBJS)\coredll_radiobtncmn.o \ @@ -3388,6 +3522,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_tbarbase.o \ $(OBJS)\coredll_textcmn.o \ $(OBJS)\coredll_textentrycmn.o \ + $(OBJS)\coredll_textmeasurecmn.o \ $(OBJS)\coredll_toplvcmn.o \ $(OBJS)\coredll_treebase.o \ $(OBJS)\coredll_uiactioncmn.o \ @@ -3415,8 +3550,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_markuptext.o \ $(OBJS)\coredll_msgdlgg.o \ $(OBJS)\coredll_numdlgg.o \ - $(OBJS)\coredll_panelg.o \ $(OBJS)\coredll_progdlgg.o \ + $(OBJS)\coredll_preferencesg.o \ $(OBJS)\coredll_printps.o \ $(OBJS)\coredll_renderg.o \ $(OBJS)\coredll_richmsgdlgg.o \ @@ -3433,7 +3568,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_treectlg.o \ $(OBJS)\coredll_treebkg.o \ $(OBJS)\coredll_vlbox.o \ - $(OBJS)\coredll_vscroll.o + $(OBJS)\coredll_vscroll.o \ + $(OBJS)\coredll_xmlreshandler.o endif endif ifeq ($(USE_GUI),1) @@ -3467,10 +3603,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_icon.o \ $(OBJS)\coredll_imaglist.o \ $(OBJS)\coredll_minifram.o \ + $(OBJS)\coredll_nonownedwnd.o \ $(OBJS)\coredll_dataobj.o \ $(OBJS)\coredll_dropsrc.o \ $(OBJS)\coredll_droptgt.o \ $(OBJS)\coredll_oleutils.o \ + $(OBJS)\coredll_safearray.o \ $(OBJS)\coredll_palette.o \ $(OBJS)\coredll_pen.o \ $(OBJS)\coredll_popupwin.o \ @@ -3479,16 +3617,19 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_region.o \ $(OBJS)\coredll_renderer.o \ $(OBJS)\coredll_settings.o \ + $(OBJS)\coredll_textmeasure.o \ $(OBJS)\coredll_tooltip.o \ $(OBJS)\coredll_toplevel.o \ $(OBJS)\coredll_uiaction.o \ $(OBJS)\coredll_utilsgui.o \ + $(OBJS)\coredll_utilswin.o \ $(OBJS)\coredll_uxtheme.o \ $(OBJS)\coredll_window.o \ $(OBJS)\coredll_helpchm.o \ $(OBJS)\coredll_helpwin.o \ $(OBJS)\coredll_automtn.o \ $(OBJS)\coredll_uuid.o \ + $(OBJS)\coredll_evtloop.o \ $(OBJS)\coredll_generic_accel.o \ $(OBJS)\coredll_clrpickerg.o \ $(OBJS)\coredll_collpaneg.o \ @@ -3624,6 +3765,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_markupparser.o \ $(OBJS)\coredll_matrix.o \ $(OBJS)\coredll_menucmn.o \ + $(OBJS)\coredll_modalhook.o \ $(OBJS)\coredll_mousemanager.o \ $(OBJS)\coredll_nbkbase.o \ $(OBJS)\coredll_overlaycmn.o \ @@ -3633,6 +3775,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_persist.o \ $(OBJS)\coredll_pickerbase.o \ $(OBJS)\coredll_popupcmn.o \ + $(OBJS)\coredll_preferencescmn.o \ $(OBJS)\coredll_prntbase.o \ $(OBJS)\coredll_quantize.o \ $(OBJS)\coredll_radiobtncmn.o \ @@ -3656,6 +3799,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_tbarbase.o \ $(OBJS)\coredll_textcmn.o \ $(OBJS)\coredll_textentrycmn.o \ + $(OBJS)\coredll_textmeasurecmn.o \ $(OBJS)\coredll_toplvcmn.o \ $(OBJS)\coredll_treebase.o \ $(OBJS)\coredll_uiactioncmn.o \ @@ -3683,8 +3827,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_markuptext.o \ $(OBJS)\coredll_msgdlgg.o \ $(OBJS)\coredll_numdlgg.o \ - $(OBJS)\coredll_panelg.o \ $(OBJS)\coredll_progdlgg.o \ + $(OBJS)\coredll_preferencesg.o \ $(OBJS)\coredll_printps.o \ $(OBJS)\coredll_renderg.o \ $(OBJS)\coredll_richmsgdlgg.o \ @@ -3701,7 +3845,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_treectlg.o \ $(OBJS)\coredll_treebkg.o \ $(OBJS)\coredll_vlbox.o \ - $(OBJS)\coredll_vscroll.o + $(OBJS)\coredll_vscroll.o \ + $(OBJS)\coredll_xmlreshandler.o endif endif ifeq ($(MONOLITHIC),0) @@ -3743,10 +3888,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_icon.o \ $(OBJS)\corelib_imaglist.o \ $(OBJS)\corelib_minifram.o \ + $(OBJS)\corelib_nonownedwnd.o \ $(OBJS)\corelib_dataobj.o \ $(OBJS)\corelib_dropsrc.o \ $(OBJS)\corelib_droptgt.o \ $(OBJS)\corelib_oleutils.o \ + $(OBJS)\corelib_safearray.o \ $(OBJS)\corelib_palette.o \ $(OBJS)\corelib_pen.o \ $(OBJS)\corelib_popupwin.o \ @@ -3755,10 +3902,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_region.o \ $(OBJS)\corelib_renderer.o \ $(OBJS)\corelib_settings.o \ + $(OBJS)\corelib_textmeasure.o \ $(OBJS)\corelib_tooltip.o \ $(OBJS)\corelib_toplevel.o \ $(OBJS)\corelib_uiaction.o \ $(OBJS)\corelib_utilsgui.o \ + $(OBJS)\corelib_utilswin.o \ $(OBJS)\corelib_uxtheme.o \ $(OBJS)\corelib_window.o \ $(OBJS)\corelib_helpchm.o \ @@ -3785,6 +3934,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_msw_dialog.o \ $(OBJS)\corelib_dirdlg.o \ $(OBJS)\corelib_dragimag.o \ + $(OBJS)\corelib_evtloop.o \ $(OBJS)\corelib_filedlg.o \ $(OBJS)\corelib_frame.o \ $(OBJS)\corelib_msw_gauge.o \ @@ -3906,6 +4056,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_markupparser.o \ $(OBJS)\corelib_matrix.o \ $(OBJS)\corelib_menucmn.o \ + $(OBJS)\corelib_modalhook.o \ $(OBJS)\corelib_mousemanager.o \ $(OBJS)\corelib_nbkbase.o \ $(OBJS)\corelib_overlaycmn.o \ @@ -3915,6 +4066,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_persist.o \ $(OBJS)\corelib_pickerbase.o \ $(OBJS)\corelib_popupcmn.o \ + $(OBJS)\corelib_preferencescmn.o \ $(OBJS)\corelib_prntbase.o \ $(OBJS)\corelib_quantize.o \ $(OBJS)\corelib_radiobtncmn.o \ @@ -3938,6 +4090,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_tbarbase.o \ $(OBJS)\corelib_textcmn.o \ $(OBJS)\corelib_textentrycmn.o \ + $(OBJS)\corelib_textmeasurecmn.o \ $(OBJS)\corelib_toplvcmn.o \ $(OBJS)\corelib_treebase.o \ $(OBJS)\corelib_uiactioncmn.o \ @@ -3965,8 +4118,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_markuptext.o \ $(OBJS)\corelib_msgdlgg.o \ $(OBJS)\corelib_numdlgg.o \ - $(OBJS)\corelib_panelg.o \ $(OBJS)\corelib_progdlgg.o \ + $(OBJS)\corelib_preferencesg.o \ $(OBJS)\corelib_printps.o \ $(OBJS)\corelib_renderg.o \ $(OBJS)\corelib_richmsgdlgg.o \ @@ -3983,7 +4136,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_treectlg.o \ $(OBJS)\corelib_treebkg.o \ $(OBJS)\corelib_vlbox.o \ - $(OBJS)\corelib_vscroll.o + $(OBJS)\corelib_vscroll.o \ + $(OBJS)\corelib_xmlreshandler.o endif endif ifeq ($(USE_GUI),1) @@ -4017,10 +4171,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_icon.o \ $(OBJS)\corelib_imaglist.o \ $(OBJS)\corelib_minifram.o \ + $(OBJS)\corelib_nonownedwnd.o \ $(OBJS)\corelib_dataobj.o \ $(OBJS)\corelib_dropsrc.o \ $(OBJS)\corelib_droptgt.o \ $(OBJS)\corelib_oleutils.o \ + $(OBJS)\corelib_safearray.o \ $(OBJS)\corelib_palette.o \ $(OBJS)\corelib_pen.o \ $(OBJS)\corelib_popupwin.o \ @@ -4029,16 +4185,19 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_region.o \ $(OBJS)\corelib_renderer.o \ $(OBJS)\corelib_settings.o \ + $(OBJS)\corelib_textmeasure.o \ $(OBJS)\corelib_tooltip.o \ $(OBJS)\corelib_toplevel.o \ $(OBJS)\corelib_uiaction.o \ $(OBJS)\corelib_utilsgui.o \ + $(OBJS)\corelib_utilswin.o \ $(OBJS)\corelib_uxtheme.o \ $(OBJS)\corelib_window.o \ $(OBJS)\corelib_helpchm.o \ $(OBJS)\corelib_helpwin.o \ $(OBJS)\corelib_automtn.o \ $(OBJS)\corelib_uuid.o \ + $(OBJS)\corelib_evtloop.o \ $(OBJS)\corelib_generic_accel.o \ $(OBJS)\corelib_clrpickerg.o \ $(OBJS)\corelib_collpaneg.o \ @@ -4174,6 +4333,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_markupparser.o \ $(OBJS)\corelib_matrix.o \ $(OBJS)\corelib_menucmn.o \ + $(OBJS)\corelib_modalhook.o \ $(OBJS)\corelib_mousemanager.o \ $(OBJS)\corelib_nbkbase.o \ $(OBJS)\corelib_overlaycmn.o \ @@ -4183,6 +4343,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_persist.o \ $(OBJS)\corelib_pickerbase.o \ $(OBJS)\corelib_popupcmn.o \ + $(OBJS)\corelib_preferencescmn.o \ $(OBJS)\corelib_prntbase.o \ $(OBJS)\corelib_quantize.o \ $(OBJS)\corelib_radiobtncmn.o \ @@ -4206,6 +4367,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_tbarbase.o \ $(OBJS)\corelib_textcmn.o \ $(OBJS)\corelib_textentrycmn.o \ + $(OBJS)\corelib_textmeasurecmn.o \ $(OBJS)\corelib_toplvcmn.o \ $(OBJS)\corelib_treebase.o \ $(OBJS)\corelib_uiactioncmn.o \ @@ -4233,8 +4395,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_markuptext.o \ $(OBJS)\corelib_msgdlgg.o \ $(OBJS)\corelib_numdlgg.o \ - $(OBJS)\corelib_panelg.o \ $(OBJS)\corelib_progdlgg.o \ + $(OBJS)\corelib_preferencesg.o \ $(OBJS)\corelib_printps.o \ $(OBJS)\corelib_renderg.o \ $(OBJS)\corelib_richmsgdlgg.o \ @@ -4251,7 +4413,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_treectlg.o \ $(OBJS)\corelib_treebkg.o \ $(OBJS)\corelib_vlbox.o \ - $(OBJS)\corelib_vscroll.o + $(OBJS)\corelib_vscroll.o \ + $(OBJS)\corelib_xmlreshandler.o endif endif ifeq ($(SHARED),1) @@ -4264,7 +4427,7 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) __advdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll endif endif endif @@ -4277,7 +4440,9 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_gridcmn.o \ $(OBJS)\advdll_hyperlnkcmn.o \ $(OBJS)\advdll_odcombocmn.o \ + $(OBJS)\advdll_richtooltipcmn.o \ $(OBJS)\advdll_aboutdlgg.o \ + $(OBJS)\advdll_bannerwindow.o \ $(OBJS)\advdll_bmpcboxg.o \ $(OBJS)\advdll_calctrlg.o \ $(OBJS)\advdll_commandlinkbuttong.o \ @@ -4294,13 +4459,17 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_notifmsgg.o \ $(OBJS)\advdll_odcombo.o \ $(OBJS)\advdll_propdlg.o \ + $(OBJS)\advdll_richtooltipg.o \ $(OBJS)\advdll_sashwin.o \ $(OBJS)\advdll_splash.o \ + $(OBJS)\advdll_timectrlg.o \ $(OBJS)\advdll_tipdlg.o \ + $(OBJS)\advdll_treelist.o \ $(OBJS)\advdll_wizard.o \ $(OBJS)\advdll_taskbarcmn.o \ $(OBJS)\advdll_aboutdlg.o \ $(OBJS)\advdll_notifmsg.o \ + $(OBJS)\advdll_richtooltip.o \ $(OBJS)\advdll_sound.o \ $(OBJS)\advdll_taskbar.o \ $(OBJS)\advdll_joystick.o \ @@ -4310,7 +4479,9 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_commandlinkbutton.o \ $(OBJS)\advdll_datecontrols.o \ $(OBJS)\advdll_datectrl.o \ - $(OBJS)\advdll_hyperlink.o + $(OBJS)\advdll_datetimectrl.o \ + $(OBJS)\advdll_hyperlink.o \ + $(OBJS)\advdll_timectrl.o endif ifeq ($(WXUNIV),1) ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ @@ -4321,7 +4492,9 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_gridcmn.o \ $(OBJS)\advdll_hyperlnkcmn.o \ $(OBJS)\advdll_odcombocmn.o \ + $(OBJS)\advdll_richtooltipcmn.o \ $(OBJS)\advdll_aboutdlgg.o \ + $(OBJS)\advdll_bannerwindow.o \ $(OBJS)\advdll_bmpcboxg.o \ $(OBJS)\advdll_calctrlg.o \ $(OBJS)\advdll_commandlinkbuttong.o \ @@ -4338,13 +4511,17 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_notifmsgg.o \ $(OBJS)\advdll_odcombo.o \ $(OBJS)\advdll_propdlg.o \ + $(OBJS)\advdll_richtooltipg.o \ $(OBJS)\advdll_sashwin.o \ $(OBJS)\advdll_splash.o \ + $(OBJS)\advdll_timectrlg.o \ $(OBJS)\advdll_tipdlg.o \ + $(OBJS)\advdll_treelist.o \ $(OBJS)\advdll_wizard.o \ $(OBJS)\advdll_taskbarcmn.o \ $(OBJS)\advdll_aboutdlg.o \ $(OBJS)\advdll_notifmsg.o \ + $(OBJS)\advdll_richtooltip.o \ $(OBJS)\advdll_sound.o \ $(OBJS)\advdll_taskbar.o \ $(OBJS)\advdll_joystick.o \ @@ -4367,7 +4544,9 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_gridcmn.o \ $(OBJS)\advlib_hyperlnkcmn.o \ $(OBJS)\advlib_odcombocmn.o \ + $(OBJS)\advlib_richtooltipcmn.o \ $(OBJS)\advlib_aboutdlgg.o \ + $(OBJS)\advlib_bannerwindow.o \ $(OBJS)\advlib_bmpcboxg.o \ $(OBJS)\advlib_calctrlg.o \ $(OBJS)\advlib_commandlinkbuttong.o \ @@ -4384,13 +4563,17 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_notifmsgg.o \ $(OBJS)\advlib_odcombo.o \ $(OBJS)\advlib_propdlg.o \ + $(OBJS)\advlib_richtooltipg.o \ $(OBJS)\advlib_sashwin.o \ $(OBJS)\advlib_splash.o \ + $(OBJS)\advlib_timectrlg.o \ $(OBJS)\advlib_tipdlg.o \ + $(OBJS)\advlib_treelist.o \ $(OBJS)\advlib_wizard.o \ $(OBJS)\advlib_taskbarcmn.o \ $(OBJS)\advlib_aboutdlg.o \ $(OBJS)\advlib_notifmsg.o \ + $(OBJS)\advlib_richtooltip.o \ $(OBJS)\advlib_sound.o \ $(OBJS)\advlib_taskbar.o \ $(OBJS)\advlib_joystick.o \ @@ -4400,7 +4583,9 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_commandlinkbutton.o \ $(OBJS)\advlib_datecontrols.o \ $(OBJS)\advlib_datectrl.o \ - $(OBJS)\advlib_hyperlink.o + $(OBJS)\advlib_datetimectrl.o \ + $(OBJS)\advlib_hyperlink.o \ + $(OBJS)\advlib_timectrl.o endif ifeq ($(WXUNIV),1) ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ @@ -4411,7 +4596,9 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_gridcmn.o \ $(OBJS)\advlib_hyperlnkcmn.o \ $(OBJS)\advlib_odcombocmn.o \ + $(OBJS)\advlib_richtooltipcmn.o \ $(OBJS)\advlib_aboutdlgg.o \ + $(OBJS)\advlib_bannerwindow.o \ $(OBJS)\advlib_bmpcboxg.o \ $(OBJS)\advlib_calctrlg.o \ $(OBJS)\advlib_commandlinkbuttong.o \ @@ -4428,13 +4615,17 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_notifmsgg.o \ $(OBJS)\advlib_odcombo.o \ $(OBJS)\advlib_propdlg.o \ + $(OBJS)\advlib_richtooltipg.o \ $(OBJS)\advlib_sashwin.o \ $(OBJS)\advlib_splash.o \ + $(OBJS)\advlib_timectrlg.o \ $(OBJS)\advlib_tipdlg.o \ + $(OBJS)\advlib_treelist.o \ $(OBJS)\advlib_wizard.o \ $(OBJS)\advlib_taskbarcmn.o \ $(OBJS)\advlib_aboutdlg.o \ $(OBJS)\advlib_notifmsg.o \ + $(OBJS)\advlib_richtooltip.o \ $(OBJS)\advlib_sound.o \ $(OBJS)\advlib_taskbar.o \ $(OBJS)\advlib_joystick.o \ @@ -4451,7 +4642,7 @@ ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_MEDIA),1) __mediadll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll endif endif endif @@ -4477,7 +4668,7 @@ ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_HTML),1) __htmldll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll endif endif endif @@ -4503,7 +4694,7 @@ ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_WEBVIEW),1) __webviewdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll endif endif endif @@ -4529,7 +4720,7 @@ ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_QA),1) __qadll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll endif endif endif @@ -4553,7 +4744,7 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) __xmldll___depname = \ - $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll endif endif ifeq ($(MONOLITHIC),0) @@ -4572,7 +4763,7 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_XRC),1) __xrcdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll endif endif endif @@ -4594,7 +4785,7 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_AUI),1) __auidll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll endif endif endif @@ -4616,7 +4807,7 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_RIBBON),1) __ribbondll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll endif endif endif @@ -4638,7 +4829,7 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_PROPGRID),1) __propgriddll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll endif endif endif @@ -4660,7 +4851,7 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_RICHTEXT),1) __richtextdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll endif endif endif @@ -4682,7 +4873,7 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_STC),1) __stcdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll endif endif endif @@ -4704,7 +4895,7 @@ ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_OPENGL),1) __gldll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll endif endif endif @@ -4900,55 +5091,55 @@ clean: -if exist $(LIBDIRNAME)\libwxtiff$(WXDEBUGFLAG).a del $(LIBDIRNAME)\libwxtiff$(WXDEBUGFLAG).a -if exist $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a del $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a -if exist $(LIBDIRNAME)\libwxscintilla$(WXDEBUGFLAG).a del $(LIBDIRNAME)\libwxscintilla$(WXDEBUGFLAG).a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a - -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll -if exist $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a del $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a -if exist $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a del $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a - -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll -if exist $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a del $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a -if exist $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a del $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.a -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a - -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll -if exist $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a del $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a -if exist $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a del $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.a -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.a -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.a -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a $(MAKE) -C ..\..\samples -f makefile.gcc $(MAKEARGS) clean @@ -5000,8 +5191,8 @@ endif ifeq ($(MONOLITHIC),1) ifeq ($(SHARED),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\monodll_version_rc.o $(__wxscintilla_library_link_DEP) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(MONODLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(__wxscintilla) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\monodll_version_rc.o $(__wxscintilla_library_link_DEP) + $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(MONODLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(__wxscintilla) endif endif @@ -5016,7 +5207,7 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) -$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\basedll_version_rc.o +$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\basedll_version_rc.o $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(BASEDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet endif endif @@ -5036,7 +5227,7 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) -$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_gcc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\netdll_version_rc.o $(__basedll___depname) +$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\netdll_version_rc.o $(__basedll___depname) $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(NETDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif @@ -5057,8 +5248,8 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_gcc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\coredll_version_rc.o $(__basedll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(COREDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\coredll_version_rc.o $(__basedll___depname) + $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(COREDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -5083,8 +5274,8 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_gcc$(VENDORTAG).dll: $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\advdll_version_rc.o $(__coredll___depname) $(__basedll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(ADVDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll: $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\advdll_version_rc.o $(__coredll___depname) $(__basedll___depname) + $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(ADVDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -5110,8 +5301,8 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_MEDIA),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG).dll: $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\mediadll_version_rc.o $(__coredll___depname) $(__basedll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(MEDIADLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll: $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\mediadll_version_rc.o $(__coredll___depname) $(__basedll___depname) + $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(MEDIADLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -5142,8 +5333,8 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_HTML),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_gcc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\htmldll_version_rc.o $(__coredll___depname) $(__basedll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(HTMLDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\htmldll_version_rc.o $(__coredll___depname) $(__basedll___depname) + $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(HTMLDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -5172,8 +5363,8 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_WEBVIEW),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview_gcc$(VENDORTAG).dll: $(WEBVIEWDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\webviewdll_version_rc.o $(__coredll___depname) $(__basedll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(WEBVIEWDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll: $(WEBVIEWDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\webviewdll_version_rc.o $(__coredll___depname) $(__basedll___depname) + $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(WEBVIEWDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -5202,8 +5393,8 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_QA),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_gcc$(VENDORTAG).dll: $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\qadll_version_rc.o $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(QADLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll: $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\qadll_version_rc.o $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname) + $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(QADLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a endif endif endif @@ -5230,7 +5421,7 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) -$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_gcc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\xmldll_version_rc.o $(__basedll___depname) +$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\xmldll_version_rc.o $(__basedll___depname) $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(XMLDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif @@ -5251,8 +5442,8 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_XRC),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_gcc$(VENDORTAG).dll: $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\xrcdll_version_rc.o $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(XRCDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll: $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\xrcdll_version_rc.o $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname) + $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(XRCDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -5277,8 +5468,8 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_AUI),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_gcc$(VENDORTAG).dll: $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\auidll_version_rc.o $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(AUIDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll: $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\auidll_version_rc.o $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) + $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(AUIDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -5303,8 +5494,8 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_RIBBON),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_gcc$(VENDORTAG).dll: $(RIBBONDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\ribbondll_version_rc.o $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(RIBBONDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll: $(RIBBONDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\ribbondll_version_rc.o $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) + $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(RIBBONDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -5329,8 +5520,8 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_PROPGRID),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_gcc$(VENDORTAG).dll: $(PROPGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\propgriddll_version_rc.o $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(PROPGRIDDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll: $(PROPGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\propgriddll_version_rc.o $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) + $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(PROPGRIDDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -5355,8 +5546,8 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_RICHTEXT),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_gcc$(VENDORTAG).dll: $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\richtextdll_version_rc.o $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(RICHTEXTDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll: $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\richtextdll_version_rc.o $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname) + $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(RICHTEXTDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -5381,8 +5572,8 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_STC),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_gcc$(VENDORTAG).dll: $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__wxscintilla) $(OBJS)\stcdll_version_rc.o $(__coredll___depname) $(__basedll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(STCDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwxscintilla$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll: $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__wxscintilla) $(OBJS)\stcdll_version_rc.o $(__coredll___depname) $(__basedll___depname) + $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(STCDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwxscintilla$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -5407,8 +5598,8 @@ endif ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_OPENGL),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\gldll_version_rc.o $(__basedll___depname) $(__coredll___depname) $(__monodll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(GLDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) -lopengl32 -lglu32 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\gldll_version_rc.o $(__basedll___depname) $(__coredll___depname) $(__monodll___depname) + $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(GLDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) -lopengl32 -lglu32 endif endif endif @@ -5457,11 +5648,13 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs build_cfg_file: $(SETUPHDIR) @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=5 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @echo UNICODE=$(UNICODE) >>$(BUILD_CFG_FILE) + @echo TOOLKIT=MSW >>$(BUILD_CFG_FILE) + @echo TOOLKIT_VERSION=$(TOOLKIT_VERSION) >>$(BUILD_CFG_FILE) @echo WXUNIV=$(WXUNIV) >>$(BUILD_CFG_FILE) @echo CFG=$(CFG) >>$(BUILD_CFG_FILE) @echo VENDOR=$(VENDOR) >>$(BUILD_CFG_FILE) @@ -5471,14 +5664,22 @@ build_cfg_file: $(SETUPHDIR) @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE) @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE) @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE) + @echo USE_RTTI=$(USE_RTTI) >>$(BUILD_CFG_FILE) @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE) + @echo USE_AUI=$(USE_AUI) >>$(BUILD_CFG_FILE) @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE) @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE) - @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE) @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE) @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE) @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE) + @echo USE_PROPGRID=$(USE_PROPGRID) >>$(BUILD_CFG_FILE) + @echo USE_RIBBON=$(USE_RIBBON) >>$(BUILD_CFG_FILE) + @echo USE_RICHTEXT=$(USE_RICHTEXT) >>$(BUILD_CFG_FILE) + @echo USE_STC=$(USE_STC) >>$(BUILD_CFG_FILE) + @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE) + @echo USE_XRC=$(USE_XRC) >>$(BUILD_CFG_FILE) @echo COMPILER=gcc >>$(BUILD_CFG_FILE) + @echo COMPILER_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE) @echo CC=$(CC) >>$(BUILD_CFG_FILE) @echo CXX=$(CXX) >>$(BUILD_CFG_FILE) @echo CFLAGS=$(CFLAGS) >>$(BUILD_CFG_FILE) @@ -5768,12 +5969,21 @@ $(OBJS)\wxtiff_tif_flush.o: ../../src/tiff/libtiff/tif_flush.c $(OBJS)\wxtiff_tif_getimage.o: ../../src/tiff/libtiff/tif_getimage.c $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< +$(OBJS)\wxtiff_tif_jbig.o: ../../src/tiff/libtiff/tif_jbig.c + $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< + $(OBJS)\wxtiff_tif_jpeg.o: ../../src/tiff/libtiff/tif_jpeg.c $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< +$(OBJS)\wxtiff_tif_jpeg_12.o: ../../src/tiff/libtiff/tif_jpeg_12.c + $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< + $(OBJS)\wxtiff_tif_luv.o: ../../src/tiff/libtiff/tif_luv.c $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< +$(OBJS)\wxtiff_tif_lzma.o: ../../src/tiff/libtiff/tif_lzma.c + $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< + $(OBJS)\wxtiff_tif_lzw.o: ../../src/tiff/libtiff/tif_lzw.c $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< @@ -5834,277 +6044,328 @@ $(OBJS)\wxexpat_xmlrole.o: ../../src/expat/lib/xmlrole.c $(OBJS)\wxexpat_xmltok.o: ../../src/expat/lib/xmltok.c $(CC) -c -o $@ $(WXEXPAT_CFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_AutoComplete.o: ../../src/stc/scintilla/src/AutoComplete.cxx +$(OBJS)\wxscintilla_LexA68k.o: ../../src/stc/scintilla/lexers/LexA68k.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_CallTip.o: ../../src/stc/scintilla/src/CallTip.cxx +$(OBJS)\wxscintilla_LexAbaqus.o: ../../src/stc/scintilla/lexers/LexAbaqus.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_CellBuffer.o: ../../src/stc/scintilla/src/CellBuffer.cxx +$(OBJS)\wxscintilla_LexAda.o: ../../src/stc/scintilla/lexers/LexAda.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_CharClassify.o: ../../src/stc/scintilla/src/CharClassify.cxx +$(OBJS)\wxscintilla_LexAPDL.o: ../../src/stc/scintilla/lexers/LexAPDL.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_ContractionState.o: ../../src/stc/scintilla/src/ContractionState.cxx +$(OBJS)\wxscintilla_LexAsm.o: ../../src/stc/scintilla/lexers/LexAsm.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_Decoration.o: ../../src/stc/scintilla/src/Decoration.cxx +$(OBJS)\wxscintilla_LexAsn1.o: ../../src/stc/scintilla/lexers/LexAsn1.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_Document.o: ../../src/stc/scintilla/src/Document.cxx +$(OBJS)\wxscintilla_LexASY.o: ../../src/stc/scintilla/lexers/LexASY.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_DocumentAccessor.o: ../../src/stc/scintilla/src/DocumentAccessor.cxx +$(OBJS)\wxscintilla_LexAU3.o: ../../src/stc/scintilla/lexers/LexAU3.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_Editor.o: ../../src/stc/scintilla/src/Editor.cxx +$(OBJS)\wxscintilla_LexAVE.o: ../../src/stc/scintilla/lexers/LexAVE.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_ExternalLexer.o: ../../src/stc/scintilla/src/ExternalLexer.cxx +$(OBJS)\wxscintilla_LexAVS.o: ../../src/stc/scintilla/lexers/LexAVS.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_Indicator.o: ../../src/stc/scintilla/src/Indicator.cxx +$(OBJS)\wxscintilla_LexBaan.o: ../../src/stc/scintilla/lexers/LexBaan.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_KeyMap.o: ../../src/stc/scintilla/src/KeyMap.cxx +$(OBJS)\wxscintilla_LexBash.o: ../../src/stc/scintilla/lexers/LexBash.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\wxscintilla_LexBasic.o: ../../src/stc/scintilla/lexers/LexBasic.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\wxscintilla_LexBullant.o: ../../src/stc/scintilla/lexers/LexBullant.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\wxscintilla_LexCaml.o: ../../src/stc/scintilla/lexers/LexCaml.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\wxscintilla_LexCLW.o: ../../src/stc/scintilla/lexers/LexCLW.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_KeyWords.o: ../../src/stc/scintilla/src/KeyWords.cxx +$(OBJS)\wxscintilla_LexCmake.o: ../../src/stc/scintilla/lexers/LexCmake.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexAPDL.o: ../../src/stc/scintilla/src/LexAPDL.cxx +$(OBJS)\wxscintilla_LexCOBOL.o: ../../src/stc/scintilla/lexers/LexCOBOL.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexASY.o: ../../src/stc/scintilla/src/LexASY.cxx +$(OBJS)\wxscintilla_LexCoffeeScript.o: ../../src/stc/scintilla/lexers/LexCoffeeScript.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexAU3.o: ../../src/stc/scintilla/src/LexAU3.cxx +$(OBJS)\wxscintilla_LexConf.o: ../../src/stc/scintilla/lexers/LexConf.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexAVE.o: ../../src/stc/scintilla/src/LexAVE.cxx +$(OBJS)\wxscintilla_LexCPP.o: ../../src/stc/scintilla/lexers/LexCPP.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexAbaqus.o: ../../src/stc/scintilla/src/LexAbaqus.cxx +$(OBJS)\wxscintilla_LexCrontab.o: ../../src/stc/scintilla/lexers/LexCrontab.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexAda.o: ../../src/stc/scintilla/src/LexAda.cxx +$(OBJS)\wxscintilla_LexCsound.o: ../../src/stc/scintilla/lexers/LexCsound.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexAsm.o: ../../src/stc/scintilla/src/LexAsm.cxx +$(OBJS)\wxscintilla_LexCSS.o: ../../src/stc/scintilla/lexers/LexCSS.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexAsn1.o: ../../src/stc/scintilla/src/LexAsn1.cxx +$(OBJS)\wxscintilla_LexD.o: ../../src/stc/scintilla/lexers/LexD.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexBaan.o: ../../src/stc/scintilla/src/LexBaan.cxx +$(OBJS)\wxscintilla_LexECL.o: ../../src/stc/scintilla/lexers/LexECL.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexBash.o: ../../src/stc/scintilla/src/LexBash.cxx +$(OBJS)\wxscintilla_LexEiffel.o: ../../src/stc/scintilla/lexers/LexEiffel.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexBasic.o: ../../src/stc/scintilla/src/LexBasic.cxx +$(OBJS)\wxscintilla_LexErlang.o: ../../src/stc/scintilla/lexers/LexErlang.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexBullant.o: ../../src/stc/scintilla/src/LexBullant.cxx +$(OBJS)\wxscintilla_LexEScript.o: ../../src/stc/scintilla/lexers/LexEScript.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexCLW.o: ../../src/stc/scintilla/src/LexCLW.cxx +$(OBJS)\wxscintilla_LexFlagship.o: ../../src/stc/scintilla/lexers/LexFlagship.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexCOBOL.o: ../../src/stc/scintilla/src/LexCOBOL.cxx +$(OBJS)\wxscintilla_LexForth.o: ../../src/stc/scintilla/lexers/LexForth.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexCPP.o: ../../src/stc/scintilla/src/LexCPP.cxx +$(OBJS)\wxscintilla_LexFortran.o: ../../src/stc/scintilla/lexers/LexFortran.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexCSS.o: ../../src/stc/scintilla/src/LexCSS.cxx +$(OBJS)\wxscintilla_LexGAP.o: ../../src/stc/scintilla/lexers/LexGAP.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexCaml.o: ../../src/stc/scintilla/src/LexCaml.cxx +$(OBJS)\wxscintilla_LexGui4Cli.o: ../../src/stc/scintilla/lexers/LexGui4Cli.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexCmake.o: ../../src/stc/scintilla/src/LexCmake.cxx +$(OBJS)\wxscintilla_LexHaskell.o: ../../src/stc/scintilla/lexers/LexHaskell.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexConf.o: ../../src/stc/scintilla/src/LexConf.cxx +$(OBJS)\wxscintilla_LexHTML.o: ../../src/stc/scintilla/lexers/LexHTML.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexCrontab.o: ../../src/stc/scintilla/src/LexCrontab.cxx +$(OBJS)\wxscintilla_LexInno.o: ../../src/stc/scintilla/lexers/LexInno.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexCsound.o: ../../src/stc/scintilla/src/LexCsound.cxx +$(OBJS)\wxscintilla_LexKix.o: ../../src/stc/scintilla/lexers/LexKix.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexD.o: ../../src/stc/scintilla/src/LexD.cxx +$(OBJS)\wxscintilla_LexLisp.o: ../../src/stc/scintilla/lexers/LexLisp.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexEScript.o: ../../src/stc/scintilla/src/LexEScript.cxx +$(OBJS)\wxscintilla_LexLout.o: ../../src/stc/scintilla/lexers/LexLout.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexEiffel.o: ../../src/stc/scintilla/src/LexEiffel.cxx +$(OBJS)\wxscintilla_LexLua.o: ../../src/stc/scintilla/lexers/LexLua.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexErlang.o: ../../src/stc/scintilla/src/LexErlang.cxx +$(OBJS)\wxscintilla_LexMagik.o: ../../src/stc/scintilla/lexers/LexMagik.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexFlagship.o: ../../src/stc/scintilla/src/LexFlagship.cxx +$(OBJS)\wxscintilla_LexMarkdown.o: ../../src/stc/scintilla/lexers/LexMarkdown.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexForth.o: ../../src/stc/scintilla/src/LexForth.cxx +$(OBJS)\wxscintilla_LexMatlab.o: ../../src/stc/scintilla/lexers/LexMatlab.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexFortran.o: ../../src/stc/scintilla/src/LexFortran.cxx +$(OBJS)\wxscintilla_LexMetapost.o: ../../src/stc/scintilla/lexers/LexMetapost.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexGAP.o: ../../src/stc/scintilla/src/LexGAP.cxx +$(OBJS)\wxscintilla_LexMMIXAL.o: ../../src/stc/scintilla/lexers/LexMMIXAL.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexGui4Cli.o: ../../src/stc/scintilla/src/LexGui4Cli.cxx +$(OBJS)\wxscintilla_LexModula.o: ../../src/stc/scintilla/lexers/LexModula.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexHTML.o: ../../src/stc/scintilla/src/LexHTML.cxx +$(OBJS)\wxscintilla_LexMPT.o: ../../src/stc/scintilla/lexers/LexMPT.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexHaskell.o: ../../src/stc/scintilla/src/LexHaskell.cxx +$(OBJS)\wxscintilla_LexMSSQL.o: ../../src/stc/scintilla/lexers/LexMSSQL.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexInno.o: ../../src/stc/scintilla/src/LexInno.cxx +$(OBJS)\wxscintilla_LexMySQL.o: ../../src/stc/scintilla/lexers/LexMySQL.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexKix.o: ../../src/stc/scintilla/src/LexKix.cxx +$(OBJS)\wxscintilla_LexNimrod.o: ../../src/stc/scintilla/lexers/LexNimrod.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexLisp.o: ../../src/stc/scintilla/src/LexLisp.cxx +$(OBJS)\wxscintilla_LexNsis.o: ../../src/stc/scintilla/lexers/LexNsis.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexLout.o: ../../src/stc/scintilla/src/LexLout.cxx +$(OBJS)\wxscintilla_LexOpal.o: ../../src/stc/scintilla/lexers/LexOpal.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexLua.o: ../../src/stc/scintilla/src/LexLua.cxx +$(OBJS)\wxscintilla_LexOScript.o: ../../src/stc/scintilla/lexers/LexOScript.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexMMIXAL.o: ../../src/stc/scintilla/src/LexMMIXAL.cxx +$(OBJS)\wxscintilla_LexOthers.o: ../../src/stc/scintilla/lexers/LexOthers.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexMPT.o: ../../src/stc/scintilla/src/LexMPT.cxx +$(OBJS)\wxscintilla_LexPascal.o: ../../src/stc/scintilla/lexers/LexPascal.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexMSSQL.o: ../../src/stc/scintilla/src/LexMSSQL.cxx +$(OBJS)\wxscintilla_LexPB.o: ../../src/stc/scintilla/lexers/LexPB.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexMagik.o: ../../src/stc/scintilla/src/LexMagik.cxx +$(OBJS)\wxscintilla_LexPerl.o: ../../src/stc/scintilla/lexers/LexPerl.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexMarkdown.o: ../../src/stc/scintilla/src/LexMarkdown.cxx +$(OBJS)\wxscintilla_LexPLM.o: ../../src/stc/scintilla/lexers/LexPLM.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexMatlab.o: ../../src/stc/scintilla/src/LexMatlab.cxx +$(OBJS)\wxscintilla_LexPOV.o: ../../src/stc/scintilla/lexers/LexPOV.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexMetapost.o: ../../src/stc/scintilla/src/LexMetapost.cxx +$(OBJS)\wxscintilla_LexPowerPro.o: ../../src/stc/scintilla/lexers/LexPowerPro.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexMySQL.o: ../../src/stc/scintilla/src/LexMySQL.cxx +$(OBJS)\wxscintilla_LexPowerShell.o: ../../src/stc/scintilla/lexers/LexPowerShell.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexNimrod.o: ../../src/stc/scintilla/src/LexNimrod.cxx +$(OBJS)\wxscintilla_LexProgress.o: ../../src/stc/scintilla/lexers/LexProgress.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexNsis.o: ../../src/stc/scintilla/src/LexNsis.cxx +$(OBJS)\wxscintilla_LexPS.o: ../../src/stc/scintilla/lexers/LexPS.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexOpal.o: ../../src/stc/scintilla/src/LexOpal.cxx +$(OBJS)\wxscintilla_LexPython.o: ../../src/stc/scintilla/lexers/LexPython.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexOthers.o: ../../src/stc/scintilla/src/LexOthers.cxx +$(OBJS)\wxscintilla_LexR.o: ../../src/stc/scintilla/lexers/LexR.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexPB.o: ../../src/stc/scintilla/src/LexPB.cxx +$(OBJS)\wxscintilla_LexRebol.o: ../../src/stc/scintilla/lexers/LexRebol.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexPLM.o: ../../src/stc/scintilla/src/LexPLM.cxx +$(OBJS)\wxscintilla_LexRuby.o: ../../src/stc/scintilla/lexers/LexRuby.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexPOV.o: ../../src/stc/scintilla/src/LexPOV.cxx +$(OBJS)\wxscintilla_LexScriptol.o: ../../src/stc/scintilla/lexers/LexScriptol.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexPS.o: ../../src/stc/scintilla/src/LexPS.cxx +$(OBJS)\wxscintilla_LexSmalltalk.o: ../../src/stc/scintilla/lexers/LexSmalltalk.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexPascal.o: ../../src/stc/scintilla/src/LexPascal.cxx +$(OBJS)\wxscintilla_LexSML.o: ../../src/stc/scintilla/lexers/LexSML.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexPerl.o: ../../src/stc/scintilla/src/LexPerl.cxx +$(OBJS)\wxscintilla_LexSorcus.o: ../../src/stc/scintilla/lexers/LexSorcus.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexPowerPro.o: ../../src/stc/scintilla/src/LexPowerPro.cxx +$(OBJS)\wxscintilla_LexSpecman.o: ../../src/stc/scintilla/lexers/LexSpecman.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexPowerShell.o: ../../src/stc/scintilla/src/LexPowerShell.cxx +$(OBJS)\wxscintilla_LexSpice.o: ../../src/stc/scintilla/lexers/LexSpice.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexProgress.o: ../../src/stc/scintilla/src/LexProgress.cxx +$(OBJS)\wxscintilla_LexSQL.o: ../../src/stc/scintilla/lexers/LexSQL.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexPython.o: ../../src/stc/scintilla/src/LexPython.cxx +$(OBJS)\wxscintilla_LexTACL.o: ../../src/stc/scintilla/lexers/LexTACL.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexR.o: ../../src/stc/scintilla/src/LexR.cxx +$(OBJS)\wxscintilla_LexTADS3.o: ../../src/stc/scintilla/lexers/LexTADS3.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexRebol.o: ../../src/stc/scintilla/src/LexRebol.cxx +$(OBJS)\wxscintilla_LexTAL.o: ../../src/stc/scintilla/lexers/LexTAL.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexRuby.o: ../../src/stc/scintilla/src/LexRuby.cxx +$(OBJS)\wxscintilla_LexTCL.o: ../../src/stc/scintilla/lexers/LexTCL.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexSML.o: ../../src/stc/scintilla/src/LexSML.cxx +$(OBJS)\wxscintilla_LexTCMD.o: ../../src/stc/scintilla/lexers/LexTCMD.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexSQL.o: ../../src/stc/scintilla/src/LexSQL.cxx +$(OBJS)\wxscintilla_LexTeX.o: ../../src/stc/scintilla/lexers/LexTeX.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexScriptol.o: ../../src/stc/scintilla/src/LexScriptol.cxx +$(OBJS)\wxscintilla_LexTxt2tags.o: ../../src/stc/scintilla/lexers/LexTxt2tags.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexSmalltalk.o: ../../src/stc/scintilla/src/LexSmalltalk.cxx +$(OBJS)\wxscintilla_LexVB.o: ../../src/stc/scintilla/lexers/LexVB.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexSorcus.o: ../../src/stc/scintilla/src/LexSorcus.cxx +$(OBJS)\wxscintilla_LexVerilog.o: ../../src/stc/scintilla/lexers/LexVerilog.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexSpecman.o: ../../src/stc/scintilla/src/LexSpecman.cxx +$(OBJS)\wxscintilla_LexVHDL.o: ../../src/stc/scintilla/lexers/LexVHDL.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexSpice.o: ../../src/stc/scintilla/src/LexSpice.cxx +$(OBJS)\wxscintilla_LexVisualProlog.o: ../../src/stc/scintilla/lexers/LexVisualProlog.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexTACL.o: ../../src/stc/scintilla/src/LexTACL.cxx +$(OBJS)\wxscintilla_LexYAML.o: ../../src/stc/scintilla/lexers/LexYAML.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexTADS3.o: ../../src/stc/scintilla/src/LexTADS3.cxx +$(OBJS)\wxscintilla_Accessor.o: ../../src/stc/scintilla/lexlib/Accessor.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexTAL.o: ../../src/stc/scintilla/src/LexTAL.cxx +$(OBJS)\wxscintilla_CharacterSet.o: ../../src/stc/scintilla/lexlib/CharacterSet.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexTCL.o: ../../src/stc/scintilla/src/LexTCL.cxx +$(OBJS)\wxscintilla_LexerBase.o: ../../src/stc/scintilla/lexlib/LexerBase.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexTeX.o: ../../src/stc/scintilla/src/LexTeX.cxx +$(OBJS)\wxscintilla_LexerModule.o: ../../src/stc/scintilla/lexlib/LexerModule.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexVB.o: ../../src/stc/scintilla/src/LexVB.cxx +$(OBJS)\wxscintilla_LexerNoExceptions.o: ../../src/stc/scintilla/lexlib/LexerNoExceptions.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexVHDL.o: ../../src/stc/scintilla/src/LexVHDL.cxx +$(OBJS)\wxscintilla_LexerSimple.o: ../../src/stc/scintilla/lexlib/LexerSimple.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexVerilog.o: ../../src/stc/scintilla/src/LexVerilog.cxx +$(OBJS)\wxscintilla_PropSetSimple.o: ../../src/stc/scintilla/lexlib/PropSetSimple.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_LexYAML.o: ../../src/stc/scintilla/src/LexYAML.cxx +$(OBJS)\wxscintilla_StyleContext.o: ../../src/stc/scintilla/lexlib/StyleContext.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\wxscintilla_WordList.o: ../../src/stc/scintilla/lexlib/WordList.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\wxscintilla_AutoComplete.o: ../../src/stc/scintilla/src/AutoComplete.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\wxscintilla_CallTip.o: ../../src/stc/scintilla/src/CallTip.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\wxscintilla_Catalogue.o: ../../src/stc/scintilla/src/Catalogue.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\wxscintilla_CellBuffer.o: ../../src/stc/scintilla/src/CellBuffer.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\wxscintilla_CharClassify.o: ../../src/stc/scintilla/src/CharClassify.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\wxscintilla_ContractionState.o: ../../src/stc/scintilla/src/ContractionState.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\wxscintilla_Decoration.o: ../../src/stc/scintilla/src/Decoration.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\wxscintilla_Document.o: ../../src/stc/scintilla/src/Document.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\wxscintilla_Editor.o: ../../src/stc/scintilla/src/Editor.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\wxscintilla_ExternalLexer.o: ../../src/stc/scintilla/src/ExternalLexer.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\wxscintilla_Indicator.o: ../../src/stc/scintilla/src/Indicator.cxx + $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\wxscintilla_KeyMap.o: ../../src/stc/scintilla/src/KeyMap.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\wxscintilla_LineMarker.o: ../../src/stc/scintilla/src/LineMarker.cxx @@ -6116,9 +6377,6 @@ $(OBJS)\wxscintilla_PerLine.o: ../../src/stc/scintilla/src/PerLine.cxx $(OBJS)\wxscintilla_PositionCache.o: ../../src/stc/scintilla/src/PositionCache.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_PropSet.o: ../../src/stc/scintilla/src/PropSet.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\wxscintilla_RESearch.o: ../../src/stc/scintilla/src/RESearch.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< @@ -6134,18 +6392,12 @@ $(OBJS)\wxscintilla_Selection.o: ../../src/stc/scintilla/src/Selection.cxx $(OBJS)\wxscintilla_Style.o: ../../src/stc/scintilla/src/Style.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_StyleContext.o: ../../src/stc/scintilla/src/StyleContext.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\wxscintilla_UniConversion.o: ../../src/stc/scintilla/src/UniConversion.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\wxscintilla_ViewStyle.o: ../../src/stc/scintilla/src/ViewStyle.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\wxscintilla_WindowAccessor.o: ../../src/stc/scintilla/src/WindowAccessor.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\wxscintilla_XPM.o: ../../src/stc/scintilla/src/XPM.cxx $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< @@ -6350,6 +6602,9 @@ $(OBJS)\monodll_textbuf.o: ../../src/common/textbuf.cpp $(OBJS)\monodll_textfile.o: ../../src/common/textfile.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_time.o: ../../src/common/time.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_timercmn.o: ../../src/common/timercmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -6425,6 +6680,9 @@ $(OBJS)\monodll_dir.o: ../../src/msw/dir.cpp $(OBJS)\monodll_dlmsw.o: ../../src/msw/dlmsw.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_evtloopconsole.o: ../../src/msw/evtloopconsole.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_mimetype.o: ../../src/msw/mimetype.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -6473,9 +6731,6 @@ $(OBJS)\monodll_msgout.o: ../../src/common/msgout.cpp $(OBJS)\monodll_utilscmn.o: ../../src/common/utilscmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monodll_evtloop.o: ../../src/msw/evtloop.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\monodll_main.o: ../../src/msw/main.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -6842,9 +7097,15 @@ $(OBJS)\monodll_datecontrols.o: ../../src/msw/datecontrols.cpp $(OBJS)\monodll_datectrl.o: ../../src/msw/datectrl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_datetimectrl.o: ../../src/msw/datetimectrl.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_hyperlink.o: ../../src/msw/hyperlink.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_timectrl.o: ../../src/msw/timectrl.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -6944,6 +7205,9 @@ $(OBJS)\monodll_webview.o: ../../src/common/webview.cpp $(OBJS)\monodll_webviewarchivehandler.o: ../../src/common/webviewarchivehandler.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_webviewfshandler.o: ../../src/common/webviewfshandler.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_debugrpt.o: ../../src/common/debugrpt.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -6953,6 +7217,9 @@ $(OBJS)\monodll_dbgrptg.o: ../../src/generic/dbgrptg.cpp $(OBJS)\monodll_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_xh_bannerwindow.o: ../../src/xrc/xh_bannerwindow.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_xh_bmp.o: ../../src/xrc/xh_bmp.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7112,6 +7379,9 @@ $(OBJS)\monodll_xh_text.o: ../../src/xrc/xh_text.cpp $(OBJS)\monodll_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_xh_timectrl.o: ../../src/xrc/xh_timectrl.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_xh_toolb.o: ../../src/xrc/xh_toolb.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7157,6 +7427,12 @@ $(OBJS)\monodll_auibar.o: ../../src/aui/auibar.cpp $(OBJS)\monodll_tabmdi.o: ../../src/aui/tabmdi.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_tabart.o: ../../src/aui/tabart.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\monodll_xh_auinotbk.o: ../../src/xrc/xh_auinotbk.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_advprops.o: ../../src/propgrid/advprops.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7211,6 +7487,9 @@ $(OBJS)\monodll_ribbon_panel.o: ../../src/ribbon/panel.cpp $(OBJS)\monodll_ribbon_toolbar.o: ../../src/ribbon/toolbar.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_xh_ribbon.o: ../../src/xrc/xh_ribbon.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_richtextbuffer.o: ../../src/richtext/richtextbuffer.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7241,6 +7520,9 @@ $(OBJS)\monodll_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cpp $(OBJS)\monodll_richtextxml.o: ../../src/richtext/richtextxml.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_xh_richtext.o: ../../src/xrc/xh_richtext.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_stc.o: ../../src/stc/stc.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7396,6 +7678,11 @@ $(OBJS)\monodll_minifram.o: ../../src/msw/minifram.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_nonownedwnd.o: ../../src/msw/nonownedwnd.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_dataobj.o: ../../src/msw/ole/dataobj.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7416,6 +7703,11 @@ $(OBJS)\monodll_oleutils.o: ../../src/msw/ole/oleutils.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_safearray.o: ../../src/msw/ole/safearray.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_palette.o: ../../src/msw/palette.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7456,6 +7748,11 @@ $(OBJS)\monodll_settings.o: ../../src/msw/settings.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_textmeasure.o: ../../src/msw/textmeasure.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_tooltip.o: ../../src/msw/tooltip.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7476,6 +7773,11 @@ $(OBJS)\monodll_utilsgui.o: ../../src/msw/utilsgui.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_utilswin.o: ../../src/msw/utilswin.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_uxtheme.o: ../../src/msw/uxtheme.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7531,6 +7833,11 @@ $(OBJS)\monodll_prntdlgg.o: ../../src/generic/prntdlgg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_evtloop.o: ../../src/msw/evtloop.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_accelcmn.o: ../../src/common/accelcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7941,6 +8248,11 @@ $(OBJS)\monodll_menucmn.o: ../../src/common/menucmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_modalhook.o: ../../src/common/modalhook.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_mousemanager.o: ../../src/common/mousemanager.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7986,6 +8298,11 @@ $(OBJS)\monodll_popupcmn.o: ../../src/common/popupcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_preferencescmn.o: ../../src/common/preferencescmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_prntbase.o: ../../src/common/prntbase.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -8101,6 +8418,11 @@ $(OBJS)\monodll_textentrycmn.o: ../../src/common/textentrycmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_textmeasurecmn.o: ../../src/common/textmeasurecmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_toplvcmn.o: ../../src/common/toplvcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -8237,12 +8559,12 @@ $(OBJS)\monodll_numdlgg.o: ../../src/generic/numdlgg.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_panelg.o: ../../src/generic/panelg.cpp +$(OBJS)\monodll_progdlgg.o: ../../src/generic/progdlgg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_progdlgg.o: ../../src/generic/progdlgg.cpp +$(OBJS)\monodll_preferencesg.o: ../../src/generic/preferencesg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -8331,6 +8653,11 @@ $(OBJS)\monodll_vscroll.o: ../../src/generic/vscroll.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_xmlreshandler.o: ../../src/xrc/xmlreshandler.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_animatecmn.o: ../../src/common/animatecmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -8366,11 +8693,21 @@ $(OBJS)\monodll_odcombocmn.o: ../../src/common/odcombocmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_richtooltipcmn.o: ../../src/common/richtooltipcmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_bannerwindow.o: ../../src/generic/bannerwindow.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_bmpcboxg.o: ../../src/generic/bmpcboxg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -8451,6 +8788,11 @@ $(OBJS)\monodll_propdlg.o: ../../src/generic/propdlg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_richtooltipg.o: ../../src/generic/richtooltipg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_sashwin.o: ../../src/generic/sashwin.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -8461,11 +8803,21 @@ $(OBJS)\monodll_splash.o: ../../src/generic/splash.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_timectrlg.o: ../../src/generic/timectrlg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_tipdlg.o: ../../src/generic/tipdlg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_treelist.o: ../../src/generic/treelist.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_wizard.o: ../../src/generic/wizard.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -8486,6 +8838,11 @@ $(OBJS)\monodll_notifmsg.o: ../../src/msw/notifmsg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_richtooltip.o: ../../src/msw/richtooltip.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_sound.o: ../../src/msw/sound.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -8507,7 +8864,7 @@ $(OBJS)\monodll_animateg.o: ../../src/generic/animateg.cpp endif $(OBJS)\monodll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --include-dir ../../src/stc/scintilla/include --include-dir ../../src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define wxUSE_BASE=1 --define WXMAKINGDLL + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --include-dir ../../src/stc/scintilla/include --include-dir ../../src/stc/scintilla/lexlib --include-dir ../../src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define wxUSE_BASE=1 --define WXMAKINGDLL $(OBJS)\monolib_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -8710,6 +9067,9 @@ $(OBJS)\monolib_textbuf.o: ../../src/common/textbuf.cpp $(OBJS)\monolib_textfile.o: ../../src/common/textfile.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_time.o: ../../src/common/time.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_timercmn.o: ../../src/common/timercmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -8785,6 +9145,9 @@ $(OBJS)\monolib_dir.o: ../../src/msw/dir.cpp $(OBJS)\monolib_dlmsw.o: ../../src/msw/dlmsw.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_evtloopconsole.o: ../../src/msw/evtloopconsole.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_mimetype.o: ../../src/msw/mimetype.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -8833,9 +9196,6 @@ $(OBJS)\monolib_msgout.o: ../../src/common/msgout.cpp $(OBJS)\monolib_utilscmn.o: ../../src/common/utilscmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monolib_evtloop.o: ../../src/msw/evtloop.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\monolib_main.o: ../../src/msw/main.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9202,9 +9562,15 @@ $(OBJS)\monolib_datecontrols.o: ../../src/msw/datecontrols.cpp $(OBJS)\monolib_datectrl.o: ../../src/msw/datectrl.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_datetimectrl.o: ../../src/msw/datetimectrl.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_hyperlink.o: ../../src/msw/hyperlink.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_timectrl.o: ../../src/msw/timectrl.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9304,6 +9670,9 @@ $(OBJS)\monolib_webview.o: ../../src/common/webview.cpp $(OBJS)\monolib_webviewarchivehandler.o: ../../src/common/webviewarchivehandler.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_webviewfshandler.o: ../../src/common/webviewfshandler.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_debugrpt.o: ../../src/common/debugrpt.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9313,6 +9682,9 @@ $(OBJS)\monolib_dbgrptg.o: ../../src/generic/dbgrptg.cpp $(OBJS)\monolib_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_xh_bannerwindow.o: ../../src/xrc/xh_bannerwindow.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_xh_bmp.o: ../../src/xrc/xh_bmp.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9472,6 +9844,9 @@ $(OBJS)\monolib_xh_text.o: ../../src/xrc/xh_text.cpp $(OBJS)\monolib_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_xh_timectrl.o: ../../src/xrc/xh_timectrl.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_xh_toolb.o: ../../src/xrc/xh_toolb.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9517,6 +9892,12 @@ $(OBJS)\monolib_auibar.o: ../../src/aui/auibar.cpp $(OBJS)\monolib_tabmdi.o: ../../src/aui/tabmdi.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_tabart.o: ../../src/aui/tabart.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\monolib_xh_auinotbk.o: ../../src/xrc/xh_auinotbk.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_advprops.o: ../../src/propgrid/advprops.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9571,6 +9952,9 @@ $(OBJS)\monolib_ribbon_panel.o: ../../src/ribbon/panel.cpp $(OBJS)\monolib_ribbon_toolbar.o: ../../src/ribbon/toolbar.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_xh_ribbon.o: ../../src/xrc/xh_ribbon.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_richtextbuffer.o: ../../src/richtext/richtextbuffer.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9601,6 +9985,9 @@ $(OBJS)\monolib_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cpp $(OBJS)\monolib_richtextxml.o: ../../src/richtext/richtextxml.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_xh_richtext.o: ../../src/xrc/xh_richtext.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_stc.o: ../../src/stc/stc.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9756,6 +10143,11 @@ $(OBJS)\monolib_minifram.o: ../../src/msw/minifram.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_nonownedwnd.o: ../../src/msw/nonownedwnd.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_dataobj.o: ../../src/msw/ole/dataobj.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9776,6 +10168,11 @@ $(OBJS)\monolib_oleutils.o: ../../src/msw/ole/oleutils.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_safearray.o: ../../src/msw/ole/safearray.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_palette.o: ../../src/msw/palette.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9816,6 +10213,11 @@ $(OBJS)\monolib_settings.o: ../../src/msw/settings.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_textmeasure.o: ../../src/msw/textmeasure.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_tooltip.o: ../../src/msw/tooltip.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9836,6 +10238,11 @@ $(OBJS)\monolib_utilsgui.o: ../../src/msw/utilsgui.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_utilswin.o: ../../src/msw/utilswin.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_uxtheme.o: ../../src/msw/uxtheme.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9891,6 +10298,11 @@ $(OBJS)\monolib_prntdlgg.o: ../../src/generic/prntdlgg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_evtloop.o: ../../src/msw/evtloop.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_accelcmn.o: ../../src/common/accelcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -10301,6 +10713,11 @@ $(OBJS)\monolib_menucmn.o: ../../src/common/menucmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_modalhook.o: ../../src/common/modalhook.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_mousemanager.o: ../../src/common/mousemanager.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -10346,6 +10763,11 @@ $(OBJS)\monolib_popupcmn.o: ../../src/common/popupcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_preferencescmn.o: ../../src/common/preferencescmn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_prntbase.o: ../../src/common/prntbase.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -10461,6 +10883,11 @@ $(OBJS)\monolib_textentrycmn.o: ../../src/common/textentrycmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_textmeasurecmn.o: ../../src/common/textmeasurecmn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_toplvcmn.o: ../../src/common/toplvcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -10597,12 +11024,12 @@ $(OBJS)\monolib_numdlgg.o: ../../src/generic/numdlgg.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\monolib_panelg.o: ../../src/generic/panelg.cpp +$(OBJS)\monolib_progdlgg.o: ../../src/generic/progdlgg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monolib_progdlgg.o: ../../src/generic/progdlgg.cpp +$(OBJS)\monolib_preferencesg.o: ../../src/generic/preferencesg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif @@ -10691,6 +11118,11 @@ $(OBJS)\monolib_vscroll.o: ../../src/generic/vscroll.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_xmlreshandler.o: ../../src/xrc/xmlreshandler.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_animatecmn.o: ../../src/common/animatecmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -10726,11 +11158,21 @@ $(OBJS)\monolib_odcombocmn.o: ../../src/common/odcombocmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_richtooltipcmn.o: ../../src/common/richtooltipcmn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_bannerwindow.o: ../../src/generic/bannerwindow.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_bmpcboxg.o: ../../src/generic/bmpcboxg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -10811,6 +11253,11 @@ $(OBJS)\monolib_propdlg.o: ../../src/generic/propdlg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_richtooltipg.o: ../../src/generic/richtooltipg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_sashwin.o: ../../src/generic/sashwin.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -10821,11 +11268,21 @@ $(OBJS)\monolib_splash.o: ../../src/generic/splash.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_timectrlg.o: ../../src/generic/timectrlg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_tipdlg.o: ../../src/generic/tipdlg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_treelist.o: ../../src/generic/treelist.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_wizard.o: ../../src/generic/wizard.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -10846,6 +11303,11 @@ $(OBJS)\monolib_notifmsg.o: ../../src/msw/notifmsg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_richtooltip.o: ../../src/msw/richtooltip.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_sound.o: ../../src/msw/sound.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -10870,7 +11332,7 @@ $(OBJS)\basedll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\basedll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1 + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1 $(OBJS)\basedll_any.o: ../../src/common/any.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< @@ -11070,6 +11532,9 @@ $(OBJS)\basedll_textbuf.o: ../../src/common/textbuf.cpp $(OBJS)\basedll_textfile.o: ../../src/common/textfile.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\basedll_time.o: ../../src/common/time.cpp + $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\basedll_timercmn.o: ../../src/common/timercmn.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< @@ -11145,6 +11610,9 @@ $(OBJS)\basedll_dir.o: ../../src/msw/dir.cpp $(OBJS)\basedll_dlmsw.o: ../../src/msw/dlmsw.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\basedll_evtloopconsole.o: ../../src/msw/evtloopconsole.cpp + $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\basedll_mimetype.o: ../../src/msw/mimetype.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< @@ -11193,9 +11661,6 @@ $(OBJS)\basedll_msgout.o: ../../src/common/msgout.cpp $(OBJS)\basedll_utilscmn.o: ../../src/common/utilscmn.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\basedll_evtloop.o: ../../src/msw/evtloop.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\basedll_main.o: ../../src/msw/main.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< @@ -11406,6 +11871,9 @@ $(OBJS)\baselib_textbuf.o: ../../src/common/textbuf.cpp $(OBJS)\baselib_textfile.o: ../../src/common/textfile.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\baselib_time.o: ../../src/common/time.cpp + $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\baselib_timercmn.o: ../../src/common/timercmn.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< @@ -11481,6 +11949,9 @@ $(OBJS)\baselib_dir.o: ../../src/msw/dir.cpp $(OBJS)\baselib_dlmsw.o: ../../src/msw/dlmsw.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\baselib_evtloopconsole.o: ../../src/msw/evtloopconsole.cpp + $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\baselib_mimetype.o: ../../src/msw/mimetype.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< @@ -11529,9 +12000,6 @@ $(OBJS)\baselib_msgout.o: ../../src/common/msgout.cpp $(OBJS)\baselib_utilscmn.o: ../../src/common/utilscmn.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\baselib_evtloop.o: ../../src/msw/evtloop.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\baselib_main.o: ../../src/msw/main.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< @@ -11545,7 +12013,7 @@ $(OBJS)\netdll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\netdll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET $(OBJS)\netdll_fs_inet.o: ../../src/common/fs_inet.cpp $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $(CPPDEPS) $< @@ -11626,7 +12094,7 @@ $(OBJS)\coredll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\coredll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0 + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0 $(OBJS)\coredll_event.o: ../../src/common/event.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -11640,9 +12108,6 @@ $(OBJS)\coredll_msgout.o: ../../src/common/msgout.cpp $(OBJS)\coredll_utilscmn.o: ../../src/common/utilscmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\coredll_evtloop.o: ../../src/msw/evtloop.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\coredll_main.o: ../../src/msw/main.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -12098,6 +12563,11 @@ $(OBJS)\coredll_minifram.o: ../../src/msw/minifram.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_nonownedwnd.o: ../../src/msw/nonownedwnd.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_dataobj.o: ../../src/msw/ole/dataobj.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -12118,6 +12588,11 @@ $(OBJS)\coredll_oleutils.o: ../../src/msw/ole/oleutils.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_safearray.o: ../../src/msw/ole/safearray.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_palette.o: ../../src/msw/palette.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -12158,6 +12633,11 @@ $(OBJS)\coredll_settings.o: ../../src/msw/settings.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_textmeasure.o: ../../src/msw/textmeasure.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_tooltip.o: ../../src/msw/tooltip.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -12178,6 +12658,11 @@ $(OBJS)\coredll_utilsgui.o: ../../src/msw/utilsgui.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_utilswin.o: ../../src/msw/utilswin.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_uxtheme.o: ../../src/msw/uxtheme.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -12233,6 +12718,11 @@ $(OBJS)\coredll_prntdlgg.o: ../../src/generic/prntdlgg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_evtloop.o: ../../src/msw/evtloop.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_accelcmn.o: ../../src/common/accelcmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -12643,6 +13133,11 @@ $(OBJS)\coredll_menucmn.o: ../../src/common/menucmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_modalhook.o: ../../src/common/modalhook.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_mousemanager.o: ../../src/common/mousemanager.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -12688,6 +13183,11 @@ $(OBJS)\coredll_popupcmn.o: ../../src/common/popupcmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_preferencescmn.o: ../../src/common/preferencescmn.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_prntbase.o: ../../src/common/prntbase.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -12803,6 +13303,11 @@ $(OBJS)\coredll_textentrycmn.o: ../../src/common/textentrycmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_textmeasurecmn.o: ../../src/common/textmeasurecmn.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_toplvcmn.o: ../../src/common/toplvcmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -12939,12 +13444,12 @@ $(OBJS)\coredll_numdlgg.o: ../../src/generic/numdlgg.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\coredll_panelg.o: ../../src/generic/panelg.cpp +$(OBJS)\coredll_progdlgg.o: ../../src/generic/progdlgg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\coredll_progdlgg.o: ../../src/generic/progdlgg.cpp +$(OBJS)\coredll_preferencesg.o: ../../src/generic/preferencesg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -13033,6 +13538,11 @@ $(OBJS)\coredll_vscroll.o: ../../src/generic/vscroll.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_xmlreshandler.o: ../../src/xrc/xmlreshandler.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + $(OBJS)\corelib_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -13048,9 +13558,6 @@ $(OBJS)\corelib_msgout.o: ../../src/common/msgout.cpp $(OBJS)\corelib_utilscmn.o: ../../src/common/utilscmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\corelib_evtloop.o: ../../src/msw/evtloop.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\corelib_main.o: ../../src/msw/main.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -13506,6 +14013,11 @@ $(OBJS)\corelib_minifram.o: ../../src/msw/minifram.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_nonownedwnd.o: ../../src/msw/nonownedwnd.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_dataobj.o: ../../src/msw/ole/dataobj.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -13526,6 +14038,11 @@ $(OBJS)\corelib_oleutils.o: ../../src/msw/ole/oleutils.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_safearray.o: ../../src/msw/ole/safearray.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_palette.o: ../../src/msw/palette.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -13566,6 +14083,11 @@ $(OBJS)\corelib_settings.o: ../../src/msw/settings.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_textmeasure.o: ../../src/msw/textmeasure.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_tooltip.o: ../../src/msw/tooltip.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -13586,6 +14108,11 @@ $(OBJS)\corelib_utilsgui.o: ../../src/msw/utilsgui.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_utilswin.o: ../../src/msw/utilswin.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_uxtheme.o: ../../src/msw/uxtheme.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -13641,6 +14168,11 @@ $(OBJS)\corelib_prntdlgg.o: ../../src/generic/prntdlgg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_evtloop.o: ../../src/msw/evtloop.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_accelcmn.o: ../../src/common/accelcmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -14051,6 +14583,11 @@ $(OBJS)\corelib_menucmn.o: ../../src/common/menucmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_modalhook.o: ../../src/common/modalhook.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_mousemanager.o: ../../src/common/mousemanager.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -14096,6 +14633,11 @@ $(OBJS)\corelib_popupcmn.o: ../../src/common/popupcmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_preferencescmn.o: ../../src/common/preferencescmn.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_prntbase.o: ../../src/common/prntbase.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -14211,6 +14753,11 @@ $(OBJS)\corelib_textentrycmn.o: ../../src/common/textentrycmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_textmeasurecmn.o: ../../src/common/textmeasurecmn.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_toplvcmn.o: ../../src/common/toplvcmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -14347,12 +14894,12 @@ $(OBJS)\corelib_numdlgg.o: ../../src/generic/numdlgg.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\corelib_panelg.o: ../../src/generic/panelg.cpp +$(OBJS)\corelib_progdlgg.o: ../../src/generic/progdlgg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\corelib_progdlgg.o: ../../src/generic/progdlgg.cpp +$(OBJS)\corelib_preferencesg.o: ../../src/generic/preferencesg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif @@ -14441,11 +14988,16 @@ $(OBJS)\corelib_vscroll.o: ../../src/generic/vscroll.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_xmlreshandler.o: ../../src/xrc/xmlreshandler.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + $(OBJS)\advdll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\advdll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_ADV + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_ADV $(OBJS)\advdll_bmpcbox.o: ../../src/msw/bmpcbox.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< @@ -14462,9 +15014,15 @@ $(OBJS)\advdll_datecontrols.o: ../../src/msw/datecontrols.cpp $(OBJS)\advdll_datectrl.o: ../../src/msw/datectrl.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\advdll_datetimectrl.o: ../../src/msw/datetimectrl.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advdll_hyperlink.o: ../../src/msw/hyperlink.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\advdll_timectrl.o: ../../src/msw/timectrl.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advdll_animatecmn.o: ../../src/common/animatecmn.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< @@ -14486,9 +15044,15 @@ $(OBJS)\advdll_hyperlnkcmn.o: ../../src/common/hyperlnkcmn.cpp $(OBJS)\advdll_odcombocmn.o: ../../src/common/odcombocmn.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\advdll_richtooltipcmn.o: ../../src/common/richtooltipcmn.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advdll_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\advdll_bannerwindow.o: ../../src/generic/bannerwindow.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advdll_bmpcboxg.o: ../../src/generic/bmpcboxg.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< @@ -14537,15 +15101,24 @@ $(OBJS)\advdll_odcombo.o: ../../src/generic/odcombo.cpp $(OBJS)\advdll_propdlg.o: ../../src/generic/propdlg.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\advdll_richtooltipg.o: ../../src/generic/richtooltipg.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advdll_sashwin.o: ../../src/generic/sashwin.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\advdll_splash.o: ../../src/generic/splash.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\advdll_timectrlg.o: ../../src/generic/timectrlg.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advdll_tipdlg.o: ../../src/generic/tipdlg.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\advdll_treelist.o: ../../src/generic/treelist.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advdll_wizard.o: ../../src/generic/wizard.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< @@ -14558,6 +15131,9 @@ $(OBJS)\advdll_aboutdlg.o: ../../src/msw/aboutdlg.cpp $(OBJS)\advdll_notifmsg.o: ../../src/msw/notifmsg.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\advdll_richtooltip.o: ../../src/msw/richtooltip.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advdll_sound.o: ../../src/msw/sound.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< @@ -14588,9 +15164,15 @@ $(OBJS)\advlib_datecontrols.o: ../../src/msw/datecontrols.cpp $(OBJS)\advlib_datectrl.o: ../../src/msw/datectrl.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\advlib_datetimectrl.o: ../../src/msw/datetimectrl.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advlib_hyperlink.o: ../../src/msw/hyperlink.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\advlib_timectrl.o: ../../src/msw/timectrl.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advlib_animatecmn.o: ../../src/common/animatecmn.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< @@ -14612,9 +15194,15 @@ $(OBJS)\advlib_hyperlnkcmn.o: ../../src/common/hyperlnkcmn.cpp $(OBJS)\advlib_odcombocmn.o: ../../src/common/odcombocmn.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\advlib_richtooltipcmn.o: ../../src/common/richtooltipcmn.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advlib_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\advlib_bannerwindow.o: ../../src/generic/bannerwindow.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advlib_bmpcboxg.o: ../../src/generic/bmpcboxg.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< @@ -14663,15 +15251,24 @@ $(OBJS)\advlib_odcombo.o: ../../src/generic/odcombo.cpp $(OBJS)\advlib_propdlg.o: ../../src/generic/propdlg.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\advlib_richtooltipg.o: ../../src/generic/richtooltipg.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advlib_sashwin.o: ../../src/generic/sashwin.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\advlib_splash.o: ../../src/generic/splash.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\advlib_timectrlg.o: ../../src/generic/timectrlg.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advlib_tipdlg.o: ../../src/generic/tipdlg.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\advlib_treelist.o: ../../src/generic/treelist.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advlib_wizard.o: ../../src/generic/wizard.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< @@ -14684,6 +15281,9 @@ $(OBJS)\advlib_aboutdlg.o: ../../src/msw/aboutdlg.cpp $(OBJS)\advlib_notifmsg.o: ../../src/msw/notifmsg.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\advlib_richtooltip.o: ../../src/msw/richtooltip.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advlib_sound.o: ../../src/msw/sound.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< @@ -14700,7 +15300,7 @@ $(OBJS)\mediadll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\mediadll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_MEDIA + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_MEDIA $(OBJS)\mediadll_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp $(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $(CPPDEPS) $< @@ -14733,7 +15333,7 @@ $(OBJS)\htmldll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\htmldll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_HTML + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_HTML $(OBJS)\htmldll_helpbest.o: ../../src/msw/helpbest.cpp $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< @@ -14898,7 +15498,7 @@ $(OBJS)\webviewdll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\webviewdll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_WEBVIEW + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_WEBVIEW $(OBJS)\webviewdll_webview_ie.o: ../../src/msw/webview_ie.cpp $(CXX) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(CPPDEPS) $< @@ -14909,6 +15509,9 @@ $(OBJS)\webviewdll_webview.o: ../../src/common/webview.cpp $(OBJS)\webviewdll_webviewarchivehandler.o: ../../src/common/webviewarchivehandler.cpp $(CXX) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\webviewdll_webviewfshandler.o: ../../src/common/webviewfshandler.cpp + $(CXX) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\webviewlib_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(CPPDEPS) $< @@ -14921,11 +15524,14 @@ $(OBJS)\webviewlib_webview.o: ../../src/common/webview.cpp $(OBJS)\webviewlib_webviewarchivehandler.o: ../../src/common/webviewarchivehandler.cpp $(CXX) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\webviewlib_webviewfshandler.o: ../../src/common/webviewfshandler.cpp + $(CXX) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\qadll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(QADLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\qadll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_QA + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_QA $(OBJS)\qadll_debugrpt.o: ../../src/common/debugrpt.cpp $(CXX) -c -o $@ $(QADLL_CXXFLAGS) $(CPPDEPS) $< @@ -14946,7 +15552,7 @@ $(OBJS)\xmldll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(XMLDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\xmldll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML $(OBJS)\xmldll_xml.o: ../../src/xml/xml.cpp $(CXX) -c -o $@ $(XMLDLL_CXXFLAGS) $(CPPDEPS) $< @@ -14967,11 +15573,14 @@ $(OBJS)\xrcdll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\xrcdll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_XRC + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_XRC $(OBJS)\xrcdll_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\xrcdll_xh_bannerwindow.o: ../../src/xrc/xh_bannerwindow.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\xrcdll_xh_bmp.o: ../../src/xrc/xh_bmp.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< @@ -15131,6 +15740,9 @@ $(OBJS)\xrcdll_xh_text.o: ../../src/xrc/xh_text.cpp $(OBJS)\xrcdll_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\xrcdll_xh_timectrl.o: ../../src/xrc/xh_timectrl.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\xrcdll_xh_toolb.o: ../../src/xrc/xh_toolb.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< @@ -15164,6 +15776,9 @@ $(OBJS)\xrclib_dummy.o: ../../src/common/dummy.cpp $(OBJS)\xrclib_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\xrclib_xh_bannerwindow.o: ../../src/xrc/xh_bannerwindow.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\xrclib_xh_bmp.o: ../../src/xrc/xh_bmp.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< @@ -15323,6 +15938,9 @@ $(OBJS)\xrclib_xh_text.o: ../../src/xrc/xh_text.cpp $(OBJS)\xrclib_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\xrclib_xh_timectrl.o: ../../src/xrc/xh_timectrl.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\xrclib_xh_toolb.o: ../../src/xrc/xh_toolb.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< @@ -15354,7 +15972,7 @@ $(OBJS)\auidll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\auidll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_AUI + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_AUI $(OBJS)\auidll_framemanager.o: ../../src/aui/framemanager.cpp $(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $< @@ -15374,6 +15992,12 @@ $(OBJS)\auidll_auibar.o: ../../src/aui/auibar.cpp $(OBJS)\auidll_tabmdi.o: ../../src/aui/tabmdi.cpp $(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\auidll_tabart.o: ../../src/aui/tabart.cpp + $(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\auidll_xh_auinotbk.o: ../../src/xrc/xh_auinotbk.cpp + $(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\auilib_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $< @@ -15395,11 +16019,17 @@ $(OBJS)\auilib_auibar.o: ../../src/aui/auibar.cpp $(OBJS)\auilib_tabmdi.o: ../../src/aui/tabmdi.cpp $(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\auilib_tabart.o: ../../src/aui/tabart.cpp + $(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\auilib_xh_auinotbk.o: ../../src/xrc/xh_auinotbk.cpp + $(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\ribbondll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\ribbondll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_RIBBON + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_RIBBON $(OBJS)\ribbondll_art_internal.o: ../../src/ribbon/art_internal.cpp $(CXX) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(CPPDEPS) $< @@ -15431,6 +16061,9 @@ $(OBJS)\ribbondll_panel.o: ../../src/ribbon/panel.cpp $(OBJS)\ribbondll_toolbar.o: ../../src/ribbon/toolbar.cpp $(CXX) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\ribbondll_xh_ribbon.o: ../../src/xrc/xh_ribbon.cpp + $(CXX) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\ribbonlib_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(CPPDEPS) $< @@ -15464,11 +16097,14 @@ $(OBJS)\ribbonlib_panel.o: ../../src/ribbon/panel.cpp $(OBJS)\ribbonlib_toolbar.o: ../../src/ribbon/toolbar.cpp $(CXX) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\ribbonlib_xh_ribbon.o: ../../src/xrc/xh_ribbon.cpp + $(CXX) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\propgriddll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\propgriddll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_PROPGRID + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_PROPGRID $(OBJS)\propgriddll_advprops.o: ../../src/propgrid/advprops.cpp $(CXX) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(CPPDEPS) $< @@ -15525,7 +16161,7 @@ $(OBJS)\richtextdll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\richtextdll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT $(OBJS)\richtextdll_richtextbuffer.o: ../../src/richtext/richtextbuffer.cpp $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< @@ -15557,6 +16193,9 @@ $(OBJS)\richtextdll_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cp $(OBJS)\richtextdll_richtextxml.o: ../../src/richtext/richtextxml.cpp $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\richtextdll_xh_richtext.o: ../../src/xrc/xh_richtext.cpp + $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\richtextlib_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< @@ -15590,11 +16229,14 @@ $(OBJS)\richtextlib_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cp $(OBJS)\richtextlib_richtextxml.o: ../../src/richtext/richtextxml.cpp $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\richtextlib_xh_richtext.o: ../../src/xrc/xh_richtext.cpp + $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\stcdll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\stcdll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --include-dir ../../src/stc/scintilla/include --include-dir ../../src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define WXUSINGDLL --define WXMAKINGDLL_STC + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --include-dir ../../src/stc/scintilla/include --include-dir ../../src/stc/scintilla/lexlib --include-dir ../../src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define WXUSINGDLL --define WXMAKINGDLL_STC $(OBJS)\stcdll_stc.o: ../../src/stc/stc.cpp $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $(CPPDEPS) $< @@ -15621,7 +16263,7 @@ $(OBJS)\gldll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(GLDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\gldll_version_rc.o: ../../src/msw/version.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_GL + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_GL $(OBJS)\gldll_glcmn.o: ../../src/common/glcmn.cpp $(CXX) -c -o $@ $(GLDLL_CXXFLAGS) $(CPPDEPS) $<