X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e80118cfb912fd7b6c50c87823fd31fb45fedd3b..162e998c2f15f8773cbb63f0cceee8cdea4c421f:/build/msw/makefile.bcc?ds=sidebyside diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 7e1708846e..5175243b46 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -29,7 +29,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \ -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \ -DUSE_AUI="$(USE_AUI)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \ - -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_ODBC="$(USE_ODBC)" -DUSE_QA="$(USE_QA)" \ + -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \ -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \ -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \ -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \ @@ -38,9 +38,10 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" WX_RELEASE_NODOT = 29 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 +COMPILER_PREFIX = bcc OBJS = \ - bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = ..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG) + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = ..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) WXREGEX_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ @@ -140,8 +141,9 @@ WXJPEG_OBJECTS = \ $(OBJS)\wxjpeg_jquant2.obj \ $(OBJS)\wxjpeg_jdmerge.obj WXTIFF_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -I..\..\src\zlib -I..\..\src\jpeg -w-8004 \ - -w-8012 -w-8057 -w-8060 -w-8066 $(CPPFLAGS) $(CFLAGS) + $(__OPTIMIZEFLAG) $(__THREADSFLAG) -I..\..\src\zlib -I..\..\src\jpeg \ + -I..\..\src\tiff\libtiff -w-8004 -w-8012 -w-8057 -w-8060 -w-8066 $(CPPFLAGS) \ + $(CFLAGS) WXTIFF_OBJECTS = \ $(OBJS)\wxtiff_tif_win32.obj \ $(OBJS)\wxtiff_tif_aux.obj \ @@ -158,20 +160,21 @@ WXTIFF_OBJECTS = \ $(OBJS)\wxtiff_tif_extension.obj \ $(OBJS)\wxtiff_tif_fax3.obj \ $(OBJS)\wxtiff_tif_fax3sm.obj \ + $(OBJS)\wxtiff_tif_flush.obj \ $(OBJS)\wxtiff_tif_getimage.obj \ $(OBJS)\wxtiff_tif_jpeg.obj \ - $(OBJS)\wxtiff_tif_flush.obj \ - $(OBJS)\wxtiff_tif_lzw.obj \ $(OBJS)\wxtiff_tif_luv.obj \ + $(OBJS)\wxtiff_tif_lzw.obj \ $(OBJS)\wxtiff_tif_next.obj \ + $(OBJS)\wxtiff_tif_ojpeg.obj \ $(OBJS)\wxtiff_tif_open.obj \ $(OBJS)\wxtiff_tif_packbits.obj \ $(OBJS)\wxtiff_tif_pixarlog.obj \ $(OBJS)\wxtiff_tif_predict.obj \ $(OBJS)\wxtiff_tif_print.obj \ $(OBJS)\wxtiff_tif_read.obj \ - $(OBJS)\wxtiff_tif_swab.obj \ $(OBJS)\wxtiff_tif_strip.obj \ + $(OBJS)\wxtiff_tif_swab.obj \ $(OBJS)\wxtiff_tif_thunder.obj \ $(OBJS)\wxtiff_tif_tile.obj \ $(OBJS)\wxtiff_tif_version.obj \ @@ -185,27 +188,130 @@ WXEXPAT_OBJECTS = \ $(OBJS)\wxexpat_xmlparse.obj \ $(OBJS)\wxexpat_xmlrole.obj \ $(OBJS)\wxexpat_xmltok.obj +WXSCINTILLA_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) $(__THREADSFLAG) -I..\..\src\stc\scintilla\include \ + -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS $(CPPFLAGS) \ + $(CXXFLAGS) +WXSCINTILLA_OBJECTS = \ + $(OBJS)\wxscintilla_AutoComplete.obj \ + $(OBJS)\wxscintilla_CallTip.obj \ + $(OBJS)\wxscintilla_CellBuffer.obj \ + $(OBJS)\wxscintilla_CharClassify.obj \ + $(OBJS)\wxscintilla_ContractionState.obj \ + $(OBJS)\wxscintilla_Decoration.obj \ + $(OBJS)\wxscintilla_Document.obj \ + $(OBJS)\wxscintilla_DocumentAccessor.obj \ + $(OBJS)\wxscintilla_Editor.obj \ + $(OBJS)\wxscintilla_ExternalLexer.obj \ + $(OBJS)\wxscintilla_Indicator.obj \ + $(OBJS)\wxscintilla_KeyMap.obj \ + $(OBJS)\wxscintilla_KeyWords.obj \ + $(OBJS)\wxscintilla_LexAPDL.obj \ + $(OBJS)\wxscintilla_LexAU3.obj \ + $(OBJS)\wxscintilla_LexASY.obj \ + $(OBJS)\wxscintilla_LexAVE.obj \ + $(OBJS)\wxscintilla_LexAbaqus.obj \ + $(OBJS)\wxscintilla_LexAda.obj \ + $(OBJS)\wxscintilla_LexAsm.obj \ + $(OBJS)\wxscintilla_LexAsn1.obj \ + $(OBJS)\wxscintilla_LexBaan.obj \ + $(OBJS)\wxscintilla_LexBash.obj \ + $(OBJS)\wxscintilla_LexBasic.obj \ + $(OBJS)\wxscintilla_LexBullant.obj \ + $(OBJS)\wxscintilla_LexCLW.obj \ + $(OBJS)\wxscintilla_LexCmake.obj \ + $(OBJS)\wxscintilla_LexCPP.obj \ + $(OBJS)\wxscintilla_LexCSS.obj \ + $(OBJS)\wxscintilla_LexCaml.obj \ + $(OBJS)\wxscintilla_LexCsound.obj \ + $(OBJS)\wxscintilla_LexConf.obj \ + $(OBJS)\wxscintilla_LexCrontab.obj \ + $(OBJS)\wxscintilla_LexD.obj \ + $(OBJS)\wxscintilla_LexEScript.obj \ + $(OBJS)\wxscintilla_LexEiffel.obj \ + $(OBJS)\wxscintilla_LexErlang.obj \ + $(OBJS)\wxscintilla_LexFlagship.obj \ + $(OBJS)\wxscintilla_LexForth.obj \ + $(OBJS)\wxscintilla_LexFortran.obj \ + $(OBJS)\wxscintilla_LexGAP.obj \ + $(OBJS)\wxscintilla_LexGui4Cli.obj \ + $(OBJS)\wxscintilla_LexHTML.obj \ + $(OBJS)\wxscintilla_LexHaskell.obj \ + $(OBJS)\wxscintilla_LexInno.obj \ + $(OBJS)\wxscintilla_LexKix.obj \ + $(OBJS)\wxscintilla_LexLisp.obj \ + $(OBJS)\wxscintilla_LexLout.obj \ + $(OBJS)\wxscintilla_LexLua.obj \ + $(OBJS)\wxscintilla_LexMMIXAL.obj \ + $(OBJS)\wxscintilla_LexMPT.obj \ + $(OBJS)\wxscintilla_LexMSSQL.obj \ + $(OBJS)\wxscintilla_LexMatlab.obj \ + $(OBJS)\wxscintilla_LexMetapost.obj \ + $(OBJS)\wxscintilla_LexNsis.obj \ + $(OBJS)\wxscintilla_LexOpal.obj \ + $(OBJS)\wxscintilla_LexOthers.obj \ + $(OBJS)\wxscintilla_LexPB.obj \ + $(OBJS)\wxscintilla_LexPLM.obj \ + $(OBJS)\wxscintilla_LexPOV.obj \ + $(OBJS)\wxscintilla_LexProgress.obj \ + $(OBJS)\wxscintilla_LexPS.obj \ + $(OBJS)\wxscintilla_LexPascal.obj \ + $(OBJS)\wxscintilla_LexPerl.obj \ + $(OBJS)\wxscintilla_LexPython.obj \ + $(OBJS)\wxscintilla_LexR.obj \ + $(OBJS)\wxscintilla_LexRebol.obj \ + $(OBJS)\wxscintilla_LexRuby.obj \ + $(OBJS)\wxscintilla_LexSQL.obj \ + $(OBJS)\wxscintilla_LexSmalltalk.obj \ + $(OBJS)\wxscintilla_LexTADS3.obj \ + $(OBJS)\wxscintilla_LexScriptol.obj \ + $(OBJS)\wxscintilla_LexSpecman.obj \ + $(OBJS)\wxscintilla_LexSpice.obj \ + $(OBJS)\wxscintilla_LexTCL.obj \ + $(OBJS)\wxscintilla_LexTeX.obj \ + $(OBJS)\wxscintilla_LexVB.obj \ + $(OBJS)\wxscintilla_LexVHDL.obj \ + $(OBJS)\wxscintilla_LexVerilog.obj \ + $(OBJS)\wxscintilla_LexYAML.obj \ + $(OBJS)\wxscintilla_LineMarker.obj \ + $(OBJS)\wxscintilla_PositionCache.obj \ + $(OBJS)\wxscintilla_PropSet.obj \ + $(OBJS)\wxscintilla_RESearch.obj \ + $(OBJS)\wxscintilla_RunStyles.obj \ + $(OBJS)\wxscintilla_ScintillaBase.obj \ + $(OBJS)\wxscintilla_Style.obj \ + $(OBJS)\wxscintilla_StyleContext.obj \ + $(OBJS)\wxscintilla_UniConversion.obj \ + $(OBJS)\wxscintilla_ViewStyle.obj \ + $(OBJS)\wxscintilla_WindowAccessor.obj \ + $(OBJS)\wxscintilla_XPM.obj MONODLL_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_BASE=1 -DWXMAKINGDLL $(CPPFLAGS) $(CFLAGS) + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_BASE=1 -DWXMAKINGDLL \ + -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\src -D__WX__ \ + -DSCI_LEXER -DLINK_LEXERS $(CPPFLAGS) $(CFLAGS) MONODLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_BASE=1 -DWXMAKINGDLL -Hu \ - -H=$(OBJS)\wxprec_monodll.csm $(CPPFLAGS) $(CXXFLAGS) + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_BASE=1 -DWXMAKINGDLL \ + -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\src -D__WX__ \ + -DSCI_LEXER -DLINK_LEXERS -Hu -H=$(OBJS)\wxprec_monodll.csm $(CPPFLAGS) \ + $(CXXFLAGS) MONODLL_OBJECTS = \ $(OBJS)\monodll_dummy.obj \ $(OBJS)\monodll_appbase.obj \ $(OBJS)\monodll_arcall.obj \ $(OBJS)\monodll_arcfind.obj \ $(OBJS)\monodll_archive.obj \ + $(OBJS)\monodll_arrstr.obj \ + $(OBJS)\monodll_base64.obj \ $(OBJS)\monodll_clntdata.obj \ $(OBJS)\monodll_cmdline.obj \ $(OBJS)\monodll_config.obj \ @@ -217,6 +323,7 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_dynlib.obj \ $(OBJS)\monodll_dynload.obj \ $(OBJS)\monodll_encconv.obj \ + $(OBJS)\monodll_evtloopcmn.obj \ $(OBJS)\monodll_extended.obj \ $(OBJS)\monodll_ffile.obj \ $(OBJS)\monodll_file.obj \ @@ -253,11 +360,15 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_strconv.obj \ $(OBJS)\monodll_stream.obj \ $(OBJS)\monodll_string.obj \ + $(OBJS)\monodll_stringimpl.obj \ + $(OBJS)\monodll_stringops.obj \ $(OBJS)\monodll_strvararg.obj \ $(OBJS)\monodll_sysopt.obj \ $(OBJS)\monodll_tarstrm.obj \ $(OBJS)\monodll_textbuf.obj \ $(OBJS)\monodll_textfile.obj \ + $(OBJS)\monodll_timercmn.obj \ + $(OBJS)\monodll_timerimpl.obj \ $(OBJS)\monodll_tokenzr.obj \ $(OBJS)\monodll_txtstrm.obj \ $(OBJS)\monodll_unichar.obj \ @@ -284,12 +395,14 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_stackwalk.obj \ $(OBJS)\monodll_stdpaths.obj \ $(OBJS)\monodll_thread.obj \ + $(OBJS)\monodll_timer.obj \ $(OBJS)\monodll_utils.obj \ $(OBJS)\monodll_utilsexc.obj \ $(OBJS)\monodll_event.obj \ $(OBJS)\monodll_fs_mem.obj \ $(OBJS)\monodll_msgout.obj \ $(OBJS)\monodll_utilscmn.obj \ + $(OBJS)\monodll_evtloop.obj \ $(OBJS)\monodll_main.obj \ $(OBJS)\monodll_mslu.obj \ $(OBJS)\monodll_volume.obj \ @@ -304,6 +417,7 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_socket.obj \ $(OBJS)\monodll_url.obj \ $(OBJS)\monodll_gsocket.obj \ + $(OBJS)\monodll_gsockmsw.obj \ $(OBJS)\monodll_urlmsw.obj \ $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \ $(OBJS)\monodll_xml.obj \ @@ -312,23 +426,29 @@ MONOLIB_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_BASE=1 \ + -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\src -D__WX__ \ + -DSCI_LEXER -DLINK_LEXERS $(CPPFLAGS) $(CFLAGS) MONOLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_BASE=1 -Hu -H=$(OBJS)\wxprec_monolib.csm \ - $(CPPFLAGS) $(CXXFLAGS) + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_BASE=1 \ + -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\src -D__WX__ \ + -DSCI_LEXER -DLINK_LEXERS -Hu -H=$(OBJS)\wxprec_monolib.csm $(CPPFLAGS) \ + $(CXXFLAGS) MONOLIB_OBJECTS = \ $(OBJS)\monolib_dummy.obj \ $(OBJS)\monolib_appbase.obj \ $(OBJS)\monolib_arcall.obj \ $(OBJS)\monolib_arcfind.obj \ $(OBJS)\monolib_archive.obj \ + $(OBJS)\monolib_arrstr.obj \ + $(OBJS)\monolib_base64.obj \ $(OBJS)\monolib_clntdata.obj \ $(OBJS)\monolib_cmdline.obj \ $(OBJS)\monolib_config.obj \ @@ -340,6 +460,7 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_dynlib.obj \ $(OBJS)\monolib_dynload.obj \ $(OBJS)\monolib_encconv.obj \ + $(OBJS)\monolib_evtloopcmn.obj \ $(OBJS)\monolib_extended.obj \ $(OBJS)\monolib_ffile.obj \ $(OBJS)\monolib_file.obj \ @@ -376,11 +497,15 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_strconv.obj \ $(OBJS)\monolib_stream.obj \ $(OBJS)\monolib_string.obj \ + $(OBJS)\monolib_stringimpl.obj \ + $(OBJS)\monolib_stringops.obj \ $(OBJS)\monolib_strvararg.obj \ $(OBJS)\monolib_sysopt.obj \ $(OBJS)\monolib_tarstrm.obj \ $(OBJS)\monolib_textbuf.obj \ $(OBJS)\monolib_textfile.obj \ + $(OBJS)\monolib_timercmn.obj \ + $(OBJS)\monolib_timerimpl.obj \ $(OBJS)\monolib_tokenzr.obj \ $(OBJS)\monolib_txtstrm.obj \ $(OBJS)\monolib_unichar.obj \ @@ -407,12 +532,14 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_stackwalk.obj \ $(OBJS)\monolib_stdpaths.obj \ $(OBJS)\monolib_thread.obj \ + $(OBJS)\monolib_timer.obj \ $(OBJS)\monolib_utils.obj \ $(OBJS)\monolib_utilsexc.obj \ $(OBJS)\monolib_event.obj \ $(OBJS)\monolib_fs_mem.obj \ $(OBJS)\monolib_msgout.obj \ $(OBJS)\monolib_utilscmn.obj \ + $(OBJS)\monolib_evtloop.obj \ $(OBJS)\monolib_main.obj \ $(OBJS)\monolib_mslu.obj \ $(OBJS)\monolib_volume.obj \ @@ -427,6 +554,7 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_socket.obj \ $(OBJS)\monolib_url.obj \ $(OBJS)\monolib_gsocket.obj \ + $(OBJS)\monolib_gsockmsw.obj \ $(OBJS)\monolib_urlmsw.obj \ $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \ $(OBJS)\monolib_xml.obj \ @@ -435,24 +563,26 @@ BASEDLL_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 \ - $(CPPFLAGS) $(CFLAGS) + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE \ + -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) BASEDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 -Hu \ - -H=$(OBJS)\wxprec_basedll.csm $(CPPFLAGS) $(CXXFLAGS) + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE \ + -DwxUSE_BASE=1 -Hu -H=$(OBJS)\wxprec_basedll.csm $(CPPFLAGS) $(CXXFLAGS) BASEDLL_OBJECTS = \ $(OBJS)\basedll_dummy.obj \ $(OBJS)\basedll_appbase.obj \ $(OBJS)\basedll_arcall.obj \ $(OBJS)\basedll_arcfind.obj \ $(OBJS)\basedll_archive.obj \ + $(OBJS)\basedll_arrstr.obj \ + $(OBJS)\basedll_base64.obj \ $(OBJS)\basedll_clntdata.obj \ $(OBJS)\basedll_cmdline.obj \ $(OBJS)\basedll_config.obj \ @@ -464,6 +594,7 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_dynlib.obj \ $(OBJS)\basedll_dynload.obj \ $(OBJS)\basedll_encconv.obj \ + $(OBJS)\basedll_evtloopcmn.obj \ $(OBJS)\basedll_extended.obj \ $(OBJS)\basedll_ffile.obj \ $(OBJS)\basedll_file.obj \ @@ -500,11 +631,15 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_strconv.obj \ $(OBJS)\basedll_stream.obj \ $(OBJS)\basedll_string.obj \ + $(OBJS)\basedll_stringimpl.obj \ + $(OBJS)\basedll_stringops.obj \ $(OBJS)\basedll_strvararg.obj \ $(OBJS)\basedll_sysopt.obj \ $(OBJS)\basedll_tarstrm.obj \ $(OBJS)\basedll_textbuf.obj \ $(OBJS)\basedll_textfile.obj \ + $(OBJS)\basedll_timercmn.obj \ + $(OBJS)\basedll_timerimpl.obj \ $(OBJS)\basedll_tokenzr.obj \ $(OBJS)\basedll_txtstrm.obj \ $(OBJS)\basedll_unichar.obj \ @@ -531,12 +666,14 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_stackwalk.obj \ $(OBJS)\basedll_stdpaths.obj \ $(OBJS)\basedll_thread.obj \ + $(OBJS)\basedll_timer.obj \ $(OBJS)\basedll_utils.obj \ $(OBJS)\basedll_utilsexc.obj \ $(OBJS)\basedll_event.obj \ $(OBJS)\basedll_fs_mem.obj \ $(OBJS)\basedll_msgout.obj \ $(OBJS)\basedll_utilscmn.obj \ + $(OBJS)\basedll_evtloop.obj \ $(OBJS)\basedll_main.obj \ $(OBJS)\basedll_mslu.obj \ $(OBJS)\basedll_volume.obj @@ -544,16 +681,17 @@ BASELIB_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -DwxUSE_BASE=1 \ + $(CPPFLAGS) $(CFLAGS) BASELIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -DwxUSE_BASE=1 -Hu \ + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -DwxUSE_BASE=1 -Hu \ -H=$(OBJS)\wxprec_baselib.csm $(CPPFLAGS) $(CXXFLAGS) BASELIB_OBJECTS = \ $(OBJS)\baselib_dummy.obj \ @@ -561,6 +699,8 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_arcall.obj \ $(OBJS)\baselib_arcfind.obj \ $(OBJS)\baselib_archive.obj \ + $(OBJS)\baselib_arrstr.obj \ + $(OBJS)\baselib_base64.obj \ $(OBJS)\baselib_clntdata.obj \ $(OBJS)\baselib_cmdline.obj \ $(OBJS)\baselib_config.obj \ @@ -572,6 +712,7 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_dynlib.obj \ $(OBJS)\baselib_dynload.obj \ $(OBJS)\baselib_encconv.obj \ + $(OBJS)\baselib_evtloopcmn.obj \ $(OBJS)\baselib_extended.obj \ $(OBJS)\baselib_ffile.obj \ $(OBJS)\baselib_file.obj \ @@ -608,11 +749,15 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_strconv.obj \ $(OBJS)\baselib_stream.obj \ $(OBJS)\baselib_string.obj \ + $(OBJS)\baselib_stringimpl.obj \ + $(OBJS)\baselib_stringops.obj \ $(OBJS)\baselib_strvararg.obj \ $(OBJS)\baselib_sysopt.obj \ $(OBJS)\baselib_tarstrm.obj \ $(OBJS)\baselib_textbuf.obj \ $(OBJS)\baselib_textfile.obj \ + $(OBJS)\baselib_timercmn.obj \ + $(OBJS)\baselib_timerimpl.obj \ $(OBJS)\baselib_tokenzr.obj \ $(OBJS)\baselib_txtstrm.obj \ $(OBJS)\baselib_unichar.obj \ @@ -639,12 +784,14 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_stackwalk.obj \ $(OBJS)\baselib_stdpaths.obj \ $(OBJS)\baselib_thread.obj \ + $(OBJS)\baselib_timer.obj \ $(OBJS)\baselib_utils.obj \ $(OBJS)\baselib_utilsexc.obj \ $(OBJS)\baselib_event.obj \ $(OBJS)\baselib_fs_mem.obj \ $(OBJS)\baselib_msgout.obj \ $(OBJS)\baselib_utilscmn.obj \ + $(OBJS)\baselib_evtloop.obj \ $(OBJS)\baselib_main.obj \ $(OBJS)\baselib_mslu.obj \ $(OBJS)\baselib_volume.obj @@ -652,10 +799,10 @@ NETDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET -Hu \ - -H=$(OBJS)\wxprec_netdll.csm $(CPPFLAGS) $(CXXFLAGS) + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL \ + -DWXMAKINGDLL_NET -Hu -H=$(OBJS)\wxprec_netdll.csm $(CPPFLAGS) $(CXXFLAGS) NETDLL_OBJECTS = \ $(OBJS)\netdll_dummy.obj \ $(OBJS)\netdll_fs_inet.obj \ @@ -669,15 +816,16 @@ NETDLL_OBJECTS = \ $(OBJS)\netdll_socket.obj \ $(OBJS)\netdll_url.obj \ $(OBJS)\netdll_gsocket.obj \ + $(OBJS)\netdll_gsockmsw.obj \ $(OBJS)\netdll_urlmsw.obj NETLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -Hu -H=$(OBJS)\wxprec_netlib.csm \ - $(CPPFLAGS) $(CXXFLAGS) + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -Hu \ + -H=$(OBJS)\wxprec_netlib.csm $(CPPFLAGS) $(CXXFLAGS) NETLIB_OBJECTS = \ $(OBJS)\netlib_dummy.obj \ $(OBJS)\netlib_fs_inet.obj \ @@ -691,21 +839,23 @@ NETLIB_OBJECTS = \ $(OBJS)\netlib_socket.obj \ $(OBJS)\netlib_url.obj \ $(OBJS)\netlib_gsocket.obj \ + $(OBJS)\netlib_gsockmsw.obj \ $(OBJS)\netlib_urlmsw.obj COREDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 -Hu \ - -H=$(OBJS)\wxprec_coredll.csm $(CPPFLAGS) $(CXXFLAGS) + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_CORE \ + -DwxUSE_BASE=0 -Hu -H=$(OBJS)\wxprec_coredll.csm $(CPPFLAGS) $(CXXFLAGS) COREDLL_OBJECTS = \ $(OBJS)\coredll_dummy.obj \ $(OBJS)\coredll_event.obj \ $(OBJS)\coredll_fs_mem.obj \ $(OBJS)\coredll_msgout.obj \ $(OBJS)\coredll_utilscmn.obj \ + $(OBJS)\coredll_evtloop.obj \ $(OBJS)\coredll_main.obj \ $(OBJS)\coredll_mslu.obj \ $(OBJS)\coredll_volume.obj \ @@ -714,16 +864,17 @@ CORELIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_BASE=0 -Hu -H=$(OBJS)\wxprec_corelib.csm \ - $(CPPFLAGS) $(CXXFLAGS) + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_BASE=0 -Hu \ + -H=$(OBJS)\wxprec_corelib.csm $(CPPFLAGS) $(CXXFLAGS) CORELIB_OBJECTS = \ $(OBJS)\corelib_dummy.obj \ $(OBJS)\corelib_event.obj \ $(OBJS)\corelib_fs_mem.obj \ $(OBJS)\corelib_msgout.obj \ $(OBJS)\corelib_utilscmn.obj \ + $(OBJS)\corelib_evtloop.obj \ $(OBJS)\corelib_main.obj \ $(OBJS)\corelib_mslu.obj \ $(OBJS)\corelib_volume.obj \ @@ -732,9 +883,9 @@ ADVDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_ADV -Hu \ + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_ADV -Hu \ -H=$(OBJS)\wxprec_advdll.csm $(CPPFLAGS) $(CXXFLAGS) ADVDLL_OBJECTS = \ $(OBJS)\advdll_dummy.obj \ @@ -743,10 +894,10 @@ ADVLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_advlib.csm $(CPPFLAGS) \ - $(CXXFLAGS) + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_advlib.csm \ + $(CPPFLAGS) $(CXXFLAGS) ADVLIB_OBJECTS = \ $(OBJS)\advlib_dummy.obj \ $(____ADVANCED_SRC_FILENAMES_3_OBJECTS) @@ -754,9 +905,9 @@ MEDIADLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_MEDIA -Hu \ + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_MEDIA -Hu \ -H=$(OBJS)\wxprec_mediadll.csm $(CPPFLAGS) $(CXXFLAGS) MEDIADLL_OBJECTS = \ $(OBJS)\mediadll_dummy.obj \ @@ -769,10 +920,10 @@ MEDIALIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_medialib.csm $(CPPFLAGS) \ - $(CXXFLAGS) + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_medialib.csm \ + $(CPPFLAGS) $(CXXFLAGS) MEDIALIB_OBJECTS = \ $(OBJS)\medialib_dummy.obj \ $(OBJS)\medialib_mediactrlcmn.obj \ @@ -780,59 +931,13 @@ MEDIALIB_OBJECTS = \ $(OBJS)\medialib_mediactrl_wmp10.obj \ $(OBJS)\medialib_mediactrl_qt.obj \ $(OBJS)\medialib_activex.obj -ODBCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC -Hu \ - -H=$(OBJS)\wxprec_odbcdll.csm $(CPPFLAGS) $(CXXFLAGS) -ODBCDLL_OBJECTS = \ - $(OBJS)\odbcdll_dummy.obj \ - $(OBJS)\odbcdll_db.obj \ - $(OBJS)\odbcdll_dbtable.obj -ODBCLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -Hu -H=$(OBJS)\wxprec_odbclib.csm \ - $(CPPFLAGS) $(CXXFLAGS) -ODBCLIB_OBJECTS = \ - $(OBJS)\odbclib_dummy.obj \ - $(OBJS)\odbclib_db.obj \ - $(OBJS)\odbclib_dbtable.obj -DBGRIDDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_DBGRID -Hu \ - -H=$(OBJS)\wxprec_dbgriddll.csm $(CPPFLAGS) $(CXXFLAGS) -DBGRIDDLL_OBJECTS = \ - $(OBJS)\dbgriddll_dummy.obj \ - $(OBJS)\dbgriddll_dbgrid.obj -DBGRIDLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_dbgridlib.csm $(CPPFLAGS) \ - $(CXXFLAGS) -DBGRIDLIB_OBJECTS = \ - $(OBJS)\dbgridlib_dummy.obj \ - $(OBJS)\dbgridlib_dbgrid.obj HTMLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_HTML -Hu \ + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_HTML -Hu \ -H=$(OBJS)\wxprec_htmldll.csm $(CPPFLAGS) $(CXXFLAGS) HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_dummy.obj \ @@ -864,10 +969,10 @@ HTMLLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_htmllib.csm $(CPPFLAGS) \ - $(CXXFLAGS) + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_htmllib.csm \ + $(CPPFLAGS) $(CXXFLAGS) HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_dummy.obj \ $(OBJS)\htmllib_helpbest.obj \ @@ -898,9 +1003,9 @@ QADLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_QA -Hu \ + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_QA -Hu \ -H=$(OBJS)\wxprec_qadll.csm $(CPPFLAGS) $(CXXFLAGS) QADLL_OBJECTS = \ $(OBJS)\qadll_dummy.obj \ @@ -910,10 +1015,10 @@ QALIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_qalib.csm $(CPPFLAGS) \ - $(CXXFLAGS) + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_qalib.csm \ + $(CPPFLAGS) $(CXXFLAGS) QALIB_OBJECTS = \ $(OBJS)\qalib_dummy.obj \ $(OBJS)\qalib_debugrpt.obj \ @@ -922,10 +1027,10 @@ XMLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_XML -Hu \ - -H=$(OBJS)\wxprec_xmldll.csm $(CPPFLAGS) $(CXXFLAGS) + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL \ + -DWXMAKINGDLL_XML -Hu -H=$(OBJS)\wxprec_xmldll.csm $(CPPFLAGS) $(CXXFLAGS) XMLDLL_OBJECTS = \ $(OBJS)\xmldll_dummy.obj \ $(OBJS)\xmldll_xml.obj \ @@ -934,10 +1039,10 @@ XMLLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -Hu -H=$(OBJS)\wxprec_xmllib.csm \ - $(CPPFLAGS) $(CXXFLAGS) + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -Hu \ + -H=$(OBJS)\wxprec_xmllib.csm $(CPPFLAGS) $(CXXFLAGS) XMLLIB_OBJECTS = \ $(OBJS)\xmllib_dummy.obj \ $(OBJS)\xmllib_xml.obj \ @@ -946,9 +1051,9 @@ XRCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_XRC -Hu \ + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_XRC -Hu \ -H=$(OBJS)\wxprec_xrcdll.csm $(CPPFLAGS) $(CXXFLAGS) XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_dummy.obj \ @@ -984,6 +1089,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_notbk.obj \ $(OBJS)\xrcdll_xh_odcombo.obj \ $(OBJS)\xrcdll_xh_panel.obj \ + $(OBJS)\xrcdll_xh_propdlg.obj \ $(OBJS)\xrcdll_xh_radbt.obj \ $(OBJS)\xrcdll_xh_radbx.obj \ $(OBJS)\xrcdll_xh_scrol.obj \ @@ -993,6 +1099,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_slidr.obj \ $(OBJS)\xrcdll_xh_spin.obj \ $(OBJS)\xrcdll_xh_split.obj \ + $(OBJS)\xrcdll_xh_srchctrl.obj \ $(OBJS)\xrcdll_xh_statbar.obj \ $(OBJS)\xrcdll_xh_stbmp.obj \ $(OBJS)\xrcdll_xh_stbox.obj \ @@ -1011,10 +1118,10 @@ XRCLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_xrclib.csm $(CPPFLAGS) \ - $(CXXFLAGS) + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_xrclib.csm \ + $(CPPFLAGS) $(CXXFLAGS) XRCLIB_OBJECTS = \ $(OBJS)\xrclib_dummy.obj \ $(OBJS)\xrclib_xh_animatctrl.obj \ @@ -1049,6 +1156,7 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_notbk.obj \ $(OBJS)\xrclib_xh_odcombo.obj \ $(OBJS)\xrclib_xh_panel.obj \ + $(OBJS)\xrclib_xh_propdlg.obj \ $(OBJS)\xrclib_xh_radbt.obj \ $(OBJS)\xrclib_xh_radbx.obj \ $(OBJS)\xrclib_xh_scrol.obj \ @@ -1058,6 +1166,7 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_slidr.obj \ $(OBJS)\xrclib_xh_spin.obj \ $(OBJS)\xrclib_xh_split.obj \ + $(OBJS)\xrclib_xh_srchctrl.obj \ $(OBJS)\xrclib_xh_statbar.obj \ $(OBJS)\xrclib_xh_stbmp.obj \ $(OBJS)\xrclib_xh_stbox.obj \ @@ -1076,9 +1185,9 @@ AUIDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_AUI -Hu \ + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_AUI -Hu \ -H=$(OBJS)\wxprec_auidll.csm $(CPPFLAGS) $(CXXFLAGS) AUIDLL_OBJECTS = \ $(OBJS)\auidll_dummy.obj \ @@ -1091,10 +1200,10 @@ AUILIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_auilib.csm $(CPPFLAGS) \ - $(CXXFLAGS) + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_auilib.csm \ + $(CPPFLAGS) $(CXXFLAGS) AUILIB_OBJECTS = \ $(OBJS)\auilib_dummy.obj \ $(OBJS)\auilib_framemanager.obj \ @@ -1106,10 +1215,10 @@ RICHTEXTDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_RICHTEXT -Hu \ - -H=$(OBJS)\wxprec_richtextdll.csm $(CPPFLAGS) $(CXXFLAGS) + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_RICHTEXT \ + -Hu -H=$(OBJS)\wxprec_richtextdll.csm $(CPPFLAGS) $(CXXFLAGS) RICHTEXTDLL_OBJECTS = \ $(OBJS)\richtextdll_dummy.obj \ $(OBJS)\richtextdll_richtextctrl.obj \ @@ -1125,10 +1234,10 @@ RICHTEXTLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_richtextlib.csm $(CPPFLAGS) \ - $(CXXFLAGS) + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -Hu \ + -H=$(OBJS)\wxprec_richtextlib.csm $(CPPFLAGS) $(CXXFLAGS) RICHTEXTLIB_OBJECTS = \ $(OBJS)\richtextlib_dummy.obj \ $(OBJS)\richtextlib_richtextctrl.obj \ @@ -1140,27 +1249,58 @@ RICHTEXTLIB_OBJECTS = \ $(OBJS)\richtextlib_richtextsymboldlg.obj \ $(OBJS)\richtextlib_richtextstyledlg.obj \ $(OBJS)\richtextlib_richtextprint.obj +STCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -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 -w-8027 \ + -DWXUSINGDLL -DWXMAKINGDLL_STC -Hu -H=$(OBJS)\wxprec_stcdll.csm $(CPPFLAGS) \ + $(CXXFLAGS) +STCDLL_OBJECTS = \ + $(OBJS)\stcdll_dummy.obj \ + $(OBJS)\stcdll_stc.obj \ + $(OBJS)\stcdll_PlatWX.obj \ + $(OBJS)\stcdll_ScintillaWX.obj +STCLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -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 -w-8027 -Hu \ + -H=$(OBJS)\wxprec_stclib.csm $(CPPFLAGS) $(CXXFLAGS) +STCLIB_OBJECTS = \ + $(OBJS)\stclib_dummy.obj \ + $(OBJS)\stclib_stc.obj \ + $(OBJS)\stclib_PlatWX.obj \ + $(OBJS)\stclib_ScintillaWX.obj GLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_GL -Hu \ + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_GL -Hu \ -H=$(OBJS)\wxprec_gldll.csm $(CPPFLAGS) $(CXXFLAGS) GLDLL_OBJECTS = \ $(OBJS)\gldll_dummy.obj \ + $(OBJS)\gldll_glcmn.obj \ $(OBJS)\gldll_glcanvas.obj GLLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_gllib.csm $(CPPFLAGS) \ - $(CXXFLAGS) + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_gllib.csm \ + $(CPPFLAGS) $(CXXFLAGS) GLLIB_OBJECTS = \ $(OBJS)\gllib_dummy.obj \ + $(OBJS)\gllib_glcmn.obj \ $(OBJS)\gllib_glcanvas.obj BUILD_CFG_FILE = $(SETUPHDIR)\build.cfg @@ -1251,11 +1391,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_m_tables.obj \ $(OBJS)\monodll_winpars.obj \ $(OBJS)\monodll_htmllbox.obj \ - $(OBJS)\monodll_db.obj \ - $(OBJS)\monodll_dbtable.obj \ $(OBJS)\monodll_debugrpt.obj \ $(OBJS)\monodll_dbgrptg.obj \ - $(OBJS)\monodll_dbgrid.obj \ $(OBJS)\monodll_xh_animatctrl.obj \ $(OBJS)\monodll_xh_bmp.obj \ $(OBJS)\monodll_xh_bmpcbox.obj \ @@ -1288,6 +1425,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_notbk.obj \ $(OBJS)\monodll_xh_odcombo.obj \ $(OBJS)\monodll_xh_panel.obj \ + $(OBJS)\monodll_xh_propdlg.obj \ $(OBJS)\monodll_xh_radbt.obj \ $(OBJS)\monodll_xh_radbx.obj \ $(OBJS)\monodll_xh_scrol.obj \ @@ -1297,6 +1435,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_slidr.obj \ $(OBJS)\monodll_xh_spin.obj \ $(OBJS)\monodll_xh_split.obj \ + $(OBJS)\monodll_xh_srchctrl.obj \ $(OBJS)\monodll_xh_statbar.obj \ $(OBJS)\monodll_xh_stbmp.obj \ $(OBJS)\monodll_xh_stbox.obj \ @@ -1324,7 +1463,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_richtextformatdlg.obj \ $(OBJS)\monodll_richtextsymboldlg.obj \ $(OBJS)\monodll_richtextstyledlg.obj \ - $(OBJS)\monodll_richtextprint.obj + $(OBJS)\monodll_richtextprint.obj \ + $(OBJS)\monodll_stc.obj \ + $(OBJS)\monodll_PlatWX.obj \ + $(OBJS)\monodll_ScintillaWX.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_OBJECTS = \ @@ -1345,7 +1487,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dib.obj \ $(OBJS)\monodll_display.obj \ $(OBJS)\monodll_enhmeta.obj \ - $(OBJS)\monodll_evtloop.obj \ $(OBJS)\monodll_font.obj \ $(OBJS)\monodll_fontenum.obj \ $(OBJS)\monodll_fontutil.obj \ @@ -1353,7 +1494,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gdiobj.obj \ $(OBJS)\monodll_gdiplus.obj \ $(OBJS)\monodll_graphics.obj \ - $(OBJS)\monodll_gsockmsw.obj \ $(OBJS)\monodll_icon.obj \ $(OBJS)\monodll_imaglist.obj \ $(OBJS)\monodll_minifram.obj \ @@ -1369,7 +1509,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_region.obj \ $(OBJS)\monodll_renderer.obj \ $(OBJS)\monodll_settings.obj \ - $(OBJS)\monodll_timer.obj \ $(OBJS)\monodll_tooltip.obj \ $(OBJS)\monodll_toplevel.obj \ $(OBJS)\monodll_utilsgui.obj \ @@ -1379,6 +1518,10 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_helpwin.obj \ $(OBJS)\monodll_automtn.obj \ $(OBJS)\monodll_uuid.obj \ + $(OBJS)\monodll_clrpickerg.obj \ + $(OBJS)\monodll_collpaneg.obj \ + $(OBJS)\monodll_filepickerg.obj \ + $(OBJS)\monodll_fontpickerg.obj \ $(OBJS)\monodll_statusbr.obj \ $(OBJS)\monodll_prntdlgg.obj \ $(OBJS)\monodll_accel.obj \ @@ -1422,11 +1565,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_tabctrl.obj \ $(OBJS)\monodll_tbar95.obj \ $(OBJS)\monodll_textctrl.obj \ + $(OBJS)\monodll_textentry.obj \ $(OBJS)\monodll_tglbtn.obj \ $(OBJS)\monodll_treectrl.obj \ $(OBJS)\monodll_checklst.obj \ $(OBJS)\monodll_fdrepdlg.obj \ $(OBJS)\monodll_fontdlg.obj \ + $(OBJS)\monodll_accelcmn.obj \ $(OBJS)\monodll_accesscmn.obj \ $(OBJS)\monodll_anidecod.obj \ $(OBJS)\monodll_appcmn.obj \ @@ -1434,6 +1579,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_artstd.obj \ $(OBJS)\monodll_bmpbase.obj \ $(OBJS)\monodll_bookctrl.obj \ + $(OBJS)\monodll_btncmn.obj \ + $(OBJS)\monodll_cairo.obj \ $(OBJS)\monodll_choiccmn.obj \ $(OBJS)\monodll_clipcmn.obj \ $(OBJS)\monodll_clrpickercmn.obj \ @@ -1449,6 +1596,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dcbase.obj \ $(OBJS)\monodll_dcbufcmn.obj \ $(OBJS)\monodll_dcgraph.obj \ + $(OBJS)\monodll_dcsvg.obj \ $(OBJS)\monodll_dlgcmn.obj \ $(OBJS)\monodll_dndcmn.obj \ $(OBJS)\monodll_dobjcmn.obj \ @@ -1457,8 +1605,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dpycmn.obj \ $(OBJS)\monodll_dseldlg.obj \ $(OBJS)\monodll_effects.obj \ - $(OBJS)\monodll_evtloopcmn.obj \ $(OBJS)\monodll_fddlgcmn.obj \ + $(OBJS)\monodll_filectrlcmn.obj \ $(OBJS)\monodll_filepickercmn.obj \ $(OBJS)\monodll_fontpickercmn.obj \ $(OBJS)\monodll_fldlgcmn.obj \ @@ -1507,29 +1655,28 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_sizer.obj \ $(OBJS)\monodll_srchcmn.obj \ $(OBJS)\monodll_statbar.obj \ + $(OBJS)\monodll_stattextcmn.obj \ $(OBJS)\monodll_stockitem.obj \ $(OBJS)\monodll_tbarbase.obj \ $(OBJS)\monodll_textcmn.obj \ - $(OBJS)\monodll_timercmn.obj \ + $(OBJS)\monodll_textentrycmn.obj \ $(OBJS)\monodll_toplvcmn.obj \ $(OBJS)\monodll_treebase.obj \ $(OBJS)\monodll_valgen.obj \ $(OBJS)\monodll_validate.obj \ $(OBJS)\monodll_valtext.obj \ $(OBJS)\monodll_wincmn.obj \ + $(OBJS)\monodll_windowid.obj \ $(OBJS)\monodll_xpmdecod.obj \ $(OBJS)\monodll_busyinfo.obj \ $(OBJS)\monodll_buttonbar.obj \ $(OBJS)\monodll_choicdgg.obj \ $(OBJS)\monodll_choicbkg.obj \ - $(OBJS)\monodll_clrpickerg.obj \ - $(OBJS)\monodll_collpaneg.obj \ $(OBJS)\monodll_combog.obj \ $(OBJS)\monodll_dcpsg.obj \ $(OBJS)\monodll_dirctrlg.obj \ $(OBJS)\monodll_dragimgg.obj \ - $(OBJS)\monodll_filepickerg.obj \ - $(OBJS)\monodll_fontpickerg.obj \ + $(OBJS)\monodll_filectrlg.obj \ $(OBJS)\monodll_listbkg.obj \ $(OBJS)\monodll_logg.obj \ $(OBJS)\monodll_numdlgg.obj \ @@ -1569,7 +1716,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dib.obj \ $(OBJS)\monodll_display.obj \ $(OBJS)\monodll_enhmeta.obj \ - $(OBJS)\monodll_evtloop.obj \ $(OBJS)\monodll_font.obj \ $(OBJS)\monodll_fontenum.obj \ $(OBJS)\monodll_fontutil.obj \ @@ -1577,7 +1723,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gdiobj.obj \ $(OBJS)\monodll_gdiplus.obj \ $(OBJS)\monodll_graphics.obj \ - $(OBJS)\monodll_gsockmsw.obj \ $(OBJS)\monodll_icon.obj \ $(OBJS)\monodll_imaglist.obj \ $(OBJS)\monodll_minifram.obj \ @@ -1593,7 +1738,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_region.obj \ $(OBJS)\monodll_renderer.obj \ $(OBJS)\monodll_settings.obj \ - $(OBJS)\monodll_timer.obj \ $(OBJS)\monodll_tooltip.obj \ $(OBJS)\monodll_toplevel.obj \ $(OBJS)\monodll_utilsgui.obj \ @@ -1604,11 +1748,15 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_automtn.obj \ $(OBJS)\monodll_uuid.obj \ $(OBJS)\monodll_accel.obj \ + $(OBJS)\monodll_clrpickerg.obj \ + $(OBJS)\monodll_collpaneg.obj \ $(OBJS)\monodll_colrdlgg.obj \ $(OBJS)\monodll_dirdlgg.obj \ $(OBJS)\monodll_fdrepdlg.obj \ $(OBJS)\monodll_filedlgg.obj \ + $(OBJS)\monodll_filepickerg.obj \ $(OBJS)\monodll_fontdlgg.obj \ + $(OBJS)\monodll_fontpickerg.obj \ $(OBJS)\monodll_listctrl.obj \ $(OBJS)\monodll_mdig.obj \ $(OBJS)\monodll_msgdlgg.obj \ @@ -1654,6 +1802,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_metal.obj \ $(OBJS)\monodll_mono.obj \ $(OBJS)\monodll_win32.obj \ + $(OBJS)\monodll_accelcmn.obj \ $(OBJS)\monodll_accesscmn.obj \ $(OBJS)\monodll_anidecod.obj \ $(OBJS)\monodll_appcmn.obj \ @@ -1661,6 +1810,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_artstd.obj \ $(OBJS)\monodll_bmpbase.obj \ $(OBJS)\monodll_bookctrl.obj \ + $(OBJS)\monodll_btncmn.obj \ + $(OBJS)\monodll_cairo.obj \ $(OBJS)\monodll_choiccmn.obj \ $(OBJS)\monodll_clipcmn.obj \ $(OBJS)\monodll_clrpickercmn.obj \ @@ -1676,6 +1827,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dcbase.obj \ $(OBJS)\monodll_dcbufcmn.obj \ $(OBJS)\monodll_dcgraph.obj \ + $(OBJS)\monodll_dcsvg.obj \ $(OBJS)\monodll_dlgcmn.obj \ $(OBJS)\monodll_dndcmn.obj \ $(OBJS)\monodll_dobjcmn.obj \ @@ -1684,8 +1836,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dpycmn.obj \ $(OBJS)\monodll_dseldlg.obj \ $(OBJS)\monodll_effects.obj \ - $(OBJS)\monodll_evtloopcmn.obj \ $(OBJS)\monodll_fddlgcmn.obj \ + $(OBJS)\monodll_filectrlcmn.obj \ $(OBJS)\monodll_filepickercmn.obj \ $(OBJS)\monodll_fontpickercmn.obj \ $(OBJS)\monodll_fldlgcmn.obj \ @@ -1734,29 +1886,28 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_sizer.obj \ $(OBJS)\monodll_srchcmn.obj \ $(OBJS)\monodll_statbar.obj \ + $(OBJS)\monodll_stattextcmn.obj \ $(OBJS)\monodll_stockitem.obj \ $(OBJS)\monodll_tbarbase.obj \ $(OBJS)\monodll_textcmn.obj \ - $(OBJS)\monodll_timercmn.obj \ + $(OBJS)\monodll_textentrycmn.obj \ $(OBJS)\monodll_toplvcmn.obj \ $(OBJS)\monodll_treebase.obj \ $(OBJS)\monodll_valgen.obj \ $(OBJS)\monodll_validate.obj \ $(OBJS)\monodll_valtext.obj \ $(OBJS)\monodll_wincmn.obj \ + $(OBJS)\monodll_windowid.obj \ $(OBJS)\monodll_xpmdecod.obj \ $(OBJS)\monodll_busyinfo.obj \ $(OBJS)\monodll_buttonbar.obj \ $(OBJS)\monodll_choicdgg.obj \ $(OBJS)\monodll_choicbkg.obj \ - $(OBJS)\monodll_clrpickerg.obj \ - $(OBJS)\monodll_collpaneg.obj \ $(OBJS)\monodll_combog.obj \ $(OBJS)\monodll_dcpsg.obj \ $(OBJS)\monodll_dirctrlg.obj \ $(OBJS)\monodll_dragimgg.obj \ - $(OBJS)\monodll_filepickerg.obj \ - $(OBJS)\monodll_fontpickerg.obj \ + $(OBJS)\monodll_filectrlg.obj \ $(OBJS)\monodll_listbkg.obj \ $(OBJS)\monodll_logg.obj \ $(OBJS)\monodll_numdlgg.obj \ @@ -1783,17 +1934,18 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_datavcmn.obj \ $(OBJS)\monodll_hyperlnkcmn.obj \ $(OBJS)\monodll_aboutdlgg.obj \ - $(OBJS)\monodll_animateg.obj \ $(OBJS)\monodll_bmpcboxg.obj \ $(OBJS)\monodll_calctrl.obj \ $(OBJS)\monodll_datavgen.obj \ $(OBJS)\monodll_datectlg.obj \ + $(OBJS)\monodll_editlbox.obj \ $(OBJS)\monodll_grid.obj \ $(OBJS)\monodll_gridctrl.obj \ $(OBJS)\monodll_gridsel.obj \ $(OBJS)\monodll_helpext.obj \ $(OBJS)\monodll_hyperlinkg.obj \ $(OBJS)\monodll_laywin.obj \ + $(OBJS)\monodll_notifmsgg.obj \ $(OBJS)\monodll_odcombo.obj \ $(OBJS)\monodll_propdlg.obj \ $(OBJS)\monodll_sashwin.obj \ @@ -1801,7 +1953,9 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_tipdlg.obj \ $(OBJS)\monodll_wizard.obj \ $(OBJS)\monodll_taskbarcmn.obj \ + $(OBJS)\monodll_animateg.obj \ $(OBJS)\monodll_aboutdlg.obj \ + $(OBJS)\monodll_notifmsg.obj \ $(OBJS)\monodll_sound.obj \ $(OBJS)\monodll_taskbar.obj \ $(OBJS)\monodll_joystick.obj \ @@ -1813,17 +1967,18 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_datavcmn.obj \ $(OBJS)\monodll_hyperlnkcmn.obj \ $(OBJS)\monodll_aboutdlgg.obj \ - $(OBJS)\monodll_animateg.obj \ $(OBJS)\monodll_bmpcboxg.obj \ $(OBJS)\monodll_calctrl.obj \ $(OBJS)\monodll_datavgen.obj \ $(OBJS)\monodll_datectlg.obj \ + $(OBJS)\monodll_editlbox.obj \ $(OBJS)\monodll_grid.obj \ $(OBJS)\monodll_gridctrl.obj \ $(OBJS)\monodll_gridsel.obj \ $(OBJS)\monodll_helpext.obj \ $(OBJS)\monodll_hyperlinkg.obj \ $(OBJS)\monodll_laywin.obj \ + $(OBJS)\monodll_notifmsgg.obj \ $(OBJS)\monodll_odcombo.obj \ $(OBJS)\monodll_propdlg.obj \ $(OBJS)\monodll_sashwin.obj \ @@ -1831,10 +1986,16 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_tipdlg.obj \ $(OBJS)\monodll_wizard.obj \ $(OBJS)\monodll_taskbarcmn.obj \ + $(OBJS)\monodll_animateg.obj \ $(OBJS)\monodll_aboutdlg.obj \ + $(OBJS)\monodll_notifmsg.obj \ $(OBJS)\monodll_sound.obj \ $(OBJS)\monodll_taskbar.obj \ - $(OBJS)\monodll_joystick.obj + $(OBJS)\monodll_joystick.obj \ + $(OBJS)\monodll_animateg.obj +!endif +!if "$(USE_STC)" == "1" +__wxscintilla_library_link_DEP = $(__wxscintilla) !endif !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0" __monolib___depname = \ @@ -1873,11 +2034,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_m_tables.obj \ $(OBJS)\monolib_winpars.obj \ $(OBJS)\monolib_htmllbox.obj \ - $(OBJS)\monolib_db.obj \ - $(OBJS)\monolib_dbtable.obj \ $(OBJS)\monolib_debugrpt.obj \ $(OBJS)\monolib_dbgrptg.obj \ - $(OBJS)\monolib_dbgrid.obj \ $(OBJS)\monolib_xh_animatctrl.obj \ $(OBJS)\monolib_xh_bmp.obj \ $(OBJS)\monolib_xh_bmpcbox.obj \ @@ -1910,6 +2068,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_notbk.obj \ $(OBJS)\monolib_xh_odcombo.obj \ $(OBJS)\monolib_xh_panel.obj \ + $(OBJS)\monolib_xh_propdlg.obj \ $(OBJS)\monolib_xh_radbt.obj \ $(OBJS)\monolib_xh_radbx.obj \ $(OBJS)\monolib_xh_scrol.obj \ @@ -1919,6 +2078,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_slidr.obj \ $(OBJS)\monolib_xh_spin.obj \ $(OBJS)\monolib_xh_split.obj \ + $(OBJS)\monolib_xh_srchctrl.obj \ $(OBJS)\monolib_xh_statbar.obj \ $(OBJS)\monolib_xh_stbmp.obj \ $(OBJS)\monolib_xh_stbox.obj \ @@ -1946,7 +2106,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_richtextformatdlg.obj \ $(OBJS)\monolib_richtextsymboldlg.obj \ $(OBJS)\monolib_richtextstyledlg.obj \ - $(OBJS)\monolib_richtextprint.obj + $(OBJS)\monolib_richtextprint.obj \ + $(OBJS)\monolib_stc.obj \ + $(OBJS)\monolib_PlatWX.obj \ + $(OBJS)\monolib_ScintillaWX.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_1_OBJECTS = \ @@ -1967,7 +2130,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dib.obj \ $(OBJS)\monolib_display.obj \ $(OBJS)\monolib_enhmeta.obj \ - $(OBJS)\monolib_evtloop.obj \ $(OBJS)\monolib_font.obj \ $(OBJS)\monolib_fontenum.obj \ $(OBJS)\monolib_fontutil.obj \ @@ -1975,7 +2137,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gdiobj.obj \ $(OBJS)\monolib_gdiplus.obj \ $(OBJS)\monolib_graphics.obj \ - $(OBJS)\monolib_gsockmsw.obj \ $(OBJS)\monolib_icon.obj \ $(OBJS)\monolib_imaglist.obj \ $(OBJS)\monolib_minifram.obj \ @@ -1991,7 +2152,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_region.obj \ $(OBJS)\monolib_renderer.obj \ $(OBJS)\monolib_settings.obj \ - $(OBJS)\monolib_timer.obj \ $(OBJS)\monolib_tooltip.obj \ $(OBJS)\monolib_toplevel.obj \ $(OBJS)\monolib_utilsgui.obj \ @@ -2001,6 +2161,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_helpwin.obj \ $(OBJS)\monolib_automtn.obj \ $(OBJS)\monolib_uuid.obj \ + $(OBJS)\monolib_clrpickerg.obj \ + $(OBJS)\monolib_collpaneg.obj \ + $(OBJS)\monolib_filepickerg.obj \ + $(OBJS)\monolib_fontpickerg.obj \ $(OBJS)\monolib_statusbr.obj \ $(OBJS)\monolib_prntdlgg.obj \ $(OBJS)\monolib_accel.obj \ @@ -2044,11 +2208,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_tabctrl.obj \ $(OBJS)\monolib_tbar95.obj \ $(OBJS)\monolib_textctrl.obj \ + $(OBJS)\monolib_textentry.obj \ $(OBJS)\monolib_tglbtn.obj \ $(OBJS)\monolib_treectrl.obj \ $(OBJS)\monolib_checklst.obj \ $(OBJS)\monolib_fdrepdlg.obj \ $(OBJS)\monolib_fontdlg.obj \ + $(OBJS)\monolib_accelcmn.obj \ $(OBJS)\monolib_accesscmn.obj \ $(OBJS)\monolib_anidecod.obj \ $(OBJS)\monolib_appcmn.obj \ @@ -2056,6 +2222,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_artstd.obj \ $(OBJS)\monolib_bmpbase.obj \ $(OBJS)\monolib_bookctrl.obj \ + $(OBJS)\monolib_btncmn.obj \ + $(OBJS)\monolib_cairo.obj \ $(OBJS)\monolib_choiccmn.obj \ $(OBJS)\monolib_clipcmn.obj \ $(OBJS)\monolib_clrpickercmn.obj \ @@ -2071,6 +2239,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dcbase.obj \ $(OBJS)\monolib_dcbufcmn.obj \ $(OBJS)\monolib_dcgraph.obj \ + $(OBJS)\monolib_dcsvg.obj \ $(OBJS)\monolib_dlgcmn.obj \ $(OBJS)\monolib_dndcmn.obj \ $(OBJS)\monolib_dobjcmn.obj \ @@ -2079,8 +2248,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dpycmn.obj \ $(OBJS)\monolib_dseldlg.obj \ $(OBJS)\monolib_effects.obj \ - $(OBJS)\monolib_evtloopcmn.obj \ $(OBJS)\monolib_fddlgcmn.obj \ + $(OBJS)\monolib_filectrlcmn.obj \ $(OBJS)\monolib_filepickercmn.obj \ $(OBJS)\monolib_fontpickercmn.obj \ $(OBJS)\monolib_fldlgcmn.obj \ @@ -2129,29 +2298,28 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_sizer.obj \ $(OBJS)\monolib_srchcmn.obj \ $(OBJS)\monolib_statbar.obj \ + $(OBJS)\monolib_stattextcmn.obj \ $(OBJS)\monolib_stockitem.obj \ $(OBJS)\monolib_tbarbase.obj \ $(OBJS)\monolib_textcmn.obj \ - $(OBJS)\monolib_timercmn.obj \ + $(OBJS)\monolib_textentrycmn.obj \ $(OBJS)\monolib_toplvcmn.obj \ $(OBJS)\monolib_treebase.obj \ $(OBJS)\monolib_valgen.obj \ $(OBJS)\monolib_validate.obj \ $(OBJS)\monolib_valtext.obj \ $(OBJS)\monolib_wincmn.obj \ + $(OBJS)\monolib_windowid.obj \ $(OBJS)\monolib_xpmdecod.obj \ $(OBJS)\monolib_busyinfo.obj \ $(OBJS)\monolib_buttonbar.obj \ $(OBJS)\monolib_choicdgg.obj \ $(OBJS)\monolib_choicbkg.obj \ - $(OBJS)\monolib_clrpickerg.obj \ - $(OBJS)\monolib_collpaneg.obj \ $(OBJS)\monolib_combog.obj \ $(OBJS)\monolib_dcpsg.obj \ $(OBJS)\monolib_dirctrlg.obj \ $(OBJS)\monolib_dragimgg.obj \ - $(OBJS)\monolib_filepickerg.obj \ - $(OBJS)\monolib_fontpickerg.obj \ + $(OBJS)\monolib_filectrlg.obj \ $(OBJS)\monolib_listbkg.obj \ $(OBJS)\monolib_logg.obj \ $(OBJS)\monolib_numdlgg.obj \ @@ -2191,7 +2359,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dib.obj \ $(OBJS)\monolib_display.obj \ $(OBJS)\monolib_enhmeta.obj \ - $(OBJS)\monolib_evtloop.obj \ $(OBJS)\monolib_font.obj \ $(OBJS)\monolib_fontenum.obj \ $(OBJS)\monolib_fontutil.obj \ @@ -2199,7 +2366,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gdiobj.obj \ $(OBJS)\monolib_gdiplus.obj \ $(OBJS)\monolib_graphics.obj \ - $(OBJS)\monolib_gsockmsw.obj \ $(OBJS)\monolib_icon.obj \ $(OBJS)\monolib_imaglist.obj \ $(OBJS)\monolib_minifram.obj \ @@ -2215,7 +2381,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_region.obj \ $(OBJS)\monolib_renderer.obj \ $(OBJS)\monolib_settings.obj \ - $(OBJS)\monolib_timer.obj \ $(OBJS)\monolib_tooltip.obj \ $(OBJS)\monolib_toplevel.obj \ $(OBJS)\monolib_utilsgui.obj \ @@ -2226,11 +2391,15 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_automtn.obj \ $(OBJS)\monolib_uuid.obj \ $(OBJS)\monolib_accel.obj \ + $(OBJS)\monolib_clrpickerg.obj \ + $(OBJS)\monolib_collpaneg.obj \ $(OBJS)\monolib_colrdlgg.obj \ $(OBJS)\monolib_dirdlgg.obj \ $(OBJS)\monolib_fdrepdlg.obj \ $(OBJS)\monolib_filedlgg.obj \ + $(OBJS)\monolib_filepickerg.obj \ $(OBJS)\monolib_fontdlgg.obj \ + $(OBJS)\monolib_fontpickerg.obj \ $(OBJS)\monolib_listctrl.obj \ $(OBJS)\monolib_mdig.obj \ $(OBJS)\monolib_msgdlgg.obj \ @@ -2276,6 +2445,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_metal.obj \ $(OBJS)\monolib_mono.obj \ $(OBJS)\monolib_win32.obj \ + $(OBJS)\monolib_accelcmn.obj \ $(OBJS)\monolib_accesscmn.obj \ $(OBJS)\monolib_anidecod.obj \ $(OBJS)\monolib_appcmn.obj \ @@ -2283,6 +2453,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_artstd.obj \ $(OBJS)\monolib_bmpbase.obj \ $(OBJS)\monolib_bookctrl.obj \ + $(OBJS)\monolib_btncmn.obj \ + $(OBJS)\monolib_cairo.obj \ $(OBJS)\monolib_choiccmn.obj \ $(OBJS)\monolib_clipcmn.obj \ $(OBJS)\monolib_clrpickercmn.obj \ @@ -2298,6 +2470,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dcbase.obj \ $(OBJS)\monolib_dcbufcmn.obj \ $(OBJS)\monolib_dcgraph.obj \ + $(OBJS)\monolib_dcsvg.obj \ $(OBJS)\monolib_dlgcmn.obj \ $(OBJS)\monolib_dndcmn.obj \ $(OBJS)\monolib_dobjcmn.obj \ @@ -2306,8 +2479,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dpycmn.obj \ $(OBJS)\monolib_dseldlg.obj \ $(OBJS)\monolib_effects.obj \ - $(OBJS)\monolib_evtloopcmn.obj \ $(OBJS)\monolib_fddlgcmn.obj \ + $(OBJS)\monolib_filectrlcmn.obj \ $(OBJS)\monolib_filepickercmn.obj \ $(OBJS)\monolib_fontpickercmn.obj \ $(OBJS)\monolib_fldlgcmn.obj \ @@ -2356,29 +2529,28 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_sizer.obj \ $(OBJS)\monolib_srchcmn.obj \ $(OBJS)\monolib_statbar.obj \ + $(OBJS)\monolib_stattextcmn.obj \ $(OBJS)\monolib_stockitem.obj \ $(OBJS)\monolib_tbarbase.obj \ $(OBJS)\monolib_textcmn.obj \ - $(OBJS)\monolib_timercmn.obj \ + $(OBJS)\monolib_textentrycmn.obj \ $(OBJS)\monolib_toplvcmn.obj \ $(OBJS)\monolib_treebase.obj \ $(OBJS)\monolib_valgen.obj \ $(OBJS)\monolib_validate.obj \ $(OBJS)\monolib_valtext.obj \ $(OBJS)\monolib_wincmn.obj \ + $(OBJS)\monolib_windowid.obj \ $(OBJS)\monolib_xpmdecod.obj \ $(OBJS)\monolib_busyinfo.obj \ $(OBJS)\monolib_buttonbar.obj \ $(OBJS)\monolib_choicdgg.obj \ $(OBJS)\monolib_choicbkg.obj \ - $(OBJS)\monolib_clrpickerg.obj \ - $(OBJS)\monolib_collpaneg.obj \ $(OBJS)\monolib_combog.obj \ $(OBJS)\monolib_dcpsg.obj \ $(OBJS)\monolib_dirctrlg.obj \ $(OBJS)\monolib_dragimgg.obj \ - $(OBJS)\monolib_filepickerg.obj \ - $(OBJS)\monolib_fontpickerg.obj \ + $(OBJS)\monolib_filectrlg.obj \ $(OBJS)\monolib_listbkg.obj \ $(OBJS)\monolib_logg.obj \ $(OBJS)\monolib_numdlgg.obj \ @@ -2405,17 +2577,18 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_datavcmn.obj \ $(OBJS)\monolib_hyperlnkcmn.obj \ $(OBJS)\monolib_aboutdlgg.obj \ - $(OBJS)\monolib_animateg.obj \ $(OBJS)\monolib_bmpcboxg.obj \ $(OBJS)\monolib_calctrl.obj \ $(OBJS)\monolib_datavgen.obj \ $(OBJS)\monolib_datectlg.obj \ + $(OBJS)\monolib_editlbox.obj \ $(OBJS)\monolib_grid.obj \ $(OBJS)\monolib_gridctrl.obj \ $(OBJS)\monolib_gridsel.obj \ $(OBJS)\monolib_helpext.obj \ $(OBJS)\monolib_hyperlinkg.obj \ $(OBJS)\monolib_laywin.obj \ + $(OBJS)\monolib_notifmsgg.obj \ $(OBJS)\monolib_odcombo.obj \ $(OBJS)\monolib_propdlg.obj \ $(OBJS)\monolib_sashwin.obj \ @@ -2423,7 +2596,9 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_tipdlg.obj \ $(OBJS)\monolib_wizard.obj \ $(OBJS)\monolib_taskbarcmn.obj \ + $(OBJS)\monolib_animateg.obj \ $(OBJS)\monolib_aboutdlg.obj \ + $(OBJS)\monolib_notifmsg.obj \ $(OBJS)\monolib_sound.obj \ $(OBJS)\monolib_taskbar.obj \ $(OBJS)\monolib_joystick.obj \ @@ -2435,17 +2610,18 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_datavcmn.obj \ $(OBJS)\monolib_hyperlnkcmn.obj \ $(OBJS)\monolib_aboutdlgg.obj \ - $(OBJS)\monolib_animateg.obj \ $(OBJS)\monolib_bmpcboxg.obj \ $(OBJS)\monolib_calctrl.obj \ $(OBJS)\monolib_datavgen.obj \ $(OBJS)\monolib_datectlg.obj \ + $(OBJS)\monolib_editlbox.obj \ $(OBJS)\monolib_grid.obj \ $(OBJS)\monolib_gridctrl.obj \ $(OBJS)\monolib_gridsel.obj \ $(OBJS)\monolib_helpext.obj \ $(OBJS)\monolib_hyperlinkg.obj \ $(OBJS)\monolib_laywin.obj \ + $(OBJS)\monolib_notifmsgg.obj \ $(OBJS)\monolib_odcombo.obj \ $(OBJS)\monolib_propdlg.obj \ $(OBJS)\monolib_sashwin.obj \ @@ -2453,10 +2629,13 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_tipdlg.obj \ $(OBJS)\monolib_wizard.obj \ $(OBJS)\monolib_taskbarcmn.obj \ + $(OBJS)\monolib_animateg.obj \ $(OBJS)\monolib_aboutdlg.obj \ + $(OBJS)\monolib_notifmsg.obj \ $(OBJS)\monolib_sound.obj \ $(OBJS)\monolib_taskbar.obj \ - $(OBJS)\monolib_joystick.obj + $(OBJS)\monolib_joystick.obj \ + $(OBJS)\monolib_animateg.obj !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" __basedll___depname = \ @@ -2509,7 +2688,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dib.obj \ $(OBJS)\coredll_display.obj \ $(OBJS)\coredll_enhmeta.obj \ - $(OBJS)\coredll_evtloop.obj \ $(OBJS)\coredll_font.obj \ $(OBJS)\coredll_fontenum.obj \ $(OBJS)\coredll_fontutil.obj \ @@ -2517,7 +2695,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_gdiobj.obj \ $(OBJS)\coredll_gdiplus.obj \ $(OBJS)\coredll_graphics.obj \ - $(OBJS)\coredll_gsockmsw.obj \ $(OBJS)\coredll_icon.obj \ $(OBJS)\coredll_imaglist.obj \ $(OBJS)\coredll_minifram.obj \ @@ -2533,7 +2710,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_region.obj \ $(OBJS)\coredll_renderer.obj \ $(OBJS)\coredll_settings.obj \ - $(OBJS)\coredll_timer.obj \ $(OBJS)\coredll_tooltip.obj \ $(OBJS)\coredll_toplevel.obj \ $(OBJS)\coredll_utilsgui.obj \ @@ -2543,6 +2719,10 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_helpwin.obj \ $(OBJS)\coredll_automtn.obj \ $(OBJS)\coredll_uuid.obj \ + $(OBJS)\coredll_clrpickerg.obj \ + $(OBJS)\coredll_collpaneg.obj \ + $(OBJS)\coredll_filepickerg.obj \ + $(OBJS)\coredll_fontpickerg.obj \ $(OBJS)\coredll_statusbr.obj \ $(OBJS)\coredll_prntdlgg.obj \ $(OBJS)\coredll_accel.obj \ @@ -2586,11 +2766,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_tabctrl.obj \ $(OBJS)\coredll_tbar95.obj \ $(OBJS)\coredll_textctrl.obj \ + $(OBJS)\coredll_textentry.obj \ $(OBJS)\coredll_tglbtn.obj \ $(OBJS)\coredll_treectrl.obj \ $(OBJS)\coredll_checklst.obj \ $(OBJS)\coredll_fdrepdlg.obj \ $(OBJS)\coredll_fontdlg.obj \ + $(OBJS)\coredll_accelcmn.obj \ $(OBJS)\coredll_accesscmn.obj \ $(OBJS)\coredll_anidecod.obj \ $(OBJS)\coredll_appcmn.obj \ @@ -2598,6 +2780,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_artstd.obj \ $(OBJS)\coredll_bmpbase.obj \ $(OBJS)\coredll_bookctrl.obj \ + $(OBJS)\coredll_btncmn.obj \ + $(OBJS)\coredll_cairo.obj \ $(OBJS)\coredll_choiccmn.obj \ $(OBJS)\coredll_clipcmn.obj \ $(OBJS)\coredll_clrpickercmn.obj \ @@ -2613,6 +2797,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dcbase.obj \ $(OBJS)\coredll_dcbufcmn.obj \ $(OBJS)\coredll_dcgraph.obj \ + $(OBJS)\coredll_dcsvg.obj \ $(OBJS)\coredll_dlgcmn.obj \ $(OBJS)\coredll_dndcmn.obj \ $(OBJS)\coredll_dobjcmn.obj \ @@ -2621,8 +2806,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dpycmn.obj \ $(OBJS)\coredll_dseldlg.obj \ $(OBJS)\coredll_effects.obj \ - $(OBJS)\coredll_evtloopcmn.obj \ $(OBJS)\coredll_fddlgcmn.obj \ + $(OBJS)\coredll_filectrlcmn.obj \ $(OBJS)\coredll_filepickercmn.obj \ $(OBJS)\coredll_fontpickercmn.obj \ $(OBJS)\coredll_fldlgcmn.obj \ @@ -2671,29 +2856,28 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_sizer.obj \ $(OBJS)\coredll_srchcmn.obj \ $(OBJS)\coredll_statbar.obj \ + $(OBJS)\coredll_stattextcmn.obj \ $(OBJS)\coredll_stockitem.obj \ $(OBJS)\coredll_tbarbase.obj \ $(OBJS)\coredll_textcmn.obj \ - $(OBJS)\coredll_timercmn.obj \ + $(OBJS)\coredll_textentrycmn.obj \ $(OBJS)\coredll_toplvcmn.obj \ $(OBJS)\coredll_treebase.obj \ $(OBJS)\coredll_valgen.obj \ $(OBJS)\coredll_validate.obj \ $(OBJS)\coredll_valtext.obj \ $(OBJS)\coredll_wincmn.obj \ + $(OBJS)\coredll_windowid.obj \ $(OBJS)\coredll_xpmdecod.obj \ $(OBJS)\coredll_busyinfo.obj \ $(OBJS)\coredll_buttonbar.obj \ $(OBJS)\coredll_choicdgg.obj \ $(OBJS)\coredll_choicbkg.obj \ - $(OBJS)\coredll_clrpickerg.obj \ - $(OBJS)\coredll_collpaneg.obj \ $(OBJS)\coredll_combog.obj \ $(OBJS)\coredll_dcpsg.obj \ $(OBJS)\coredll_dirctrlg.obj \ $(OBJS)\coredll_dragimgg.obj \ - $(OBJS)\coredll_filepickerg.obj \ - $(OBJS)\coredll_fontpickerg.obj \ + $(OBJS)\coredll_filectrlg.obj \ $(OBJS)\coredll_listbkg.obj \ $(OBJS)\coredll_logg.obj \ $(OBJS)\coredll_numdlgg.obj \ @@ -2733,7 +2917,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dib.obj \ $(OBJS)\coredll_display.obj \ $(OBJS)\coredll_enhmeta.obj \ - $(OBJS)\coredll_evtloop.obj \ $(OBJS)\coredll_font.obj \ $(OBJS)\coredll_fontenum.obj \ $(OBJS)\coredll_fontutil.obj \ @@ -2741,7 +2924,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_gdiobj.obj \ $(OBJS)\coredll_gdiplus.obj \ $(OBJS)\coredll_graphics.obj \ - $(OBJS)\coredll_gsockmsw.obj \ $(OBJS)\coredll_icon.obj \ $(OBJS)\coredll_imaglist.obj \ $(OBJS)\coredll_minifram.obj \ @@ -2757,7 +2939,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_region.obj \ $(OBJS)\coredll_renderer.obj \ $(OBJS)\coredll_settings.obj \ - $(OBJS)\coredll_timer.obj \ $(OBJS)\coredll_tooltip.obj \ $(OBJS)\coredll_toplevel.obj \ $(OBJS)\coredll_utilsgui.obj \ @@ -2768,11 +2949,15 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_automtn.obj \ $(OBJS)\coredll_uuid.obj \ $(OBJS)\coredll_accel.obj \ + $(OBJS)\coredll_clrpickerg.obj \ + $(OBJS)\coredll_collpaneg.obj \ $(OBJS)\coredll_colrdlgg.obj \ $(OBJS)\coredll_dirdlgg.obj \ $(OBJS)\coredll_fdrepdlg.obj \ $(OBJS)\coredll_filedlgg.obj \ + $(OBJS)\coredll_filepickerg.obj \ $(OBJS)\coredll_fontdlgg.obj \ + $(OBJS)\coredll_fontpickerg.obj \ $(OBJS)\coredll_listctrl.obj \ $(OBJS)\coredll_mdig.obj \ $(OBJS)\coredll_msgdlgg.obj \ @@ -2818,6 +3003,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_metal.obj \ $(OBJS)\coredll_mono.obj \ $(OBJS)\coredll_win32.obj \ + $(OBJS)\coredll_accelcmn.obj \ $(OBJS)\coredll_accesscmn.obj \ $(OBJS)\coredll_anidecod.obj \ $(OBJS)\coredll_appcmn.obj \ @@ -2825,6 +3011,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_artstd.obj \ $(OBJS)\coredll_bmpbase.obj \ $(OBJS)\coredll_bookctrl.obj \ + $(OBJS)\coredll_btncmn.obj \ + $(OBJS)\coredll_cairo.obj \ $(OBJS)\coredll_choiccmn.obj \ $(OBJS)\coredll_clipcmn.obj \ $(OBJS)\coredll_clrpickercmn.obj \ @@ -2840,6 +3028,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dcbase.obj \ $(OBJS)\coredll_dcbufcmn.obj \ $(OBJS)\coredll_dcgraph.obj \ + $(OBJS)\coredll_dcsvg.obj \ $(OBJS)\coredll_dlgcmn.obj \ $(OBJS)\coredll_dndcmn.obj \ $(OBJS)\coredll_dobjcmn.obj \ @@ -2848,8 +3037,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dpycmn.obj \ $(OBJS)\coredll_dseldlg.obj \ $(OBJS)\coredll_effects.obj \ - $(OBJS)\coredll_evtloopcmn.obj \ $(OBJS)\coredll_fddlgcmn.obj \ + $(OBJS)\coredll_filectrlcmn.obj \ $(OBJS)\coredll_filepickercmn.obj \ $(OBJS)\coredll_fontpickercmn.obj \ $(OBJS)\coredll_fldlgcmn.obj \ @@ -2898,29 +3087,28 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_sizer.obj \ $(OBJS)\coredll_srchcmn.obj \ $(OBJS)\coredll_statbar.obj \ + $(OBJS)\coredll_stattextcmn.obj \ $(OBJS)\coredll_stockitem.obj \ $(OBJS)\coredll_tbarbase.obj \ $(OBJS)\coredll_textcmn.obj \ - $(OBJS)\coredll_timercmn.obj \ + $(OBJS)\coredll_textentrycmn.obj \ $(OBJS)\coredll_toplvcmn.obj \ $(OBJS)\coredll_treebase.obj \ $(OBJS)\coredll_valgen.obj \ $(OBJS)\coredll_validate.obj \ $(OBJS)\coredll_valtext.obj \ $(OBJS)\coredll_wincmn.obj \ + $(OBJS)\coredll_windowid.obj \ $(OBJS)\coredll_xpmdecod.obj \ $(OBJS)\coredll_busyinfo.obj \ $(OBJS)\coredll_buttonbar.obj \ $(OBJS)\coredll_choicdgg.obj \ $(OBJS)\coredll_choicbkg.obj \ - $(OBJS)\coredll_clrpickerg.obj \ - $(OBJS)\coredll_collpaneg.obj \ $(OBJS)\coredll_combog.obj \ $(OBJS)\coredll_dcpsg.obj \ $(OBJS)\coredll_dirctrlg.obj \ $(OBJS)\coredll_dragimgg.obj \ - $(OBJS)\coredll_filepickerg.obj \ - $(OBJS)\coredll_fontpickerg.obj \ + $(OBJS)\coredll_filectrlg.obj \ $(OBJS)\coredll_listbkg.obj \ $(OBJS)\coredll_logg.obj \ $(OBJS)\coredll_numdlgg.obj \ @@ -2964,7 +3152,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dib.obj \ $(OBJS)\corelib_display.obj \ $(OBJS)\corelib_enhmeta.obj \ - $(OBJS)\corelib_evtloop.obj \ $(OBJS)\corelib_font.obj \ $(OBJS)\corelib_fontenum.obj \ $(OBJS)\corelib_fontutil.obj \ @@ -2972,7 +3159,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_gdiobj.obj \ $(OBJS)\corelib_gdiplus.obj \ $(OBJS)\corelib_graphics.obj \ - $(OBJS)\corelib_gsockmsw.obj \ $(OBJS)\corelib_icon.obj \ $(OBJS)\corelib_imaglist.obj \ $(OBJS)\corelib_minifram.obj \ @@ -2988,7 +3174,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_region.obj \ $(OBJS)\corelib_renderer.obj \ $(OBJS)\corelib_settings.obj \ - $(OBJS)\corelib_timer.obj \ $(OBJS)\corelib_tooltip.obj \ $(OBJS)\corelib_toplevel.obj \ $(OBJS)\corelib_utilsgui.obj \ @@ -2998,6 +3183,10 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_helpwin.obj \ $(OBJS)\corelib_automtn.obj \ $(OBJS)\corelib_uuid.obj \ + $(OBJS)\corelib_clrpickerg.obj \ + $(OBJS)\corelib_collpaneg.obj \ + $(OBJS)\corelib_filepickerg.obj \ + $(OBJS)\corelib_fontpickerg.obj \ $(OBJS)\corelib_statusbr.obj \ $(OBJS)\corelib_prntdlgg.obj \ $(OBJS)\corelib_accel.obj \ @@ -3041,11 +3230,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_tabctrl.obj \ $(OBJS)\corelib_tbar95.obj \ $(OBJS)\corelib_textctrl.obj \ + $(OBJS)\corelib_textentry.obj \ $(OBJS)\corelib_tglbtn.obj \ $(OBJS)\corelib_treectrl.obj \ $(OBJS)\corelib_checklst.obj \ $(OBJS)\corelib_fdrepdlg.obj \ $(OBJS)\corelib_fontdlg.obj \ + $(OBJS)\corelib_accelcmn.obj \ $(OBJS)\corelib_accesscmn.obj \ $(OBJS)\corelib_anidecod.obj \ $(OBJS)\corelib_appcmn.obj \ @@ -3053,6 +3244,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_artstd.obj \ $(OBJS)\corelib_bmpbase.obj \ $(OBJS)\corelib_bookctrl.obj \ + $(OBJS)\corelib_btncmn.obj \ + $(OBJS)\corelib_cairo.obj \ $(OBJS)\corelib_choiccmn.obj \ $(OBJS)\corelib_clipcmn.obj \ $(OBJS)\corelib_clrpickercmn.obj \ @@ -3068,6 +3261,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dcbase.obj \ $(OBJS)\corelib_dcbufcmn.obj \ $(OBJS)\corelib_dcgraph.obj \ + $(OBJS)\corelib_dcsvg.obj \ $(OBJS)\corelib_dlgcmn.obj \ $(OBJS)\corelib_dndcmn.obj \ $(OBJS)\corelib_dobjcmn.obj \ @@ -3076,8 +3270,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dpycmn.obj \ $(OBJS)\corelib_dseldlg.obj \ $(OBJS)\corelib_effects.obj \ - $(OBJS)\corelib_evtloopcmn.obj \ $(OBJS)\corelib_fddlgcmn.obj \ + $(OBJS)\corelib_filectrlcmn.obj \ $(OBJS)\corelib_filepickercmn.obj \ $(OBJS)\corelib_fontpickercmn.obj \ $(OBJS)\corelib_fldlgcmn.obj \ @@ -3126,29 +3320,28 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_sizer.obj \ $(OBJS)\corelib_srchcmn.obj \ $(OBJS)\corelib_statbar.obj \ + $(OBJS)\corelib_stattextcmn.obj \ $(OBJS)\corelib_stockitem.obj \ $(OBJS)\corelib_tbarbase.obj \ $(OBJS)\corelib_textcmn.obj \ - $(OBJS)\corelib_timercmn.obj \ + $(OBJS)\corelib_textentrycmn.obj \ $(OBJS)\corelib_toplvcmn.obj \ $(OBJS)\corelib_treebase.obj \ $(OBJS)\corelib_valgen.obj \ $(OBJS)\corelib_validate.obj \ $(OBJS)\corelib_valtext.obj \ $(OBJS)\corelib_wincmn.obj \ + $(OBJS)\corelib_windowid.obj \ $(OBJS)\corelib_xpmdecod.obj \ $(OBJS)\corelib_busyinfo.obj \ $(OBJS)\corelib_buttonbar.obj \ $(OBJS)\corelib_choicdgg.obj \ $(OBJS)\corelib_choicbkg.obj \ - $(OBJS)\corelib_clrpickerg.obj \ - $(OBJS)\corelib_collpaneg.obj \ $(OBJS)\corelib_combog.obj \ $(OBJS)\corelib_dcpsg.obj \ $(OBJS)\corelib_dirctrlg.obj \ $(OBJS)\corelib_dragimgg.obj \ - $(OBJS)\corelib_filepickerg.obj \ - $(OBJS)\corelib_fontpickerg.obj \ + $(OBJS)\corelib_filectrlg.obj \ $(OBJS)\corelib_listbkg.obj \ $(OBJS)\corelib_logg.obj \ $(OBJS)\corelib_numdlgg.obj \ @@ -3188,7 +3381,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dib.obj \ $(OBJS)\corelib_display.obj \ $(OBJS)\corelib_enhmeta.obj \ - $(OBJS)\corelib_evtloop.obj \ $(OBJS)\corelib_font.obj \ $(OBJS)\corelib_fontenum.obj \ $(OBJS)\corelib_fontutil.obj \ @@ -3196,7 +3388,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_gdiobj.obj \ $(OBJS)\corelib_gdiplus.obj \ $(OBJS)\corelib_graphics.obj \ - $(OBJS)\corelib_gsockmsw.obj \ $(OBJS)\corelib_icon.obj \ $(OBJS)\corelib_imaglist.obj \ $(OBJS)\corelib_minifram.obj \ @@ -3212,7 +3403,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_region.obj \ $(OBJS)\corelib_renderer.obj \ $(OBJS)\corelib_settings.obj \ - $(OBJS)\corelib_timer.obj \ $(OBJS)\corelib_tooltip.obj \ $(OBJS)\corelib_toplevel.obj \ $(OBJS)\corelib_utilsgui.obj \ @@ -3223,11 +3413,15 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_automtn.obj \ $(OBJS)\corelib_uuid.obj \ $(OBJS)\corelib_accel.obj \ + $(OBJS)\corelib_clrpickerg.obj \ + $(OBJS)\corelib_collpaneg.obj \ $(OBJS)\corelib_colrdlgg.obj \ $(OBJS)\corelib_dirdlgg.obj \ $(OBJS)\corelib_fdrepdlg.obj \ $(OBJS)\corelib_filedlgg.obj \ + $(OBJS)\corelib_filepickerg.obj \ $(OBJS)\corelib_fontdlgg.obj \ + $(OBJS)\corelib_fontpickerg.obj \ $(OBJS)\corelib_listctrl.obj \ $(OBJS)\corelib_mdig.obj \ $(OBJS)\corelib_msgdlgg.obj \ @@ -3273,6 +3467,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_metal.obj \ $(OBJS)\corelib_mono.obj \ $(OBJS)\corelib_win32.obj \ + $(OBJS)\corelib_accelcmn.obj \ $(OBJS)\corelib_accesscmn.obj \ $(OBJS)\corelib_anidecod.obj \ $(OBJS)\corelib_appcmn.obj \ @@ -3280,6 +3475,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_artstd.obj \ $(OBJS)\corelib_bmpbase.obj \ $(OBJS)\corelib_bookctrl.obj \ + $(OBJS)\corelib_btncmn.obj \ + $(OBJS)\corelib_cairo.obj \ $(OBJS)\corelib_choiccmn.obj \ $(OBJS)\corelib_clipcmn.obj \ $(OBJS)\corelib_clrpickercmn.obj \ @@ -3295,6 +3492,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dcbase.obj \ $(OBJS)\corelib_dcbufcmn.obj \ $(OBJS)\corelib_dcgraph.obj \ + $(OBJS)\corelib_dcsvg.obj \ $(OBJS)\corelib_dlgcmn.obj \ $(OBJS)\corelib_dndcmn.obj \ $(OBJS)\corelib_dobjcmn.obj \ @@ -3303,8 +3501,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dpycmn.obj \ $(OBJS)\corelib_dseldlg.obj \ $(OBJS)\corelib_effects.obj \ - $(OBJS)\corelib_evtloopcmn.obj \ $(OBJS)\corelib_fddlgcmn.obj \ + $(OBJS)\corelib_filectrlcmn.obj \ $(OBJS)\corelib_filepickercmn.obj \ $(OBJS)\corelib_fontpickercmn.obj \ $(OBJS)\corelib_fldlgcmn.obj \ @@ -3353,29 +3551,28 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_sizer.obj \ $(OBJS)\corelib_srchcmn.obj \ $(OBJS)\corelib_statbar.obj \ + $(OBJS)\corelib_stattextcmn.obj \ $(OBJS)\corelib_stockitem.obj \ $(OBJS)\corelib_tbarbase.obj \ $(OBJS)\corelib_textcmn.obj \ - $(OBJS)\corelib_timercmn.obj \ + $(OBJS)\corelib_textentrycmn.obj \ $(OBJS)\corelib_toplvcmn.obj \ $(OBJS)\corelib_treebase.obj \ $(OBJS)\corelib_valgen.obj \ $(OBJS)\corelib_validate.obj \ $(OBJS)\corelib_valtext.obj \ $(OBJS)\corelib_wincmn.obj \ + $(OBJS)\corelib_windowid.obj \ $(OBJS)\corelib_xpmdecod.obj \ $(OBJS)\corelib_busyinfo.obj \ $(OBJS)\corelib_buttonbar.obj \ $(OBJS)\corelib_choicdgg.obj \ $(OBJS)\corelib_choicbkg.obj \ - $(OBJS)\corelib_clrpickerg.obj \ - $(OBJS)\corelib_collpaneg.obj \ $(OBJS)\corelib_combog.obj \ $(OBJS)\corelib_dcpsg.obj \ $(OBJS)\corelib_dirctrlg.obj \ $(OBJS)\corelib_dragimgg.obj \ - $(OBJS)\corelib_filepickerg.obj \ - $(OBJS)\corelib_fontpickerg.obj \ + $(OBJS)\corelib_filectrlg.obj \ $(OBJS)\corelib_listbkg.obj \ $(OBJS)\corelib_logg.obj \ $(OBJS)\corelib_numdlgg.obj \ @@ -3412,17 +3609,18 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_datavcmn.obj \ $(OBJS)\advdll_hyperlnkcmn.obj \ $(OBJS)\advdll_aboutdlgg.obj \ - $(OBJS)\advdll_animateg.obj \ $(OBJS)\advdll_bmpcboxg.obj \ $(OBJS)\advdll_calctrl.obj \ $(OBJS)\advdll_datavgen.obj \ $(OBJS)\advdll_datectlg.obj \ + $(OBJS)\advdll_editlbox.obj \ $(OBJS)\advdll_grid.obj \ $(OBJS)\advdll_gridctrl.obj \ $(OBJS)\advdll_gridsel.obj \ $(OBJS)\advdll_helpext.obj \ $(OBJS)\advdll_hyperlinkg.obj \ $(OBJS)\advdll_laywin.obj \ + $(OBJS)\advdll_notifmsgg.obj \ $(OBJS)\advdll_odcombo.obj \ $(OBJS)\advdll_propdlg.obj \ $(OBJS)\advdll_sashwin.obj \ @@ -3430,7 +3628,9 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_tipdlg.obj \ $(OBJS)\advdll_wizard.obj \ $(OBJS)\advdll_taskbarcmn.obj \ + $(OBJS)\advdll_animateg.obj \ $(OBJS)\advdll_aboutdlg.obj \ + $(OBJS)\advdll_notifmsg.obj \ $(OBJS)\advdll_sound.obj \ $(OBJS)\advdll_taskbar.obj \ $(OBJS)\advdll_joystick.obj \ @@ -3442,17 +3642,18 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_datavcmn.obj \ $(OBJS)\advdll_hyperlnkcmn.obj \ $(OBJS)\advdll_aboutdlgg.obj \ - $(OBJS)\advdll_animateg.obj \ $(OBJS)\advdll_bmpcboxg.obj \ $(OBJS)\advdll_calctrl.obj \ $(OBJS)\advdll_datavgen.obj \ $(OBJS)\advdll_datectlg.obj \ + $(OBJS)\advdll_editlbox.obj \ $(OBJS)\advdll_grid.obj \ $(OBJS)\advdll_gridctrl.obj \ $(OBJS)\advdll_gridsel.obj \ $(OBJS)\advdll_helpext.obj \ $(OBJS)\advdll_hyperlinkg.obj \ $(OBJS)\advdll_laywin.obj \ + $(OBJS)\advdll_notifmsgg.obj \ $(OBJS)\advdll_odcombo.obj \ $(OBJS)\advdll_propdlg.obj \ $(OBJS)\advdll_sashwin.obj \ @@ -3460,10 +3661,13 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_tipdlg.obj \ $(OBJS)\advdll_wizard.obj \ $(OBJS)\advdll_taskbarcmn.obj \ + $(OBJS)\advdll_animateg.obj \ $(OBJS)\advdll_aboutdlg.obj \ + $(OBJS)\advdll_notifmsg.obj \ $(OBJS)\advdll_sound.obj \ $(OBJS)\advdll_taskbar.obj \ - $(OBJS)\advdll_joystick.obj + $(OBJS)\advdll_joystick.obj \ + $(OBJS)\advdll_animateg.obj !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" __advlib___depname = \ @@ -3475,17 +3679,18 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_datavcmn.obj \ $(OBJS)\advlib_hyperlnkcmn.obj \ $(OBJS)\advlib_aboutdlgg.obj \ - $(OBJS)\advlib_animateg.obj \ $(OBJS)\advlib_bmpcboxg.obj \ $(OBJS)\advlib_calctrl.obj \ $(OBJS)\advlib_datavgen.obj \ $(OBJS)\advlib_datectlg.obj \ + $(OBJS)\advlib_editlbox.obj \ $(OBJS)\advlib_grid.obj \ $(OBJS)\advlib_gridctrl.obj \ $(OBJS)\advlib_gridsel.obj \ $(OBJS)\advlib_helpext.obj \ $(OBJS)\advlib_hyperlinkg.obj \ $(OBJS)\advlib_laywin.obj \ + $(OBJS)\advlib_notifmsgg.obj \ $(OBJS)\advlib_odcombo.obj \ $(OBJS)\advlib_propdlg.obj \ $(OBJS)\advlib_sashwin.obj \ @@ -3493,7 +3698,9 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_tipdlg.obj \ $(OBJS)\advlib_wizard.obj \ $(OBJS)\advlib_taskbarcmn.obj \ + $(OBJS)\advlib_animateg.obj \ $(OBJS)\advlib_aboutdlg.obj \ + $(OBJS)\advlib_notifmsg.obj \ $(OBJS)\advlib_sound.obj \ $(OBJS)\advlib_taskbar.obj \ $(OBJS)\advlib_joystick.obj \ @@ -3505,17 +3712,18 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_datavcmn.obj \ $(OBJS)\advlib_hyperlnkcmn.obj \ $(OBJS)\advlib_aboutdlgg.obj \ - $(OBJS)\advlib_animateg.obj \ $(OBJS)\advlib_bmpcboxg.obj \ $(OBJS)\advlib_calctrl.obj \ $(OBJS)\advlib_datavgen.obj \ $(OBJS)\advlib_datectlg.obj \ + $(OBJS)\advlib_editlbox.obj \ $(OBJS)\advlib_grid.obj \ $(OBJS)\advlib_gridctrl.obj \ $(OBJS)\advlib_gridsel.obj \ $(OBJS)\advlib_helpext.obj \ $(OBJS)\advlib_hyperlinkg.obj \ $(OBJS)\advlib_laywin.obj \ + $(OBJS)\advlib_notifmsgg.obj \ $(OBJS)\advlib_odcombo.obj \ $(OBJS)\advlib_propdlg.obj \ $(OBJS)\advlib_sashwin.obj \ @@ -3523,10 +3731,13 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_tipdlg.obj \ $(OBJS)\advlib_wizard.obj \ $(OBJS)\advlib_taskbarcmn.obj \ + $(OBJS)\advlib_animateg.obj \ $(OBJS)\advlib_aboutdlg.obj \ + $(OBJS)\advlib_notifmsg.obj \ $(OBJS)\advlib_sound.obj \ $(OBJS)\advlib_taskbar.obj \ - $(OBJS)\advlib_joystick.obj + $(OBJS)\advlib_joystick.obj \ + $(OBJS)\advlib_animateg.obj !endif !if "$(SHARED)" == "1" ____wxadv_namedll_DEP = $(__advdll___depname) @@ -3548,28 +3759,6 @@ ____wxmedia_namedll_DEP = $(__mediadll___depname) !if "$(SHARED)" == "0" ____wxmedia_namelib_DEP = $(__medialib___depname) !endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1" -__odbcdll___depname = \ - $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).dll -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1" -__odbclib___depname = \ - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" -__dbgriddll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).dll -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" -__dbgridlib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib -!endif -!if "$(SHARED)" == "1" -____wxdbgrid_namedll_DEP = $(__dbgriddll___depname) -!endif -!if "$(SHARED)" == "0" -____wxdbgrid_namelib_DEP = $(__dbgridlib___depname) -!endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1" __htmldll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).dll @@ -3654,6 +3843,20 @@ ____wxrichtext_namedll_DEP = $(__richtextdll___depname) !if "$(SHARED)" == "0" ____wxrichtext_namelib_DEP = $(__richtextlib___depname) !endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_STC)" == "1" +__stcdll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG).dll +!endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_STC)" == "1" +__stclib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib +!endif +!if "$(SHARED)" == "1" +____wxstc_namedll_DEP = $(__stcdll___depname) +!endif +!if "$(SHARED)" == "0" +____wxstc_namelib_DEP = $(__stclib___depname) +!endif !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" __gldll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).dll @@ -3674,6 +3877,15 @@ __WXLIB_MONO_p = \ __gllib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib !endif +!if "$(SHARED)" == "1" +____wxgl_namedll_DEP = $(__gldll___depname) +!endif +!if "$(SHARED)" == "0" +____wxgl_namelib_DEP = $(__gllib___depname) +!endif +!if "$(USE_STC)" == "1" +__wxscintilla = $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib +!endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1" __htmldll_library_link_DEP = $(__htmldll___depname) !endif @@ -3682,10 +3894,10 @@ __htmldll_library_link_LIBR = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib !endif !if "$(USE_THREADS)" == "0" -__THREADSFLAG_12 = +__THREADSFLAG_11 = !endif !if "$(USE_THREADS)" == "1" -__THREADSFLAG_12 = mt +__THREADSFLAG_11 = mt !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_4 = i @@ -3694,31 +3906,34 @@ __RUNTIME_LIBS_4 = i __RUNTIME_LIBS_4 = !endif !if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_58 = -d__WXUNIVERSAL__ +__WXUNIV_DEFINE_p_54 = -d__WXUNIVERSAL__ !endif !if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" -__DEBUG_DEFINE_p_57 = -d__WXDEBUG__ +__DEBUG_DEFINE_p_53 = -d__WXDEBUG__ !endif !if "$(DEBUG_FLAG)" == "1" -__DEBUG_DEFINE_p_57 = -d__WXDEBUG__ +__DEBUG_DEFINE_p_53 = -d__WXDEBUG__ !endif !if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_57 = -dwxNO_EXCEPTIONS +__EXCEPTIONS_DEFINE_p_53 = -dwxNO_EXCEPTIONS !endif !if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_57 = -dwxNO_RTTI +__RTTI_DEFINE_p_53 = -dwxNO_RTTI !endif !if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_57 = -dwxNO_THREADS +__THREAD_DEFINE_p_53 = -dwxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_54 = -dwxUSE_UNICODE=0 !endif !if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_58 = -d_UNICODE +__UNICODE_DEFINE_p_54 = -d_UNICODE !endif !if "$(MSLU)" == "1" -__MSLU_DEFINE_p_57 = -dwxUSE_UNICODE_MSLU=1 +__MSLU_DEFINE_p_53 = -dwxUSE_UNICODE_MSLU=1 !endif !if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_57 = -dwxUSE_GRAPHICS_CONTEXT=1 +__GFXCTX_DEFINE_p_53 = -dwxUSE_GRAPHICS_CONTEXT=1 !endif !if "$(USE_GUI)" == "1" __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib @@ -3783,6 +3998,9 @@ __RTTI_DEFINE_p = -DwxNO_RTTI !if "$(USE_THREADS)" == "0" __THREAD_DEFINE_p = -DwxNO_THREADS !endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -D_UNICODE !endif @@ -3806,7 +4024,7 @@ $(OBJS): ### Targets: ### -all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file +all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -3818,6 +4036,7 @@ clean: -if exist $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib -if exist $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib -if exist $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib + -if exist $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).tds -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).ilc @@ -3866,22 +4085,6 @@ clean: -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).ils -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib - -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).tds -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).ilc @@ -3930,6 +4133,14 @@ clean: -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG).ils -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG).tds + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG).ilc + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG).ild + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG).ilf + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG).ils + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).tds -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).ilc @@ -3987,10 +4198,18 @@ $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib: $(WXEXPAT_OBJECTS) $(WXEXPAT_OBJECTS) | +!if "$(USE_STC)" == "1" +$(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib: $(WXSCINTILLA_OBJECTS) + if exist $@ del $@ + tlib /a /p4096 $@ @&&| + $(WXSCINTILLA_OBJECTS) +| +!endif + !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\monodll_version.res +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\monodll_version.res $(__wxscintilla_library_link_DEP) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(MONODLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\monodll_version.res + c0d32.obj $(MONODLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(__wxscintilla) import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\monodll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) $@ !endif @@ -4004,9 +4223,9 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\basedll_version.res +$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\basedll_version.res ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(BASEDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\basedll_version.res + c0d32.obj $(BASEDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\basedll_version.res | implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) $@ !endif @@ -4024,9 +4243,9 @@ wxbase: $(____wxbase_namedll_DEP) $(____wxbase_namelib_DEP) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\netdll_version.res $(__basedll___depname) +$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\netdll_version.res $(__basedll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(NETDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\netdll_version.res + c0d32.obj $(NETDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\netdll_version.res | implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net $@ !endif @@ -4044,9 +4263,9 @@ wxnet: $(____wxnet_namedll_DEP) $(____wxnet_namelib_DEP) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\coredll_version.res $(__basedll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\coredll_version.res $(__basedll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(COREDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\coredll_version.res + c0d32.obj $(COREDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\coredll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core $@ !endif @@ -4064,9 +4283,9 @@ wxcore: $(____wxcore_namedll_DEP) $(____wxcore_namelib_DEP) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\advdll_version.res $(__coredll___depname) $(__basedll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\advdll_version.res $(__coredll___depname) $(__basedll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(ADVDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\advdll_version.res + c0d32.obj $(ADVDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\advdll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv $@ !endif @@ -4084,9 +4303,9 @@ wxadv: $(____wxadv_namedll_DEP) $(____wxadv_namelib_DEP) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\mediadll_version.res $(__coredll___depname) $(__basedll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\mediadll_version.res $(__coredll___depname) $(__basedll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(MEDIADLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\mediadll_version.res + c0d32.obj $(MEDIADLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\mediadll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media $@ !endif @@ -4103,46 +4322,10 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD wxmedia: $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP) !endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1" -$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).dll: $(OBJS)\odbcdll_dummy.obj $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\odbcdll_version.res $(__basedll___depname) - ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(ODBCDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\odbcdll_version.res -| - implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc $@ -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1" -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib: $(OBJS)\odbclib_dummy.obj $(ODBCLIB_OBJECTS) - if exist $@ del $@ - tlib /a /p4096 $@ @&&| - $(ODBCLIB_OBJECTS) -| -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).dll: $(OBJS)\dbgriddll_dummy.obj $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\dbgriddll_version.res $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname) - ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(DBGRIDDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\dbgriddll_version.res -| - implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid $@ -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib: $(OBJS)\dbgridlib_dummy.obj $(DBGRIDLIB_OBJECTS) - if exist $@ del $@ - tlib /a /p4096 $@ @&&| - $(DBGRIDLIB_OBJECTS) -| -!endif - -!if "$(MONOLITHIC)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" -wxdbgrid: $(____wxdbgrid_namedll_DEP) $(____wxdbgrid_namelib_DEP) -!endif - !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\htmldll_version.res $(__coredll___depname) $(__basedll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\htmldll_version.res $(__coredll___depname) $(__basedll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(HTMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\htmldll_version.res + c0d32.obj $(HTMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\htmldll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html $@ !endif @@ -4160,9 +4343,9 @@ wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_bcc$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\qadll_version.res $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_bcc$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\qadll_version.res $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(QADLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\qadll_version.res + c0d32.obj $(QADLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\qadll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa $@ !endif @@ -4180,9 +4363,9 @@ wxqa: $(____wxqa_namedll_DEP) $(____wxqa_namelib_DEP) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xmldll_version.res $(__basedll___depname) +$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xmldll_version.res $(__basedll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(XMLDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\xmldll_version.res + c0d32.obj $(XMLDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\xmldll_version.res | implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml $@ !endif @@ -4200,9 +4383,9 @@ wxxml: $(____wxxml_namedll_DEP) $(____wxxml_namelib_DEP) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xrcdll_version.res $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xrcdll_version.res $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(XRCDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\xrcdll_version.res + c0d32.obj $(XRCDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\xrcdll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc $@ !endif @@ -4220,9 +4403,9 @@ wxxrc: $(____wxxrc_namedll_DEP) $(____wxxrc_namelib_DEP) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).dll: $(OBJS)\auidll_dummy.obj $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\auidll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).dll: $(OBJS)\auidll_dummy.obj $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\auidll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(AUIDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\auidll_version.res + c0d32.obj $(AUIDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\auidll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui $@ !endif @@ -4240,9 +4423,9 @@ wxaui: $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG).dll: $(OBJS)\richtextdll_dummy.obj $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\richtextdll_version.res $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG).dll: $(OBJS)\richtextdll_dummy.obj $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\richtextdll_version.res $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(RICHTEXTDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\richtextdll_version.res + c0d32.obj $(RICHTEXTDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\richtextdll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext $@ !endif @@ -4259,10 +4442,30 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD wxrichtext: $(____wxrichtext_namedll_DEP) $(____wxrichtext_namelib_DEP) !endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_STC)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG).dll: $(OBJS)\stcdll_dummy.obj $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__wxscintilla) $(OBJS)\stcdll_version.res $(__coredll___depname) $(__basedll___depname) + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + c0d32.obj $(STCDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\stcdll_version.res +| + implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc $@ +!endif + +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_STC)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib: $(OBJS)\stclib_dummy.obj $(STCLIB_OBJECTS) $(__wxscintilla) + if exist $@ del $@ + tlib /a /p4096 $@ @&&| + $(STCLIB_OBJECTS) +| +!endif + +!if "$(MONOLITHIC)" == "0" && "$(USE_STC)" == "1" +wxstc: $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP) +!endif + !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(GLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\gldll_version.res + c0d32.obj $(GLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\gldll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl $@ !endif @@ -4275,6 +4478,10 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD | !endif +!if "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" +wxgl: $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP) +!endif + samples: @echo cd ..\..\samples >$(OBJS)\samples.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>$(OBJS)\samples.bat @@ -4323,7 +4530,6 @@ build_cfg_file: $(SETUPHDIR) @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE) @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE) @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE) - @echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE) @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE) @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE) @echo USE_GDIPLUS=$(USE_GDIPLUS) >>$(BUILD_CFG_FILE) @@ -4572,109 +4778,112 @@ $(OBJS)\wxjpeg_jquant2.obj: ..\..\src\jpeg\jquant2.c $(OBJS)\wxjpeg_jdmerge.obj: ..\..\src\jpeg\jdmerge.c $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) $** -$(OBJS)\wxtiff_tif_win32.obj: ..\..\src\tiff\tif_win32.c +$(OBJS)\wxtiff_tif_win32.obj: ..\..\src\tiff\libtiff\tif_win32.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_aux.obj: ..\..\src\tiff\tif_aux.c +$(OBJS)\wxtiff_tif_aux.obj: ..\..\src\tiff\libtiff\tif_aux.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_close.obj: ..\..\src\tiff\tif_close.c +$(OBJS)\wxtiff_tif_close.obj: ..\..\src\tiff\libtiff\tif_close.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_codec.obj: ..\..\src\tiff\tif_codec.c +$(OBJS)\wxtiff_tif_codec.obj: ..\..\src\tiff\libtiff\tif_codec.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_color.obj: ..\..\src\tiff\tif_color.c +$(OBJS)\wxtiff_tif_color.obj: ..\..\src\tiff\libtiff\tif_color.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_compress.obj: ..\..\src\tiff\tif_compress.c +$(OBJS)\wxtiff_tif_compress.obj: ..\..\src\tiff\libtiff\tif_compress.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_dir.obj: ..\..\src\tiff\tif_dir.c +$(OBJS)\wxtiff_tif_dir.obj: ..\..\src\tiff\libtiff\tif_dir.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_dirinfo.obj: ..\..\src\tiff\tif_dirinfo.c +$(OBJS)\wxtiff_tif_dirinfo.obj: ..\..\src\tiff\libtiff\tif_dirinfo.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_dirread.obj: ..\..\src\tiff\tif_dirread.c +$(OBJS)\wxtiff_tif_dirread.obj: ..\..\src\tiff\libtiff\tif_dirread.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_dirwrite.obj: ..\..\src\tiff\tif_dirwrite.c +$(OBJS)\wxtiff_tif_dirwrite.obj: ..\..\src\tiff\libtiff\tif_dirwrite.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_dumpmode.obj: ..\..\src\tiff\tif_dumpmode.c +$(OBJS)\wxtiff_tif_dumpmode.obj: ..\..\src\tiff\libtiff\tif_dumpmode.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_error.obj: ..\..\src\tiff\tif_error.c +$(OBJS)\wxtiff_tif_error.obj: ..\..\src\tiff\libtiff\tif_error.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_extension.obj: ..\..\src\tiff\tif_extension.c +$(OBJS)\wxtiff_tif_extension.obj: ..\..\src\tiff\libtiff\tif_extension.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_fax3.obj: ..\..\src\tiff\tif_fax3.c +$(OBJS)\wxtiff_tif_fax3.obj: ..\..\src\tiff\libtiff\tif_fax3.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_fax3sm.obj: ..\..\src\tiff\tif_fax3sm.c +$(OBJS)\wxtiff_tif_fax3sm.obj: ..\..\src\tiff\libtiff\tif_fax3sm.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_getimage.obj: ..\..\src\tiff\tif_getimage.c +$(OBJS)\wxtiff_tif_flush.obj: ..\..\src\tiff\libtiff\tif_flush.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_jpeg.obj: ..\..\src\tiff\tif_jpeg.c +$(OBJS)\wxtiff_tif_getimage.obj: ..\..\src\tiff\libtiff\tif_getimage.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_flush.obj: ..\..\src\tiff\tif_flush.c +$(OBJS)\wxtiff_tif_jpeg.obj: ..\..\src\tiff\libtiff\tif_jpeg.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_lzw.obj: ..\..\src\tiff\tif_lzw.c +$(OBJS)\wxtiff_tif_luv.obj: ..\..\src\tiff\libtiff\tif_luv.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_luv.obj: ..\..\src\tiff\tif_luv.c +$(OBJS)\wxtiff_tif_lzw.obj: ..\..\src\tiff\libtiff\tif_lzw.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_next.obj: ..\..\src\tiff\tif_next.c +$(OBJS)\wxtiff_tif_next.obj: ..\..\src\tiff\libtiff\tif_next.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_open.obj: ..\..\src\tiff\tif_open.c +$(OBJS)\wxtiff_tif_ojpeg.obj: ..\..\src\tiff\libtiff\tif_ojpeg.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_packbits.obj: ..\..\src\tiff\tif_packbits.c +$(OBJS)\wxtiff_tif_open.obj: ..\..\src\tiff\libtiff\tif_open.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_pixarlog.obj: ..\..\src\tiff\tif_pixarlog.c +$(OBJS)\wxtiff_tif_packbits.obj: ..\..\src\tiff\libtiff\tif_packbits.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_predict.obj: ..\..\src\tiff\tif_predict.c +$(OBJS)\wxtiff_tif_pixarlog.obj: ..\..\src\tiff\libtiff\tif_pixarlog.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_print.obj: ..\..\src\tiff\tif_print.c +$(OBJS)\wxtiff_tif_predict.obj: ..\..\src\tiff\libtiff\tif_predict.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_read.obj: ..\..\src\tiff\tif_read.c +$(OBJS)\wxtiff_tif_print.obj: ..\..\src\tiff\libtiff\tif_print.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_swab.obj: ..\..\src\tiff\tif_swab.c +$(OBJS)\wxtiff_tif_read.obj: ..\..\src\tiff\libtiff\tif_read.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_strip.obj: ..\..\src\tiff\tif_strip.c +$(OBJS)\wxtiff_tif_strip.obj: ..\..\src\tiff\libtiff\tif_strip.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_thunder.obj: ..\..\src\tiff\tif_thunder.c +$(OBJS)\wxtiff_tif_swab.obj: ..\..\src\tiff\libtiff\tif_swab.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_tile.obj: ..\..\src\tiff\tif_tile.c +$(OBJS)\wxtiff_tif_thunder.obj: ..\..\src\tiff\libtiff\tif_thunder.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_version.obj: ..\..\src\tiff\tif_version.c +$(OBJS)\wxtiff_tif_tile.obj: ..\..\src\tiff\libtiff\tif_tile.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_warning.obj: ..\..\src\tiff\tif_warning.c +$(OBJS)\wxtiff_tif_version.obj: ..\..\src\tiff\libtiff\tif_version.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_write.obj: ..\..\src\tiff\tif_write.c +$(OBJS)\wxtiff_tif_warning.obj: ..\..\src\tiff\libtiff\tif_warning.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** -$(OBJS)\wxtiff_tif_zip.obj: ..\..\src\tiff\tif_zip.c +$(OBJS)\wxtiff_tif_write.obj: ..\..\src\tiff\libtiff\tif_write.c + $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** + +$(OBJS)\wxtiff_tif_zip.obj: ..\..\src\tiff\libtiff\tif_zip.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** $(OBJS)\wxexpat_xmlparse.obj: ..\..\src\expat\lib\xmlparse.c @@ -4686,40 +4895,319 @@ $(OBJS)\wxexpat_xmlrole.obj: ..\..\src\expat\lib\xmlrole.c $(OBJS)\wxexpat_xmltok.obj: ..\..\src\expat\lib\xmltok.c $(CC) -q -c -P- -o$@ $(WXEXPAT_CFLAGS) $** -$(OBJS)\monodll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) -H $** +$(OBJS)\wxscintilla_AutoComplete.obj: ..\..\src\stc\scintilla\src\AutoComplete.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** -$(OBJS)\monodll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG) -i..\..\src\tiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL $** +$(OBJS)\wxscintilla_CallTip.obj: ..\..\src\stc\scintilla\src\CallTip.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** -$(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\wxscintilla_CellBuffer.obj: ..\..\src\stc\scintilla\src\CellBuffer.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** -$(OBJS)\monodll_arcall.obj: ..\..\src\common\arcall.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\wxscintilla_CharClassify.obj: ..\..\src\stc\scintilla\src\CharClassify.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** -$(OBJS)\monodll_arcfind.obj: ..\..\src\common\arcfind.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\wxscintilla_ContractionState.obj: ..\..\src\stc\scintilla\src\ContractionState.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** -$(OBJS)\monodll_archive.obj: ..\..\src\common\archive.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\wxscintilla_Decoration.obj: ..\..\src\stc\scintilla\src\Decoration.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** -$(OBJS)\monodll_clntdata.obj: ..\..\src\common\clntdata.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\wxscintilla_Document.obj: ..\..\src\stc\scintilla\src\Document.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** -$(OBJS)\monodll_cmdline.obj: ..\..\src\common\cmdline.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\wxscintilla_DocumentAccessor.obj: ..\..\src\stc\scintilla\src\DocumentAccessor.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** -$(OBJS)\monodll_config.obj: ..\..\src\common\config.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\wxscintilla_Editor.obj: ..\..\src\stc\scintilla\src\Editor.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** -$(OBJS)\monodll_convauto.obj: ..\..\src\common\convauto.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\wxscintilla_ExternalLexer.obj: ..\..\src\stc\scintilla\src\ExternalLexer.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** -$(OBJS)\monodll_datetime.obj: ..\..\src\common\datetime.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\wxscintilla_Indicator.obj: ..\..\src\stc\scintilla\src\Indicator.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** -$(OBJS)\monodll_datstrm.obj: ..\..\src\common\datstrm.cpp +$(OBJS)\wxscintilla_KeyMap.obj: ..\..\src\stc\scintilla\src\KeyMap.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_KeyWords.obj: ..\..\src\stc\scintilla\src\KeyWords.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexAPDL.obj: ..\..\src\stc\scintilla\src\LexAPDL.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexAU3.obj: ..\..\src\stc\scintilla\src\LexAU3.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexASY.obj: ..\..\src\stc\scintilla\src\LexASY.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexAVE.obj: ..\..\src\stc\scintilla\src\LexAVE.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexAbaqus.obj: ..\..\src\stc\scintilla\src\LexAbaqus.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexAda.obj: ..\..\src\stc\scintilla\src\LexAda.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexAsm.obj: ..\..\src\stc\scintilla\src\LexAsm.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexAsn1.obj: ..\..\src\stc\scintilla\src\LexAsn1.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexBaan.obj: ..\..\src\stc\scintilla\src\LexBaan.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexBash.obj: ..\..\src\stc\scintilla\src\LexBash.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexBasic.obj: ..\..\src\stc\scintilla\src\LexBasic.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexBullant.obj: ..\..\src\stc\scintilla\src\LexBullant.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexCLW.obj: ..\..\src\stc\scintilla\src\LexCLW.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexCmake.obj: ..\..\src\stc\scintilla\src\LexCmake.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexCPP.obj: ..\..\src\stc\scintilla\src\LexCPP.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexCSS.obj: ..\..\src\stc\scintilla\src\LexCSS.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexCaml.obj: ..\..\src\stc\scintilla\src\LexCaml.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexCsound.obj: ..\..\src\stc\scintilla\src\LexCsound.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexConf.obj: ..\..\src\stc\scintilla\src\LexConf.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexCrontab.obj: ..\..\src\stc\scintilla\src\LexCrontab.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexD.obj: ..\..\src\stc\scintilla\src\LexD.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexEScript.obj: ..\..\src\stc\scintilla\src\LexEScript.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexEiffel.obj: ..\..\src\stc\scintilla\src\LexEiffel.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexErlang.obj: ..\..\src\stc\scintilla\src\LexErlang.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexFlagship.obj: ..\..\src\stc\scintilla\src\LexFlagship.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexForth.obj: ..\..\src\stc\scintilla\src\LexForth.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexFortran.obj: ..\..\src\stc\scintilla\src\LexFortran.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexGAP.obj: ..\..\src\stc\scintilla\src\LexGAP.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexGui4Cli.obj: ..\..\src\stc\scintilla\src\LexGui4Cli.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexHTML.obj: ..\..\src\stc\scintilla\src\LexHTML.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexHaskell.obj: ..\..\src\stc\scintilla\src\LexHaskell.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexInno.obj: ..\..\src\stc\scintilla\src\LexInno.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexKix.obj: ..\..\src\stc\scintilla\src\LexKix.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexLisp.obj: ..\..\src\stc\scintilla\src\LexLisp.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexLout.obj: ..\..\src\stc\scintilla\src\LexLout.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexLua.obj: ..\..\src\stc\scintilla\src\LexLua.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexMMIXAL.obj: ..\..\src\stc\scintilla\src\LexMMIXAL.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexMPT.obj: ..\..\src\stc\scintilla\src\LexMPT.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexMSSQL.obj: ..\..\src\stc\scintilla\src\LexMSSQL.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexMatlab.obj: ..\..\src\stc\scintilla\src\LexMatlab.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexMetapost.obj: ..\..\src\stc\scintilla\src\LexMetapost.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexNsis.obj: ..\..\src\stc\scintilla\src\LexNsis.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexOpal.obj: ..\..\src\stc\scintilla\src\LexOpal.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexOthers.obj: ..\..\src\stc\scintilla\src\LexOthers.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexPB.obj: ..\..\src\stc\scintilla\src\LexPB.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexPLM.obj: ..\..\src\stc\scintilla\src\LexPLM.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexPOV.obj: ..\..\src\stc\scintilla\src\LexPOV.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexProgress.obj: ..\..\src\stc\scintilla\src\LexProgress.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexPS.obj: ..\..\src\stc\scintilla\src\LexPS.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexPascal.obj: ..\..\src\stc\scintilla\src\LexPascal.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexPerl.obj: ..\..\src\stc\scintilla\src\LexPerl.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexPython.obj: ..\..\src\stc\scintilla\src\LexPython.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexR.obj: ..\..\src\stc\scintilla\src\LexR.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexRebol.obj: ..\..\src\stc\scintilla\src\LexRebol.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexRuby.obj: ..\..\src\stc\scintilla\src\LexRuby.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexSQL.obj: ..\..\src\stc\scintilla\src\LexSQL.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexSmalltalk.obj: ..\..\src\stc\scintilla\src\LexSmalltalk.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexTADS3.obj: ..\..\src\stc\scintilla\src\LexTADS3.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexScriptol.obj: ..\..\src\stc\scintilla\src\LexScriptol.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexSpecman.obj: ..\..\src\stc\scintilla\src\LexSpecman.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexSpice.obj: ..\..\src\stc\scintilla\src\LexSpice.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexTCL.obj: ..\..\src\stc\scintilla\src\LexTCL.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexTeX.obj: ..\..\src\stc\scintilla\src\LexTeX.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexVB.obj: ..\..\src\stc\scintilla\src\LexVB.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexVHDL.obj: ..\..\src\stc\scintilla\src\LexVHDL.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexVerilog.obj: ..\..\src\stc\scintilla\src\LexVerilog.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LexYAML.obj: ..\..\src\stc\scintilla\src\LexYAML.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_LineMarker.obj: ..\..\src\stc\scintilla\src\LineMarker.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_PositionCache.obj: ..\..\src\stc\scintilla\src\PositionCache.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_PropSet.obj: ..\..\src\stc\scintilla\src\PropSet.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_RESearch.obj: ..\..\src\stc\scintilla\src\RESearch.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_RunStyles.obj: ..\..\src\stc\scintilla\src\RunStyles.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_ScintillaBase.obj: ..\..\src\stc\scintilla\src\ScintillaBase.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_Style.obj: ..\..\src\stc\scintilla\src\Style.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_StyleContext.obj: ..\..\src\stc\scintilla\src\StyleContext.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_UniConversion.obj: ..\..\src\stc\scintilla\src\UniConversion.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_ViewStyle.obj: ..\..\src\stc\scintilla\src\ViewStyle.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_WindowAccessor.obj: ..\..\src\stc\scintilla\src\WindowAccessor.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_XPM.obj: ..\..\src\stc\scintilla\src\XPM.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\monodll_dummy.obj: ..\..\src\common\dummy.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) -H $** + +$(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_arcall.obj: ..\..\src\common\arcall.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_arcfind.obj: ..\..\src\common\arcfind.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_archive.obj: ..\..\src\common\archive.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_arrstr.obj: ..\..\src\common\arrstr.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_base64.obj: ..\..\src\common\base64.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_clntdata.obj: ..\..\src\common\clntdata.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_cmdline.obj: ..\..\src\common\cmdline.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_config.obj: ..\..\src\common\config.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_convauto.obj: ..\..\src\common\convauto.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_datetime.obj: ..\..\src\common\datetime.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_datstrm.obj: ..\..\src\common\datstrm.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** $(OBJS)\monodll_dircmn.obj: ..\..\src\common\dircmn.cpp @@ -4737,6 +5225,9 @@ $(OBJS)\monodll_dynload.obj: ..\..\src\common\dynload.cpp $(OBJS)\monodll_encconv.obj: ..\..\src\common\encconv.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_extended.obj: ..\..\src\common\extended.c $(CC) -q -c -P- -o$@ $(MONODLL_CFLAGS) $** @@ -4845,6 +5336,12 @@ $(OBJS)\monodll_stream.obj: ..\..\src\common\stream.cpp $(OBJS)\monodll_string.obj: ..\..\src\common\string.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_stringimpl.obj: ..\..\src\common\stringimpl.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_stringops.obj: ..\..\src\common\stringops.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_strvararg.obj: ..\..\src\common\strvararg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -4860,6 +5357,12 @@ $(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp $(OBJS)\monodll_textfile.obj: ..\..\src\common\textfile.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_timercmn.obj: ..\..\src\common\timercmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_timerimpl.obj: ..\..\src\common\timerimpl.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_tokenzr.obj: ..\..\src\common\tokenzr.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -4938,6 +5441,9 @@ $(OBJS)\monodll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp $(OBJS)\monodll_thread.obj: ..\..\src\msw\thread.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_timer.obj: ..\..\src\msw\timer.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_utils.obj: ..\..\src\msw\utils.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -4956,6 +5462,9 @@ $(OBJS)\monodll_msgout.obj: ..\..\src\common\msgout.cpp $(OBJS)\monodll_utilscmn.obj: ..\..\src\common\utilscmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_main.obj: ..\..\src\msw\main.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -4998,6 +5507,9 @@ $(OBJS)\monodll_url.obj: ..\..\src\common\url.cpp $(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5061,6 +5573,9 @@ $(OBJS)\monodll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp $(OBJS)\monodll_tbar95.obj: ..\..\src\msw\tbar95.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_textentry.obj: ..\..\src\msw\textentry.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_treectrl.obj: ..\..\src\msw\treectrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5232,21 +5747,12 @@ $(OBJS)\monodll_winpars.obj: ..\..\src\html\winpars.cpp $(OBJS)\monodll_htmllbox.obj: ..\..\src\generic\htmllbox.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_db.obj: ..\..\src\common\db.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** - -$(OBJS)\monodll_dbtable.obj: ..\..\src\common\dbtable.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** - $(OBJS)\monodll_debugrpt.obj: ..\..\src\common\debugrpt.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** $(OBJS)\monodll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_dbgrid.obj: ..\..\src\common\dbgrid.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** - $(OBJS)\monodll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5343,6 +5849,9 @@ $(OBJS)\monodll_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp $(OBJS)\monodll_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5370,6 +5879,9 @@ $(OBJS)\monodll_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp $(OBJS)\monodll_xh_split.obj: ..\..\src\xrc\xh_split.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5454,6 +5966,15 @@ $(OBJS)\monodll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp $(OBJS)\monodll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_stc.obj: ..\..\src\stc\stc.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_PlatWX.obj: ..\..\src\stc\PlatWX.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_xml.obj: ..\..\src\xml\xml.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5545,11 +6066,6 @@ $(OBJS)\monodll_enhmeta.obj: ..\..\src\msw\enhmeta.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_font.obj: ..\..\src\msw\font.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5585,11 +6101,6 @@ $(OBJS)\monodll_graphics.obj: ..\..\src\msw\graphics.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_icon.obj: ..\..\src\msw\icon.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5665,11 +6176,6 @@ $(OBJS)\monodll_settings.obj: ..\..\src\msw\settings.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_timer.obj: ..\..\src\msw\timer.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_tooltip.obj: ..\..\src\msw\tooltip.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5715,6 +6221,26 @@ $(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monodll_statusbr.obj: ..\..\src\generic\statusbr.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5970,6 +6496,11 @@ $(OBJS)\monodll_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_accelcmn.obj: ..\..\src\common\accelcmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_accesscmn.obj: ..\..\src\common\accesscmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6005,6 +6536,16 @@ $(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_btncmn.obj: ..\..\src\common\btncmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_cairo.obj: ..\..\src\common\cairo.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_choiccmn.obj: ..\..\src\common\choiccmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6080,6 +6621,11 @@ $(OBJS)\monodll_dcgraph.obj: ..\..\src\common\dcgraph.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_dcsvg.obj: ..\..\src\common\dcsvg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6121,12 +6667,12 @@ $(OBJS)\monodll_effects.obj: ..\..\src\common\effects.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp +$(OBJS)\monodll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp +$(OBJS)\monodll_filectrlcmn.obj: ..\..\src\common\filectrlcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif @@ -6370,6 +6916,11 @@ $(OBJS)\monodll_statbar.obj: ..\..\src\common\statbar.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_stockitem.obj: ..\..\src\common\stockitem.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6386,7 +6937,7 @@ $(OBJS)\monodll_textcmn.obj: ..\..\src\common\textcmn.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_timercmn.obj: ..\..\src\common\timercmn.cpp +$(OBJS)\monodll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif @@ -6420,6 +6971,11 @@ $(OBJS)\monodll_wincmn.obj: ..\..\src\common\wincmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_windowid.obj: ..\..\src\common\windowid.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6445,16 +7001,6 @@ $(OBJS)\monodll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_combog.obj: ..\..\src\generic\combog.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6476,12 +7022,7 @@ $(OBJS)\monodll_dragimgg.obj: ..\..\src\generic\dragimgg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp +$(OBJS)\monodll_filectrlg.obj: ..\..\src\generic\filectrlg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif @@ -6600,11 +7141,6 @@ $(OBJS)\monodll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6625,6 +7161,11 @@ $(OBJS)\monodll_datectlg.obj: ..\..\src\generic\datectlg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_editlbox.obj: ..\..\src\generic\editlbox.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_grid.obj: ..\..\src\generic\grid.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6655,6 +7196,11 @@ $(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_odcombo.obj: ..\..\src\generic\odcombo.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6690,11 +7236,26 @@ $(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6710,6 +7271,9 @@ $(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +$(OBJS)\monodll_version.res: ..\..\src\msw\version.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL -i..\..\src\stc\scintilla\include -i..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS $** + $(OBJS)\monolib_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) -H $** @@ -6725,6 +7289,12 @@ $(OBJS)\monolib_arcfind.obj: ..\..\src\common\arcfind.cpp $(OBJS)\monolib_archive.obj: ..\..\src\common\archive.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_arrstr.obj: ..\..\src\common\arrstr.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_base64.obj: ..\..\src\common\base64.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_clntdata.obj: ..\..\src\common\clntdata.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -6758,6 +7328,9 @@ $(OBJS)\monolib_dynload.obj: ..\..\src\common\dynload.cpp $(OBJS)\monolib_encconv.obj: ..\..\src\common\encconv.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_extended.obj: ..\..\src\common\extended.c $(CC) -q -c -P- -o$@ $(MONOLIB_CFLAGS) $** @@ -6866,6 +7439,12 @@ $(OBJS)\monolib_stream.obj: ..\..\src\common\stream.cpp $(OBJS)\monolib_string.obj: ..\..\src\common\string.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_stringimpl.obj: ..\..\src\common\stringimpl.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_stringops.obj: ..\..\src\common\stringops.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_strvararg.obj: ..\..\src\common\strvararg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -6881,6 +7460,12 @@ $(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp $(OBJS)\monolib_textfile.obj: ..\..\src\common\textfile.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_timercmn.obj: ..\..\src\common\timercmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_timerimpl.obj: ..\..\src\common\timerimpl.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_tokenzr.obj: ..\..\src\common\tokenzr.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -6959,6 +7544,9 @@ $(OBJS)\monolib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp $(OBJS)\monolib_thread.obj: ..\..\src\msw\thread.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_timer.obj: ..\..\src\msw\timer.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_utils.obj: ..\..\src\msw\utils.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -6977,6 +7565,9 @@ $(OBJS)\monolib_msgout.obj: ..\..\src\common\msgout.cpp $(OBJS)\monolib_utilscmn.obj: ..\..\src\common\utilscmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_main.obj: ..\..\src\msw\main.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7019,6 +7610,9 @@ $(OBJS)\monolib_url.obj: ..\..\src\common\url.cpp $(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7082,6 +7676,9 @@ $(OBJS)\monolib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp $(OBJS)\monolib_tbar95.obj: ..\..\src\msw\tbar95.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_textentry.obj: ..\..\src\msw\textentry.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_treectrl.obj: ..\..\src\msw\treectrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7253,21 +7850,12 @@ $(OBJS)\monolib_winpars.obj: ..\..\src\html\winpars.cpp $(OBJS)\monolib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_db.obj: ..\..\src\common\db.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** - -$(OBJS)\monolib_dbtable.obj: ..\..\src\common\dbtable.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** - $(OBJS)\monolib_debugrpt.obj: ..\..\src\common\debugrpt.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** $(OBJS)\monolib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_dbgrid.obj: ..\..\src\common\dbgrid.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** - $(OBJS)\monolib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7364,6 +7952,9 @@ $(OBJS)\monolib_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp $(OBJS)\monolib_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7391,6 +7982,9 @@ $(OBJS)\monolib_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp $(OBJS)\monolib_xh_split.obj: ..\..\src\xrc\xh_split.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7475,6 +8069,15 @@ $(OBJS)\monolib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp $(OBJS)\monolib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_stc.obj: ..\..\src\stc\stc.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_PlatWX.obj: ..\..\src\stc\PlatWX.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_xml.obj: ..\..\src\xml\xml.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7566,11 +8169,6 @@ $(OBJS)\monolib_enhmeta.obj: ..\..\src\msw\enhmeta.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_font.obj: ..\..\src\msw\font.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7606,11 +8204,6 @@ $(OBJS)\monolib_graphics.obj: ..\..\src\msw\graphics.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_icon.obj: ..\..\src\msw\icon.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7686,11 +8279,6 @@ $(OBJS)\monolib_settings.obj: ..\..\src\msw\settings.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_timer.obj: ..\..\src\msw\timer.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_tooltip.obj: ..\..\src\msw\tooltip.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7736,6 +8324,26 @@ $(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monolib_statusbr.obj: ..\..\src\generic\statusbr.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7991,6 +8599,11 @@ $(OBJS)\monolib_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_accelcmn.obj: ..\..\src\common\accelcmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_accesscmn.obj: ..\..\src\common\accesscmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -8026,6 +8639,16 @@ $(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_btncmn.obj: ..\..\src\common\btncmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_cairo.obj: ..\..\src\common\cairo.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_choiccmn.obj: ..\..\src\common\choiccmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -8101,6 +8724,11 @@ $(OBJS)\monolib_dcgraph.obj: ..\..\src\common\dcgraph.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_dcsvg.obj: ..\..\src\common\dcsvg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -8142,12 +8770,12 @@ $(OBJS)\monolib_effects.obj: ..\..\src\common\effects.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp +$(OBJS)\monolib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp +$(OBJS)\monolib_filectrlcmn.obj: ..\..\src\common\filectrlcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif @@ -8391,6 +9019,11 @@ $(OBJS)\monolib_statbar.obj: ..\..\src\common\statbar.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_stockitem.obj: ..\..\src\common\stockitem.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -8407,7 +9040,7 @@ $(OBJS)\monolib_textcmn.obj: ..\..\src\common\textcmn.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_timercmn.obj: ..\..\src\common\timercmn.cpp +$(OBJS)\monolib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif @@ -8441,6 +9074,11 @@ $(OBJS)\monolib_wincmn.obj: ..\..\src\common\wincmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_windowid.obj: ..\..\src\common\windowid.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -8466,16 +9104,6 @@ $(OBJS)\monolib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_combog.obj: ..\..\src\generic\combog.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -8497,12 +9125,7 @@ $(OBJS)\monolib_dragimgg.obj: ..\..\src\generic\dragimgg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp +$(OBJS)\monolib_filectrlg.obj: ..\..\src\generic\filectrlg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif @@ -8621,11 +9244,6 @@ $(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -8646,6 +9264,11 @@ $(OBJS)\monolib_datectlg.obj: ..\..\src\generic\datectlg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_editlbox.obj: ..\..\src\generic\editlbox.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_grid.obj: ..\..\src\generic\grid.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -8676,6 +9299,11 @@ $(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_odcombo.obj: ..\..\src\generic\odcombo.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -8711,11 +9339,26 @@ $(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -8735,7 +9378,7 @@ $(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) -H $** $(OBJS)\basedll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG) -i..\..\src\tiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 $** $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -8749,6 +9392,12 @@ $(OBJS)\basedll_arcfind.obj: ..\..\src\common\arcfind.cpp $(OBJS)\basedll_archive.obj: ..\..\src\common\archive.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** +$(OBJS)\basedll_arrstr.obj: ..\..\src\common\arrstr.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + +$(OBJS)\basedll_base64.obj: ..\..\src\common\base64.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + $(OBJS)\basedll_clntdata.obj: ..\..\src\common\clntdata.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -8782,6 +9431,9 @@ $(OBJS)\basedll_dynload.obj: ..\..\src\common\dynload.cpp $(OBJS)\basedll_encconv.obj: ..\..\src\common\encconv.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** +$(OBJS)\basedll_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + $(OBJS)\basedll_extended.obj: ..\..\src\common\extended.c $(CC) -q -c -P- -o$@ $(BASEDLL_CFLAGS) $** @@ -8890,6 +9542,12 @@ $(OBJS)\basedll_stream.obj: ..\..\src\common\stream.cpp $(OBJS)\basedll_string.obj: ..\..\src\common\string.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** +$(OBJS)\basedll_stringimpl.obj: ..\..\src\common\stringimpl.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + +$(OBJS)\basedll_stringops.obj: ..\..\src\common\stringops.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + $(OBJS)\basedll_strvararg.obj: ..\..\src\common\strvararg.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -8899,10 +9557,16 @@ $(OBJS)\basedll_sysopt.obj: ..\..\src\common\sysopt.cpp $(OBJS)\basedll_tarstrm.obj: ..\..\src\common\tarstrm.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_textbuf.obj: ..\..\src\common\textbuf.cpp +$(OBJS)\basedll_textbuf.obj: ..\..\src\common\textbuf.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + +$(OBJS)\basedll_textfile.obj: ..\..\src\common\textfile.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + +$(OBJS)\basedll_timercmn.obj: ..\..\src\common\timercmn.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_textfile.obj: ..\..\src\common\textfile.cpp +$(OBJS)\basedll_timerimpl.obj: ..\..\src\common\timerimpl.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** $(OBJS)\basedll_tokenzr.obj: ..\..\src\common\tokenzr.cpp @@ -8983,6 +9647,9 @@ $(OBJS)\basedll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp $(OBJS)\basedll_thread.obj: ..\..\src\msw\thread.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** +$(OBJS)\basedll_timer.obj: ..\..\src\msw\timer.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + $(OBJS)\basedll_utils.obj: ..\..\src\msw\utils.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -9001,6 +9668,9 @@ $(OBJS)\basedll_msgout.obj: ..\..\src\common\msgout.cpp $(OBJS)\basedll_utilscmn.obj: ..\..\src\common\utilscmn.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** +$(OBJS)\basedll_evtloop.obj: ..\..\src\msw\evtloop.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + $(OBJS)\basedll_main.obj: ..\..\src\msw\main.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -9025,6 +9695,12 @@ $(OBJS)\baselib_arcfind.obj: ..\..\src\common\arcfind.cpp $(OBJS)\baselib_archive.obj: ..\..\src\common\archive.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** +$(OBJS)\baselib_arrstr.obj: ..\..\src\common\arrstr.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** + +$(OBJS)\baselib_base64.obj: ..\..\src\common\base64.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** + $(OBJS)\baselib_clntdata.obj: ..\..\src\common\clntdata.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** @@ -9058,6 +9734,9 @@ $(OBJS)\baselib_dynload.obj: ..\..\src\common\dynload.cpp $(OBJS)\baselib_encconv.obj: ..\..\src\common\encconv.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** +$(OBJS)\baselib_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** + $(OBJS)\baselib_extended.obj: ..\..\src\common\extended.c $(CC) -q -c -P- -o$@ $(BASELIB_CFLAGS) $** @@ -9166,6 +9845,12 @@ $(OBJS)\baselib_stream.obj: ..\..\src\common\stream.cpp $(OBJS)\baselib_string.obj: ..\..\src\common\string.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** +$(OBJS)\baselib_stringimpl.obj: ..\..\src\common\stringimpl.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** + +$(OBJS)\baselib_stringops.obj: ..\..\src\common\stringops.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** + $(OBJS)\baselib_strvararg.obj: ..\..\src\common\strvararg.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** @@ -9181,6 +9866,12 @@ $(OBJS)\baselib_textbuf.obj: ..\..\src\common\textbuf.cpp $(OBJS)\baselib_textfile.obj: ..\..\src\common\textfile.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** +$(OBJS)\baselib_timercmn.obj: ..\..\src\common\timercmn.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** + +$(OBJS)\baselib_timerimpl.obj: ..\..\src\common\timerimpl.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** + $(OBJS)\baselib_tokenzr.obj: ..\..\src\common\tokenzr.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** @@ -9259,6 +9950,9 @@ $(OBJS)\baselib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp $(OBJS)\baselib_thread.obj: ..\..\src\msw\thread.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** +$(OBJS)\baselib_timer.obj: ..\..\src\msw\timer.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** + $(OBJS)\baselib_utils.obj: ..\..\src\msw\utils.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** @@ -9277,6 +9971,9 @@ $(OBJS)\baselib_msgout.obj: ..\..\src\common\msgout.cpp $(OBJS)\baselib_utilscmn.obj: ..\..\src\common\utilscmn.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** +$(OBJS)\baselib_evtloop.obj: ..\..\src\msw\evtloop.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** + $(OBJS)\baselib_main.obj: ..\..\src\msw\main.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** @@ -9290,7 +9987,7 @@ $(OBJS)\netdll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) -H $** $(OBJS)\netdll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG) -i..\..\src\tiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET $** $(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $** @@ -9325,6 +10022,9 @@ $(OBJS)\netdll_url.obj: ..\..\src\common\url.cpp $(OBJS)\netdll_gsocket.obj: ..\..\src\msw\gsocket.cpp $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $** +$(OBJS)\netdll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp + $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $** + $(OBJS)\netdll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $** @@ -9364,6 +10064,9 @@ $(OBJS)\netlib_url.obj: ..\..\src\common\url.cpp $(OBJS)\netlib_gsocket.obj: ..\..\src\msw\gsocket.cpp $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $** +$(OBJS)\netlib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp + $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $** + $(OBJS)\netlib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $** @@ -9371,7 +10074,7 @@ $(OBJS)\coredll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) -H $** $(OBJS)\coredll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG) -i..\..\src\tiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_CORE -dwxUSE_BASE=0 $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_CORE -dwxUSE_BASE=0 $** $(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -9385,6 +10088,9 @@ $(OBJS)\coredll_msgout.obj: ..\..\src\common\msgout.cpp $(OBJS)\coredll_utilscmn.obj: ..\..\src\common\utilscmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** + $(OBJS)\coredll_main.obj: ..\..\src\msw\main.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -9454,6 +10160,9 @@ $(OBJS)\coredll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp $(OBJS)\coredll_tbar95.obj: ..\..\src\msw\tbar95.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +$(OBJS)\coredll_textentry.obj: ..\..\src\msw\textentry.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** + $(OBJS)\coredll_treectrl.obj: ..\..\src\msw\treectrl.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -9620,11 +10329,6 @@ $(OBJS)\coredll_enhmeta.obj: ..\..\src\msw\enhmeta.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_font.obj: ..\..\src\msw\font.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -9660,11 +10364,6 @@ $(OBJS)\coredll_graphics.obj: ..\..\src\msw\graphics.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_icon.obj: ..\..\src\msw\icon.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -9740,11 +10439,6 @@ $(OBJS)\coredll_settings.obj: ..\..\src\msw\settings.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_timer.obj: ..\..\src\msw\timer.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_tooltip.obj: ..\..\src\msw\tooltip.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -9790,6 +10484,26 @@ $(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\coredll_statusbr.obj: ..\..\src\generic\statusbr.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -10045,6 +10759,11 @@ $(OBJS)\coredll_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_accelcmn.obj: ..\..\src\common\accelcmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_accesscmn.obj: ..\..\src\common\accesscmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -10080,6 +10799,16 @@ $(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_btncmn.obj: ..\..\src\common\btncmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_cairo.obj: ..\..\src\common\cairo.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_choiccmn.obj: ..\..\src\common\choiccmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -10155,6 +10884,11 @@ $(OBJS)\coredll_dcgraph.obj: ..\..\src\common\dcgraph.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_dcsvg.obj: ..\..\src\common\dcsvg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -10196,12 +10930,12 @@ $(OBJS)\coredll_effects.obj: ..\..\src\common\effects.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp +$(OBJS)\coredll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp +$(OBJS)\coredll_filectrlcmn.obj: ..\..\src\common\filectrlcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif @@ -10445,6 +11179,11 @@ $(OBJS)\coredll_statbar.obj: ..\..\src\common\statbar.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_stockitem.obj: ..\..\src\common\stockitem.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -10461,7 +11200,7 @@ $(OBJS)\coredll_textcmn.obj: ..\..\src\common\textcmn.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_timercmn.obj: ..\..\src\common\timercmn.cpp +$(OBJS)\coredll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif @@ -10495,6 +11234,11 @@ $(OBJS)\coredll_wincmn.obj: ..\..\src\common\wincmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_windowid.obj: ..\..\src\common\windowid.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -10520,16 +11264,6 @@ $(OBJS)\coredll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_combog.obj: ..\..\src\generic\combog.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -10551,12 +11285,7 @@ $(OBJS)\coredll_dragimgg.obj: ..\..\src\generic\dragimgg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp +$(OBJS)\coredll_filectrlg.obj: ..\..\src\generic\filectrlg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif @@ -10670,6 +11399,9 @@ $(OBJS)\corelib_msgout.obj: ..\..\src\common\msgout.cpp $(OBJS)\corelib_utilscmn.obj: ..\..\src\common\utilscmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** + $(OBJS)\corelib_main.obj: ..\..\src\msw\main.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -10739,6 +11471,9 @@ $(OBJS)\corelib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp $(OBJS)\corelib_tbar95.obj: ..\..\src\msw\tbar95.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +$(OBJS)\corelib_textentry.obj: ..\..\src\msw\textentry.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** + $(OBJS)\corelib_treectrl.obj: ..\..\src\msw\treectrl.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -10905,11 +11640,6 @@ $(OBJS)\corelib_enhmeta.obj: ..\..\src\msw\enhmeta.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_font.obj: ..\..\src\msw\font.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -10945,11 +11675,6 @@ $(OBJS)\corelib_graphics.obj: ..\..\src\msw\graphics.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_icon.obj: ..\..\src\msw\icon.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -11025,11 +11750,6 @@ $(OBJS)\corelib_settings.obj: ..\..\src\msw\settings.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_timer.obj: ..\..\src\msw\timer.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_tooltip.obj: ..\..\src\msw\tooltip.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -11075,6 +11795,26 @@ $(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\corelib_statusbr.obj: ..\..\src\generic\statusbr.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -11330,6 +12070,11 @@ $(OBJS)\corelib_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_accelcmn.obj: ..\..\src\common\accelcmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_accesscmn.obj: ..\..\src\common\accesscmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -11365,6 +12110,16 @@ $(OBJS)\corelib_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_btncmn.obj: ..\..\src\common\btncmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_cairo.obj: ..\..\src\common\cairo.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_choiccmn.obj: ..\..\src\common\choiccmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -11440,6 +12195,11 @@ $(OBJS)\corelib_dcgraph.obj: ..\..\src\common\dcgraph.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_dcsvg.obj: ..\..\src\common\dcsvg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -11481,12 +12241,12 @@ $(OBJS)\corelib_effects.obj: ..\..\src\common\effects.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp +$(OBJS)\corelib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp +$(OBJS)\corelib_filectrlcmn.obj: ..\..\src\common\filectrlcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif @@ -11730,6 +12490,11 @@ $(OBJS)\corelib_statbar.obj: ..\..\src\common\statbar.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_stockitem.obj: ..\..\src\common\stockitem.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -11746,7 +12511,7 @@ $(OBJS)\corelib_textcmn.obj: ..\..\src\common\textcmn.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_timercmn.obj: ..\..\src\common\timercmn.cpp +$(OBJS)\corelib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif @@ -11780,6 +12545,11 @@ $(OBJS)\corelib_wincmn.obj: ..\..\src\common\wincmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_windowid.obj: ..\..\src\common\windowid.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -11805,16 +12575,6 @@ $(OBJS)\corelib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_combog.obj: ..\..\src\generic\combog.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -11836,12 +12596,7 @@ $(OBJS)\corelib_dragimgg.obj: ..\..\src\generic\dragimgg.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp +$(OBJS)\corelib_filectrlg.obj: ..\..\src\generic\filectrlg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif @@ -11944,7 +12699,7 @@ $(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) -H $** $(OBJS)\advdll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG) -i..\..\src\tiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_ADV $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_ADV $** $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** @@ -11961,9 +12716,6 @@ $(OBJS)\advdll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp $(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** -$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** - $(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** @@ -11976,6 +12728,9 @@ $(OBJS)\advdll_datavgen.obj: ..\..\src\generic\datavgen.cpp $(OBJS)\advdll_datectlg.obj: ..\..\src\generic\datectlg.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** +$(OBJS)\advdll_editlbox.obj: ..\..\src\generic\editlbox.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + $(OBJS)\advdll_grid.obj: ..\..\src\generic\grid.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** @@ -11994,6 +12749,9 @@ $(OBJS)\advdll_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp $(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** +$(OBJS)\advdll_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + $(OBJS)\advdll_odcombo.obj: ..\..\src\generic\odcombo.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** @@ -12015,9 +12773,20 @@ $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** +$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + +!if "$(WXUNIV)" == "1" +$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** +!endif + $(OBJS)\advdll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** +$(OBJS)\advdll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + $(OBJS)\advdll_sound.obj: ..\..\src\msw\sound.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** @@ -12045,9 +12814,6 @@ $(OBJS)\advlib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp $(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** -$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** - $(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** @@ -12060,6 +12826,9 @@ $(OBJS)\advlib_datavgen.obj: ..\..\src\generic\datavgen.cpp $(OBJS)\advlib_datectlg.obj: ..\..\src\generic\datectlg.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** +$(OBJS)\advlib_editlbox.obj: ..\..\src\generic\editlbox.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + $(OBJS)\advlib_grid.obj: ..\..\src\generic\grid.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** @@ -12078,6 +12847,9 @@ $(OBJS)\advlib_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp $(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** +$(OBJS)\advlib_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + $(OBJS)\advlib_odcombo.obj: ..\..\src\generic\odcombo.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** @@ -12099,9 +12871,20 @@ $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** +$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + +!if "$(WXUNIV)" == "1" +$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** +!endif + $(OBJS)\advlib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** +$(OBJS)\advlib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + $(OBJS)\advlib_sound.obj: ..\..\src\msw\sound.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** @@ -12115,7 +12898,7 @@ $(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) -H $** $(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG) -i..\..\src\tiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_MEDIA $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_MEDIA $** $(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp $(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) $** @@ -12150,47 +12933,11 @@ $(OBJS)\medialib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp $(OBJS)\medialib_activex.obj: ..\..\src\msw\ole\activex.cpp $(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) $** -$(OBJS)\odbcdll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(ODBCDLL_CXXFLAGS) -H $** - -$(OBJS)\odbcdll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG) -i..\..\src\tiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_ODBC $** - -$(OBJS)\odbcdll_db.obj: ..\..\src\common\db.cpp - $(CXX) -q -c -P -o$@ $(ODBCDLL_CXXFLAGS) $** - -$(OBJS)\odbcdll_dbtable.obj: ..\..\src\common\dbtable.cpp - $(CXX) -q -c -P -o$@ $(ODBCDLL_CXXFLAGS) $** - -$(OBJS)\odbclib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(ODBCLIB_CXXFLAGS) -H $** - -$(OBJS)\odbclib_db.obj: ..\..\src\common\db.cpp - $(CXX) -q -c -P -o$@ $(ODBCLIB_CXXFLAGS) $** - -$(OBJS)\odbclib_dbtable.obj: ..\..\src\common\dbtable.cpp - $(CXX) -q -c -P -o$@ $(ODBCLIB_CXXFLAGS) $** - -$(OBJS)\dbgriddll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(DBGRIDDLL_CXXFLAGS) -H $** - -$(OBJS)\dbgriddll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG) -i..\..\src\tiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_DBGRID $** - -$(OBJS)\dbgriddll_dbgrid.obj: ..\..\src\common\dbgrid.cpp - $(CXX) -q -c -P -o$@ $(DBGRIDDLL_CXXFLAGS) $** - -$(OBJS)\dbgridlib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(DBGRIDLIB_CXXFLAGS) -H $** - -$(OBJS)\dbgridlib_dbgrid.obj: ..\..\src\common\dbgrid.cpp - $(CXX) -q -c -P -o$@ $(DBGRIDLIB_CXXFLAGS) $** - $(OBJS)\htmldll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) -H $** $(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG) -i..\..\src\tiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_HTML $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_HTML $** $(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) $** @@ -12343,7 +13090,7 @@ $(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(QADLL_CXXFLAGS) -H $** $(OBJS)\qadll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_bcc$(VENDORTAG) -i..\..\src\tiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_QA $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_bcc$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_QA $** $(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp $(CXX) -q -c -P -o$@ $(QADLL_CXXFLAGS) $** @@ -12364,7 +13111,7 @@ $(OBJS)\xmldll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(XMLDLL_CXXFLAGS) -H $** $(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG) -i..\..\src\tiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_XML $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_XML $** $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp $(CXX) -q -c -P -o$@ $(XMLDLL_CXXFLAGS) $** @@ -12385,7 +13132,7 @@ $(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) -H $** $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG) -i..\..\src\tiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_XRC $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_XRC $** $(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** @@ -12483,6 +13230,9 @@ $(OBJS)\xrcdll_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp $(OBJS)\xrcdll_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** +$(OBJS)\xrcdll_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + $(OBJS)\xrcdll_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** @@ -12510,6 +13260,9 @@ $(OBJS)\xrcdll_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp $(OBJS)\xrcdll_xh_split.obj: ..\..\src\xrc\xh_split.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** +$(OBJS)\xrcdll_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + $(OBJS)\xrcdll_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** @@ -12651,6 +13404,9 @@ $(OBJS)\xrclib_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp $(OBJS)\xrclib_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** +$(OBJS)\xrclib_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + $(OBJS)\xrclib_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** @@ -12678,6 +13434,9 @@ $(OBJS)\xrclib_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp $(OBJS)\xrclib_xh_split.obj: ..\..\src\xrc\xh_split.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** +$(OBJS)\xrclib_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + $(OBJS)\xrclib_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** @@ -12724,7 +13483,7 @@ $(OBJS)\auidll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) -H $** $(OBJS)\auidll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG) -i..\..\src\tiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_AUI $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_AUI $** $(OBJS)\auidll_framemanager.obj: ..\..\src\aui\framemanager.cpp $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) $** @@ -12763,7 +13522,7 @@ $(OBJS)\richtextdll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) -H $** $(OBJS)\richtextdll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG) -i..\..\src\tiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RICHTEXT $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RICHTEXT $** $(OBJS)\richtextdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) $** @@ -12822,11 +13581,41 @@ $(OBJS)\richtextlib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cp $(OBJS)\richtextlib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) $** +$(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) -H $** + +$(OBJS)\stcdll_version.res: ..\..\src\msw\version.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG) -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 $** + +$(OBJS)\stcdll_stc.obj: ..\..\src\stc\stc.cpp + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_PlatWX.obj: ..\..\src\stc\PlatWX.cpp + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stclib_dummy.obj: ..\..\src\common\dummy.cpp + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) -H $** + +$(OBJS)\stclib_stc.obj: ..\..\src\stc\stc.cpp + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_PlatWX.obj: ..\..\src\stc\PlatWX.cpp + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + $(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) -H $** $(OBJS)\gldll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG) -i..\..\src\tiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL $** + +$(OBJS)\gldll_glcmn.obj: ..\..\src\common\glcmn.cpp + $(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) $** $(OBJS)\gldll_glcanvas.obj: ..\..\src\msw\glcanvas.cpp $(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) $** @@ -12834,6 +13623,9 @@ $(OBJS)\gldll_glcanvas.obj: ..\..\src\msw\glcanvas.cpp $(OBJS)\gllib_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(GLLIB_CXXFLAGS) -H $** +$(OBJS)\gllib_glcmn.obj: ..\..\src\common\glcmn.cpp + $(CXX) -q -c -P -o$@ $(GLLIB_CXXFLAGS) $** + $(OBJS)\gllib_glcanvas.obj: ..\..\src\msw\glcanvas.cpp $(CXX) -q -c -P -o$@ $(GLLIB_CXXFLAGS) $**