X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3af706cc3164bacc24899e0fc827c28e7ea812b6..64b9776ca61d8d589da77c1524ae8ae9425dd826:/build/msw/makefile.bcc diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 5e36077a7e..51e4f54c4a 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.0 (http://bakefile.sourceforge.net) +# Bakefile 0.2.2 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -29,18 +29,20 @@ 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_ODBC="$(USE_ODBC)" -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)" \ -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \ -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \ -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" -WX_RELEASE_NODOT = 27 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2 +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) \ @@ -185,27 +187,119 @@ 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_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_LexAVE.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_LexCPP.obj \ + $(OBJS)\wxscintilla_LexCSS.obj \ + $(OBJS)\wxscintilla_LexCaml.obj \ + $(OBJS)\wxscintilla_LexCsound.obj \ + $(OBJS)\wxscintilla_LexConf.obj \ + $(OBJS)\wxscintilla_LexCrontab.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_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_LexPOV.obj \ + $(OBJS)\wxscintilla_LexPS.obj \ + $(OBJS)\wxscintilla_LexPascal.obj \ + $(OBJS)\wxscintilla_LexPerl.obj \ + $(OBJS)\wxscintilla_LexPython.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_PropSet.obj \ + $(OBJS)\wxscintilla_RESearch.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 -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 -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 +311,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 \ @@ -230,7 +325,6 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_fmapbase.obj \ $(OBJS)\monodll_fs_arc.obj \ $(OBJS)\monodll_fs_filter.obj \ - $(OBJS)\monodll_fs_zip.obj \ $(OBJS)\monodll_hash.obj \ $(OBJS)\monodll_hashmap.obj \ $(OBJS)\monodll_init.obj \ @@ -254,16 +348,23 @@ 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 \ $(OBJS)\monodll_uri.obj \ $(OBJS)\monodll_variant.obj \ $(OBJS)\monodll_wfstream.obj \ - $(OBJS)\monodll_wxchar.obj \ + $(OBJS)\monodll_wxcrt.obj \ + $(OBJS)\monodll_wxprintf.obj \ $(OBJS)\monodll_xti.obj \ $(OBJS)\monodll_xtistrm.obj \ $(OBJS)\monodll_zipstrm.obj \ @@ -282,12 +383,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 \ @@ -310,23 +413,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 -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 -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 \ @@ -338,6 +447,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 \ @@ -351,7 +461,6 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_fmapbase.obj \ $(OBJS)\monolib_fs_arc.obj \ $(OBJS)\monolib_fs_filter.obj \ - $(OBJS)\monolib_fs_zip.obj \ $(OBJS)\monolib_hash.obj \ $(OBJS)\monolib_hashmap.obj \ $(OBJS)\monolib_init.obj \ @@ -375,16 +484,23 @@ 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 \ $(OBJS)\monolib_uri.obj \ $(OBJS)\monolib_variant.obj \ $(OBJS)\monolib_wfstream.obj \ - $(OBJS)\monolib_wxchar.obj \ + $(OBJS)\monolib_wxcrt.obj \ + $(OBJS)\monolib_wxprintf.obj \ $(OBJS)\monolib_xti.obj \ $(OBJS)\monolib_xtistrm.obj \ $(OBJS)\monolib_zipstrm.obj \ @@ -403,12 +519,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 \ @@ -431,24 +549,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 -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 -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 \ @@ -460,6 +580,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 \ @@ -473,7 +594,6 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_fmapbase.obj \ $(OBJS)\basedll_fs_arc.obj \ $(OBJS)\basedll_fs_filter.obj \ - $(OBJS)\basedll_fs_zip.obj \ $(OBJS)\basedll_hash.obj \ $(OBJS)\basedll_hashmap.obj \ $(OBJS)\basedll_init.obj \ @@ -497,16 +617,23 @@ 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 \ $(OBJS)\basedll_uri.obj \ $(OBJS)\basedll_variant.obj \ $(OBJS)\basedll_wfstream.obj \ - $(OBJS)\basedll_wxchar.obj \ + $(OBJS)\basedll_wxcrt.obj \ + $(OBJS)\basedll_wxprintf.obj \ $(OBJS)\basedll_xti.obj \ $(OBJS)\basedll_xtistrm.obj \ $(OBJS)\basedll_zipstrm.obj \ @@ -525,12 +652,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 @@ -538,16 +667,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 -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 -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 \ @@ -555,6 +685,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 \ @@ -566,6 +698,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 \ @@ -579,7 +712,6 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_fmapbase.obj \ $(OBJS)\baselib_fs_arc.obj \ $(OBJS)\baselib_fs_filter.obj \ - $(OBJS)\baselib_fs_zip.obj \ $(OBJS)\baselib_hash.obj \ $(OBJS)\baselib_hashmap.obj \ $(OBJS)\baselib_init.obj \ @@ -603,16 +735,23 @@ 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 \ $(OBJS)\baselib_uri.obj \ $(OBJS)\baselib_variant.obj \ $(OBJS)\baselib_wfstream.obj \ - $(OBJS)\baselib_wxchar.obj \ + $(OBJS)\baselib_wxcrt.obj \ + $(OBJS)\baselib_wxprintf.obj \ $(OBJS)\baselib_xti.obj \ $(OBJS)\baselib_xtistrm.obj \ $(OBJS)\baselib_zipstrm.obj \ @@ -631,12 +770,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 @@ -644,10 +785,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 -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 \ @@ -666,10 +807,10 @@ 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 -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 \ @@ -688,16 +829,17 @@ 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 -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 \ @@ -706,16 +848,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 -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 \ @@ -724,9 +867,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 -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 \ @@ -735,10 +878,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 -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) @@ -746,38 +889,40 @@ 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 -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 \ $(OBJS)\mediadll_mediactrlcmn.obj \ $(OBJS)\mediadll_mediactrl_am.obj \ $(OBJS)\mediadll_mediactrl_wmp10.obj \ + $(OBJS)\mediadll_mediactrl_qt.obj \ $(OBJS)\mediadll_activex.obj 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 -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 \ $(OBJS)\medialib_mediactrl_am.obj \ $(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) + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -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 \ @@ -786,10 +931,10 @@ 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) + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -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 \ @@ -798,10 +943,10 @@ 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) + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -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 @@ -809,10 +954,10 @@ 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) + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \ + -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 @@ -820,9 +965,9 @@ 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 -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 \ @@ -854,10 +999,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 -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 \ @@ -888,9 +1033,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 -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 \ @@ -900,10 +1045,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 -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 \ @@ -912,10 +1057,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 -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 \ @@ -924,10 +1069,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 -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 \ @@ -936,9 +1081,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 -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 \ @@ -953,6 +1098,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_choic.obj \ $(OBJS)\xrcdll_xh_choicbk.obj \ $(OBJS)\xrcdll_xh_clrpicker.obj \ + $(OBJS)\xrcdll_xh_collpane.obj \ $(OBJS)\xrcdll_xh_combo.obj \ $(OBJS)\xrcdll_xh_datectrl.obj \ $(OBJS)\xrcdll_xh_dirpicker.obj \ @@ -973,6 +1119,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 \ @@ -982,6 +1129,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 \ @@ -1000,10 +1148,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 -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 \ @@ -1017,6 +1165,7 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_choic.obj \ $(OBJS)\xrclib_xh_choicbk.obj \ $(OBJS)\xrclib_xh_clrpicker.obj \ + $(OBJS)\xrclib_xh_collpane.obj \ $(OBJS)\xrclib_xh_combo.obj \ $(OBJS)\xrclib_xh_datectrl.obj \ $(OBJS)\xrclib_xh_dirpicker.obj \ @@ -1037,6 +1186,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 \ @@ -1046,6 +1196,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 \ @@ -1064,9 +1215,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 -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 \ @@ -1079,10 +1230,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 -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 \ @@ -1094,10 +1245,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 -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 \ @@ -1113,10 +1264,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 -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 \ @@ -1128,27 +1279,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 -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 -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 -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 -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 @@ -1213,6 +1395,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_mediactrlcmn.obj \ $(OBJS)\monodll_mediactrl_am.obj \ $(OBJS)\monodll_mediactrl_wmp10.obj \ + $(OBJS)\monodll_mediactrl_qt.obj \ $(OBJS)\monodll_activex.obj \ $(OBJS)\monodll_helpbest.obj \ $(OBJS)\monodll_helpctrl.obj \ @@ -1254,6 +1437,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_choic.obj \ $(OBJS)\monodll_xh_choicbk.obj \ $(OBJS)\monodll_xh_clrpicker.obj \ + $(OBJS)\monodll_xh_collpane.obj \ $(OBJS)\monodll_xh_combo.obj \ $(OBJS)\monodll_xh_datectrl.obj \ $(OBJS)\monodll_xh_dirpicker.obj \ @@ -1274,6 +1458,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 \ @@ -1283,6 +1468,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 \ @@ -1310,7 +1496,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 = \ @@ -1331,12 +1520,12 @@ ____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 \ $(OBJS)\monodll_gdiimage.obj \ $(OBJS)\monodll_gdiobj.obj \ + $(OBJS)\monodll_gdiplus.obj \ $(OBJS)\monodll_graphics.obj \ $(OBJS)\monodll_gsockmsw.obj \ $(OBJS)\monodll_icon.obj \ @@ -1354,7 +1543,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 \ @@ -1412,6 +1600,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(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 \ @@ -1419,6 +1608,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_artstd.obj \ $(OBJS)\monodll_bmpbase.obj \ $(OBJS)\monodll_bookctrl.obj \ + $(OBJS)\monodll_btncmn.obj \ $(OBJS)\monodll_choiccmn.obj \ $(OBJS)\monodll_clipcmn.obj \ $(OBJS)\monodll_clrpickercmn.obj \ @@ -1434,6 +1624,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 \ @@ -1442,7 +1633,6 @@ ____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_filepickercmn.obj \ $(OBJS)\monodll_fontpickercmn.obj \ @@ -1450,6 +1640,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_fontcmn.obj \ $(OBJS)\monodll_fontenumcmn.obj \ $(OBJS)\monodll_fontmap.obj \ + $(OBJS)\monodll_fontutilcmn.obj \ $(OBJS)\monodll_framecmn.obj \ $(OBJS)\monodll_gaugecmn.obj \ $(OBJS)\monodll_gbsizer.obj \ @@ -1489,11 +1680,12 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_rgncmn.obj \ $(OBJS)\monodll_settcmn.obj \ $(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_toplvcmn.obj \ $(OBJS)\monodll_treebase.obj \ $(OBJS)\monodll_valgen.obj \ @@ -1506,6 +1698,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(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 \ @@ -1523,6 +1716,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_selstore.obj \ $(OBJS)\monodll_spinctlg.obj \ $(OBJS)\monodll_splitter.obj \ + $(OBJS)\monodll_srchctlg.obj \ $(OBJS)\monodll_textdlgg.obj \ $(OBJS)\monodll_tipwin.obj \ $(OBJS)\monodll_toolbkg.obj \ @@ -1550,12 +1744,12 @@ ____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 \ $(OBJS)\monodll_gdiimage.obj \ $(OBJS)\monodll_gdiobj.obj \ + $(OBJS)\monodll_gdiplus.obj \ $(OBJS)\monodll_graphics.obj \ $(OBJS)\monodll_gsockmsw.obj \ $(OBJS)\monodll_icon.obj \ @@ -1573,7 +1767,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 \ @@ -1634,6 +1827,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 \ @@ -1641,6 +1835,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_artstd.obj \ $(OBJS)\monodll_bmpbase.obj \ $(OBJS)\monodll_bookctrl.obj \ + $(OBJS)\monodll_btncmn.obj \ $(OBJS)\monodll_choiccmn.obj \ $(OBJS)\monodll_clipcmn.obj \ $(OBJS)\monodll_clrpickercmn.obj \ @@ -1656,6 +1851,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 \ @@ -1664,7 +1860,6 @@ ____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_filepickercmn.obj \ $(OBJS)\monodll_fontpickercmn.obj \ @@ -1672,6 +1867,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_fontcmn.obj \ $(OBJS)\monodll_fontenumcmn.obj \ $(OBJS)\monodll_fontmap.obj \ + $(OBJS)\monodll_fontutilcmn.obj \ $(OBJS)\monodll_framecmn.obj \ $(OBJS)\monodll_gaugecmn.obj \ $(OBJS)\monodll_gbsizer.obj \ @@ -1711,11 +1907,12 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_rgncmn.obj \ $(OBJS)\monodll_settcmn.obj \ $(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_toplvcmn.obj \ $(OBJS)\monodll_treebase.obj \ $(OBJS)\monodll_valgen.obj \ @@ -1728,6 +1925,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(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 \ @@ -1745,6 +1943,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_selstore.obj \ $(OBJS)\monodll_spinctlg.obj \ $(OBJS)\monodll_splitter.obj \ + $(OBJS)\monodll_srchctlg.obj \ $(OBJS)\monodll_textdlgg.obj \ $(OBJS)\monodll_tipwin.obj \ $(OBJS)\monodll_toolbkg.obj \ @@ -1757,17 +1956,19 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_animatecmn.obj \ $(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_collpaneg.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_hyperlink.obj \ + $(OBJS)\monodll_hyperlinkg.obj \ $(OBJS)\monodll_laywin.obj \ $(OBJS)\monodll_odcombo.obj \ $(OBJS)\monodll_propdlg.obj \ @@ -1775,7 +1976,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_splash.obj \ $(OBJS)\monodll_tipdlg.obj \ $(OBJS)\monodll_wizard.obj \ - $(OBJS)\monodll_animateg.obj \ $(OBJS)\monodll_taskbarcmn.obj \ $(OBJS)\monodll_aboutdlg.obj \ $(OBJS)\monodll_sound.obj \ @@ -1787,17 +1987,19 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_animatecmn.obj \ $(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_collpaneg.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_hyperlink.obj \ + $(OBJS)\monodll_hyperlinkg.obj \ $(OBJS)\monodll_laywin.obj \ $(OBJS)\monodll_odcombo.obj \ $(OBJS)\monodll_propdlg.obj \ @@ -1805,13 +2007,15 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_splash.obj \ $(OBJS)\monodll_tipdlg.obj \ $(OBJS)\monodll_wizard.obj \ - $(OBJS)\monodll_animateg.obj \ $(OBJS)\monodll_taskbarcmn.obj \ $(OBJS)\monodll_aboutdlg.obj \ $(OBJS)\monodll_sound.obj \ $(OBJS)\monodll_taskbar.obj \ $(OBJS)\monodll_joystick.obj !endif +!if "$(USE_STC)" == "1" +__wxscintilla_library_link_DEP = $(__wxscintilla) +!endif !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0" __monolib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib @@ -1823,6 +2027,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_mediactrlcmn.obj \ $(OBJS)\monolib_mediactrl_am.obj \ $(OBJS)\monolib_mediactrl_wmp10.obj \ + $(OBJS)\monolib_mediactrl_qt.obj \ $(OBJS)\monolib_activex.obj \ $(OBJS)\monolib_helpbest.obj \ $(OBJS)\monolib_helpctrl.obj \ @@ -1864,6 +2069,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_choic.obj \ $(OBJS)\monolib_xh_choicbk.obj \ $(OBJS)\monolib_xh_clrpicker.obj \ + $(OBJS)\monolib_xh_collpane.obj \ $(OBJS)\monolib_xh_combo.obj \ $(OBJS)\monolib_xh_datectrl.obj \ $(OBJS)\monolib_xh_dirpicker.obj \ @@ -1884,6 +2090,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 \ @@ -1893,6 +2100,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 \ @@ -1920,7 +2128,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 = \ @@ -1941,12 +2152,12 @@ ____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 \ $(OBJS)\monolib_gdiimage.obj \ $(OBJS)\monolib_gdiobj.obj \ + $(OBJS)\monolib_gdiplus.obj \ $(OBJS)\monolib_graphics.obj \ $(OBJS)\monolib_gsockmsw.obj \ $(OBJS)\monolib_icon.obj \ @@ -1964,7 +2175,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 \ @@ -2022,6 +2232,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(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 \ @@ -2029,6 +2240,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_artstd.obj \ $(OBJS)\monolib_bmpbase.obj \ $(OBJS)\monolib_bookctrl.obj \ + $(OBJS)\monolib_btncmn.obj \ $(OBJS)\monolib_choiccmn.obj \ $(OBJS)\monolib_clipcmn.obj \ $(OBJS)\monolib_clrpickercmn.obj \ @@ -2044,6 +2256,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 \ @@ -2052,7 +2265,6 @@ ____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_filepickercmn.obj \ $(OBJS)\monolib_fontpickercmn.obj \ @@ -2060,6 +2272,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_fontcmn.obj \ $(OBJS)\monolib_fontenumcmn.obj \ $(OBJS)\monolib_fontmap.obj \ + $(OBJS)\monolib_fontutilcmn.obj \ $(OBJS)\monolib_framecmn.obj \ $(OBJS)\monolib_gaugecmn.obj \ $(OBJS)\monolib_gbsizer.obj \ @@ -2099,11 +2312,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_rgncmn.obj \ $(OBJS)\monolib_settcmn.obj \ $(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_toplvcmn.obj \ $(OBJS)\monolib_treebase.obj \ $(OBJS)\monolib_valgen.obj \ @@ -2116,6 +2330,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(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 \ @@ -2133,6 +2348,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_selstore.obj \ $(OBJS)\monolib_spinctlg.obj \ $(OBJS)\monolib_splitter.obj \ + $(OBJS)\monolib_srchctlg.obj \ $(OBJS)\monolib_textdlgg.obj \ $(OBJS)\monolib_tipwin.obj \ $(OBJS)\monolib_toolbkg.obj \ @@ -2160,12 +2376,12 @@ ____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 \ $(OBJS)\monolib_gdiimage.obj \ $(OBJS)\monolib_gdiobj.obj \ + $(OBJS)\monolib_gdiplus.obj \ $(OBJS)\monolib_graphics.obj \ $(OBJS)\monolib_gsockmsw.obj \ $(OBJS)\monolib_icon.obj \ @@ -2183,7 +2399,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 \ @@ -2244,6 +2459,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 \ @@ -2251,6 +2467,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_artstd.obj \ $(OBJS)\monolib_bmpbase.obj \ $(OBJS)\monolib_bookctrl.obj \ + $(OBJS)\monolib_btncmn.obj \ $(OBJS)\monolib_choiccmn.obj \ $(OBJS)\monolib_clipcmn.obj \ $(OBJS)\monolib_clrpickercmn.obj \ @@ -2266,6 +2483,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 \ @@ -2274,7 +2492,6 @@ ____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_filepickercmn.obj \ $(OBJS)\monolib_fontpickercmn.obj \ @@ -2282,6 +2499,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_fontcmn.obj \ $(OBJS)\monolib_fontenumcmn.obj \ $(OBJS)\monolib_fontmap.obj \ + $(OBJS)\monolib_fontutilcmn.obj \ $(OBJS)\monolib_framecmn.obj \ $(OBJS)\monolib_gaugecmn.obj \ $(OBJS)\monolib_gbsizer.obj \ @@ -2321,11 +2539,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_rgncmn.obj \ $(OBJS)\monolib_settcmn.obj \ $(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_toplvcmn.obj \ $(OBJS)\monolib_treebase.obj \ $(OBJS)\monolib_valgen.obj \ @@ -2338,6 +2557,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(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 \ @@ -2355,6 +2575,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_selstore.obj \ $(OBJS)\monolib_spinctlg.obj \ $(OBJS)\monolib_splitter.obj \ + $(OBJS)\monolib_srchctlg.obj \ $(OBJS)\monolib_textdlgg.obj \ $(OBJS)\monolib_tipwin.obj \ $(OBJS)\monolib_toolbkg.obj \ @@ -2367,17 +2588,19 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_animatecmn.obj \ $(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_collpaneg.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_hyperlink.obj \ + $(OBJS)\monolib_hyperlinkg.obj \ $(OBJS)\monolib_laywin.obj \ $(OBJS)\monolib_odcombo.obj \ $(OBJS)\monolib_propdlg.obj \ @@ -2385,7 +2608,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_splash.obj \ $(OBJS)\monolib_tipdlg.obj \ $(OBJS)\monolib_wizard.obj \ - $(OBJS)\monolib_animateg.obj \ $(OBJS)\monolib_taskbarcmn.obj \ $(OBJS)\monolib_aboutdlg.obj \ $(OBJS)\monolib_sound.obj \ @@ -2397,17 +2619,19 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_animatecmn.obj \ $(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_collpaneg.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_hyperlink.obj \ + $(OBJS)\monolib_hyperlinkg.obj \ $(OBJS)\monolib_laywin.obj \ $(OBJS)\monolib_odcombo.obj \ $(OBJS)\monolib_propdlg.obj \ @@ -2415,7 +2639,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_splash.obj \ $(OBJS)\monolib_tipdlg.obj \ $(OBJS)\monolib_wizard.obj \ - $(OBJS)\monolib_animateg.obj \ $(OBJS)\monolib_taskbarcmn.obj \ $(OBJS)\monolib_aboutdlg.obj \ $(OBJS)\monolib_sound.obj \ @@ -2430,6 +2653,12 @@ __basedll___depname = \ __baselib___depname = \ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif +!if "$(SHARED)" == "1" +____wxbase_namedll_DEP = $(__basedll___depname) +!endif +!if "$(SHARED)" == "0" +____wxbase_namelib_DEP = $(__baselib___depname) +!endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" __netdll___depname = \ $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG).dll @@ -2438,6 +2667,12 @@ __netdll___depname = \ __netlib___depname = \ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib !endif +!if "$(SHARED)" == "1" +____wxnet_namedll_DEP = $(__netdll___depname) +!endif +!if "$(SHARED)" == "0" +____wxnet_namelib_DEP = $(__netlib___depname) +!endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" __coredll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG).dll @@ -2461,12 +2696,12 @@ ____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 \ $(OBJS)\coredll_gdiimage.obj \ $(OBJS)\coredll_gdiobj.obj \ + $(OBJS)\coredll_gdiplus.obj \ $(OBJS)\coredll_graphics.obj \ $(OBJS)\coredll_gsockmsw.obj \ $(OBJS)\coredll_icon.obj \ @@ -2484,7 +2719,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 \ @@ -2542,6 +2776,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(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 \ @@ -2549,6 +2784,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_artstd.obj \ $(OBJS)\coredll_bmpbase.obj \ $(OBJS)\coredll_bookctrl.obj \ + $(OBJS)\coredll_btncmn.obj \ $(OBJS)\coredll_choiccmn.obj \ $(OBJS)\coredll_clipcmn.obj \ $(OBJS)\coredll_clrpickercmn.obj \ @@ -2564,6 +2800,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 \ @@ -2572,7 +2809,6 @@ ____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_filepickercmn.obj \ $(OBJS)\coredll_fontpickercmn.obj \ @@ -2580,6 +2816,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_fontcmn.obj \ $(OBJS)\coredll_fontenumcmn.obj \ $(OBJS)\coredll_fontmap.obj \ + $(OBJS)\coredll_fontutilcmn.obj \ $(OBJS)\coredll_framecmn.obj \ $(OBJS)\coredll_gaugecmn.obj \ $(OBJS)\coredll_gbsizer.obj \ @@ -2619,11 +2856,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_rgncmn.obj \ $(OBJS)\coredll_settcmn.obj \ $(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_toplvcmn.obj \ $(OBJS)\coredll_treebase.obj \ $(OBJS)\coredll_valgen.obj \ @@ -2636,6 +2874,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(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 \ @@ -2653,6 +2892,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_selstore.obj \ $(OBJS)\coredll_spinctlg.obj \ $(OBJS)\coredll_splitter.obj \ + $(OBJS)\coredll_srchctlg.obj \ $(OBJS)\coredll_textdlgg.obj \ $(OBJS)\coredll_tipwin.obj \ $(OBJS)\coredll_toolbkg.obj \ @@ -2680,12 +2920,12 @@ ____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 \ $(OBJS)\coredll_gdiimage.obj \ $(OBJS)\coredll_gdiobj.obj \ + $(OBJS)\coredll_gdiplus.obj \ $(OBJS)\coredll_graphics.obj \ $(OBJS)\coredll_gsockmsw.obj \ $(OBJS)\coredll_icon.obj \ @@ -2703,7 +2943,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 \ @@ -2764,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 \ @@ -2771,6 +3011,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_artstd.obj \ $(OBJS)\coredll_bmpbase.obj \ $(OBJS)\coredll_bookctrl.obj \ + $(OBJS)\coredll_btncmn.obj \ $(OBJS)\coredll_choiccmn.obj \ $(OBJS)\coredll_clipcmn.obj \ $(OBJS)\coredll_clrpickercmn.obj \ @@ -2786,6 +3027,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 \ @@ -2794,7 +3036,6 @@ ____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_filepickercmn.obj \ $(OBJS)\coredll_fontpickercmn.obj \ @@ -2802,6 +3043,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_fontcmn.obj \ $(OBJS)\coredll_fontenumcmn.obj \ $(OBJS)\coredll_fontmap.obj \ + $(OBJS)\coredll_fontutilcmn.obj \ $(OBJS)\coredll_framecmn.obj \ $(OBJS)\coredll_gaugecmn.obj \ $(OBJS)\coredll_gbsizer.obj \ @@ -2841,11 +3083,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_rgncmn.obj \ $(OBJS)\coredll_settcmn.obj \ $(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_toplvcmn.obj \ $(OBJS)\coredll_treebase.obj \ $(OBJS)\coredll_valgen.obj \ @@ -2858,6 +3101,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(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 \ @@ -2875,6 +3119,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_selstore.obj \ $(OBJS)\coredll_spinctlg.obj \ $(OBJS)\coredll_splitter.obj \ + $(OBJS)\coredll_srchctlg.obj \ $(OBJS)\coredll_textdlgg.obj \ $(OBJS)\coredll_tipwin.obj \ $(OBJS)\coredll_toolbkg.obj \ @@ -2906,12 +3151,12 @@ ____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 \ $(OBJS)\corelib_gdiimage.obj \ $(OBJS)\corelib_gdiobj.obj \ + $(OBJS)\corelib_gdiplus.obj \ $(OBJS)\corelib_graphics.obj \ $(OBJS)\corelib_gsockmsw.obj \ $(OBJS)\corelib_icon.obj \ @@ -2929,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 \ @@ -2987,6 +3231,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(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 \ @@ -2994,6 +3239,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_artstd.obj \ $(OBJS)\corelib_bmpbase.obj \ $(OBJS)\corelib_bookctrl.obj \ + $(OBJS)\corelib_btncmn.obj \ $(OBJS)\corelib_choiccmn.obj \ $(OBJS)\corelib_clipcmn.obj \ $(OBJS)\corelib_clrpickercmn.obj \ @@ -3009,6 +3255,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 \ @@ -3017,7 +3264,6 @@ ____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_filepickercmn.obj \ $(OBJS)\corelib_fontpickercmn.obj \ @@ -3025,6 +3271,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_fontcmn.obj \ $(OBJS)\corelib_fontenumcmn.obj \ $(OBJS)\corelib_fontmap.obj \ + $(OBJS)\corelib_fontutilcmn.obj \ $(OBJS)\corelib_framecmn.obj \ $(OBJS)\corelib_gaugecmn.obj \ $(OBJS)\corelib_gbsizer.obj \ @@ -3064,11 +3311,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_rgncmn.obj \ $(OBJS)\corelib_settcmn.obj \ $(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_toplvcmn.obj \ $(OBJS)\corelib_treebase.obj \ $(OBJS)\corelib_valgen.obj \ @@ -3081,6 +3329,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(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 \ @@ -3098,6 +3347,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_selstore.obj \ $(OBJS)\corelib_spinctlg.obj \ $(OBJS)\corelib_splitter.obj \ + $(OBJS)\corelib_srchctlg.obj \ $(OBJS)\corelib_textdlgg.obj \ $(OBJS)\corelib_tipwin.obj \ $(OBJS)\corelib_toolbkg.obj \ @@ -3125,12 +3375,12 @@ ____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 \ $(OBJS)\corelib_gdiimage.obj \ $(OBJS)\corelib_gdiobj.obj \ + $(OBJS)\corelib_gdiplus.obj \ $(OBJS)\corelib_graphics.obj \ $(OBJS)\corelib_gsockmsw.obj \ $(OBJS)\corelib_icon.obj \ @@ -3148,7 +3398,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 \ @@ -3209,6 +3458,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 \ @@ -3216,6 +3466,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_artstd.obj \ $(OBJS)\corelib_bmpbase.obj \ $(OBJS)\corelib_bookctrl.obj \ + $(OBJS)\corelib_btncmn.obj \ $(OBJS)\corelib_choiccmn.obj \ $(OBJS)\corelib_clipcmn.obj \ $(OBJS)\corelib_clrpickercmn.obj \ @@ -3231,6 +3482,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 \ @@ -3239,7 +3491,6 @@ ____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_filepickercmn.obj \ $(OBJS)\corelib_fontpickercmn.obj \ @@ -3247,6 +3498,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_fontcmn.obj \ $(OBJS)\corelib_fontenumcmn.obj \ $(OBJS)\corelib_fontmap.obj \ + $(OBJS)\corelib_fontutilcmn.obj \ $(OBJS)\corelib_framecmn.obj \ $(OBJS)\corelib_gaugecmn.obj \ $(OBJS)\corelib_gbsizer.obj \ @@ -3286,11 +3538,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_rgncmn.obj \ $(OBJS)\corelib_settcmn.obj \ $(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_toplvcmn.obj \ $(OBJS)\corelib_treebase.obj \ $(OBJS)\corelib_valgen.obj \ @@ -3303,6 +3556,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(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 \ @@ -3320,6 +3574,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_selstore.obj \ $(OBJS)\corelib_spinctlg.obj \ $(OBJS)\corelib_splitter.obj \ + $(OBJS)\corelib_srchctlg.obj \ $(OBJS)\corelib_textdlgg.obj \ $(OBJS)\corelib_tipwin.obj \ $(OBJS)\corelib_toolbkg.obj \ @@ -3328,6 +3583,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_vlbox.obj \ $(OBJS)\corelib_vscroll.obj !endif +!if "$(SHARED)" == "1" +____wxcore_namedll_DEP = $(__coredll___depname) +!endif +!if "$(SHARED)" == "0" +____wxcore_namelib_DEP = $(__corelib___depname) +!endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" __advdll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG).dll @@ -3336,17 +3597,19 @@ __advdll___depname = \ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_animatecmn.obj \ $(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_collpaneg.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_hyperlink.obj \ + $(OBJS)\advdll_hyperlinkg.obj \ $(OBJS)\advdll_laywin.obj \ $(OBJS)\advdll_odcombo.obj \ $(OBJS)\advdll_propdlg.obj \ @@ -3354,7 +3617,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_splash.obj \ $(OBJS)\advdll_tipdlg.obj \ $(OBJS)\advdll_wizard.obj \ - $(OBJS)\advdll_animateg.obj \ $(OBJS)\advdll_taskbarcmn.obj \ $(OBJS)\advdll_aboutdlg.obj \ $(OBJS)\advdll_sound.obj \ @@ -3366,17 +3628,19 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_animatecmn.obj \ $(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_collpaneg.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_hyperlink.obj \ + $(OBJS)\advdll_hyperlinkg.obj \ $(OBJS)\advdll_laywin.obj \ $(OBJS)\advdll_odcombo.obj \ $(OBJS)\advdll_propdlg.obj \ @@ -3384,7 +3648,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_splash.obj \ $(OBJS)\advdll_tipdlg.obj \ $(OBJS)\advdll_wizard.obj \ - $(OBJS)\advdll_animateg.obj \ $(OBJS)\advdll_taskbarcmn.obj \ $(OBJS)\advdll_aboutdlg.obj \ $(OBJS)\advdll_sound.obj \ @@ -3399,17 +3662,19 @@ __advlib___depname = \ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_animatecmn.obj \ $(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_collpaneg.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_hyperlink.obj \ + $(OBJS)\advlib_hyperlinkg.obj \ $(OBJS)\advlib_laywin.obj \ $(OBJS)\advlib_odcombo.obj \ $(OBJS)\advlib_propdlg.obj \ @@ -3417,7 +3682,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_splash.obj \ $(OBJS)\advlib_tipdlg.obj \ $(OBJS)\advlib_wizard.obj \ - $(OBJS)\advlib_animateg.obj \ $(OBJS)\advlib_taskbarcmn.obj \ $(OBJS)\advlib_aboutdlg.obj \ $(OBJS)\advlib_sound.obj \ @@ -3429,17 +3693,19 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_animatecmn.obj \ $(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_collpaneg.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_hyperlink.obj \ + $(OBJS)\advlib_hyperlinkg.obj \ $(OBJS)\advlib_laywin.obj \ $(OBJS)\advlib_odcombo.obj \ $(OBJS)\advlib_propdlg.obj \ @@ -3447,13 +3713,18 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_splash.obj \ $(OBJS)\advlib_tipdlg.obj \ $(OBJS)\advlib_wizard.obj \ - $(OBJS)\advlib_animateg.obj \ $(OBJS)\advlib_taskbarcmn.obj \ $(OBJS)\advlib_aboutdlg.obj \ $(OBJS)\advlib_sound.obj \ $(OBJS)\advlib_taskbar.obj \ $(OBJS)\advlib_joystick.obj !endif +!if "$(SHARED)" == "1" +____wxadv_namedll_DEP = $(__advdll___depname) +!endif +!if "$(SHARED)" == "0" +____wxadv_namelib_DEP = $(__advlib___depname) +!endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1" __mediadll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).dll @@ -3462,6 +3733,12 @@ __mediadll___depname = \ __medialib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib !endif +!if "$(SHARED)" == "1" +____wxmedia_namedll_DEP = $(__mediadll___depname) +!endif +!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 @@ -3478,6 +3755,12 @@ __dbgriddll___depname = \ __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 @@ -3486,6 +3769,12 @@ __htmldll___depname = \ __htmllib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib !endif +!if "$(SHARED)" == "1" +____wxhtml_namedll_DEP = $(__htmldll___depname) +!endif +!if "$(SHARED)" == "0" +____wxhtml_namelib_DEP = $(__htmllib___depname) +!endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1" __qadll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_bcc$(VENDORTAG).dll @@ -3494,6 +3783,12 @@ __qadll___depname = \ __qalib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib !endif +!if "$(SHARED)" == "1" +____wxqa_namedll_DEP = $(__qadll___depname) +!endif +!if "$(SHARED)" == "0" +____wxqa_namelib_DEP = $(__qalib___depname) +!endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" __xmldll___depname = \ $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG).dll @@ -3502,6 +3797,12 @@ __xmldll___depname = \ __xmllib___depname = \ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib !endif +!if "$(SHARED)" == "1" +____wxxml_namedll_DEP = $(__xmldll___depname) +!endif +!if "$(SHARED)" == "0" +____wxxml_namelib_DEP = $(__xmllib___depname) +!endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1" __xrcdll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG).dll @@ -3510,6 +3811,12 @@ __xrcdll___depname = \ __xrclib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib !endif +!if "$(SHARED)" == "1" +____wxxrc_namedll_DEP = $(__xrcdll___depname) +!endif +!if "$(SHARED)" == "0" +____wxxrc_namelib_DEP = $(__xrclib___depname) +!endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1" __auidll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).dll @@ -3518,6 +3825,12 @@ __auidll___depname = \ __auilib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib !endif +!if "$(SHARED)" == "1" +____wxaui_namedll_DEP = $(__auidll___depname) +!endif +!if "$(SHARED)" == "0" +____wxaui_namelib_DEP = $(__auilib___depname) +!endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1" __richtextdll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG).dll @@ -3526,6 +3839,26 @@ __richtextdll___depname = \ __richtextlib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib !endif +!if "$(SHARED)" == "1" +____wxrichtext_namedll_DEP = $(__richtextdll___depname) +!endif +!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 @@ -3546,44 +3879,60 @@ __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 +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1" +__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_13 = !endif !if "$(USE_THREADS)" == "1" -__THREADSFLAG_12 = mt +__THREADSFLAG_13 = mt !endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_4 = i +__RUNTIME_LIBS_5 = i !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_4 = +__RUNTIME_LIBS_5 = !endif !if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_58 = -d__WXUNIVERSAL__ +__WXUNIV_DEFINE_p_62 = -d__WXUNIVERSAL__ !endif !if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" -__DEBUG_DEFINE_p_57 = -d__WXDEBUG__ +__DEBUG_DEFINE_p_61 = -d__WXDEBUG__ !endif !if "$(DEBUG_FLAG)" == "1" -__DEBUG_DEFINE_p_57 = -d__WXDEBUG__ +__DEBUG_DEFINE_p_61 = -d__WXDEBUG__ !endif !if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_57 = -dwxNO_EXCEPTIONS +__EXCEPTIONS_DEFINE_p_61 = -dwxNO_EXCEPTIONS !endif !if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_57 = -dwxNO_RTTI +__RTTI_DEFINE_p_61 = -dwxNO_RTTI !endif !if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_57 = -dwxNO_THREADS +__THREAD_DEFINE_p_61 = -dwxNO_THREADS !endif !if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_58 = -d_UNICODE +__UNICODE_DEFINE_p_62 = -d_UNICODE !endif !if "$(MSLU)" == "1" -__MSLU_DEFINE_p_57 = -dwxUSE_UNICODE_MSLU=1 +__MSLU_DEFINE_p_61 = -dwxUSE_UNICODE_MSLU=1 !endif !if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_57 = -dwxUSE_GRAPHICS_CONTEXT=1 +__GFXCTX_DEFINE_p_61 = -dwxUSE_GRAPHICS_CONTEXT=1 !endif !if "$(USE_GUI)" == "1" __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib @@ -3671,7 +4020,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) $(__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) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -3683,6 +4032,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 @@ -3795,6 +4145,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 @@ -3852,10 +4210,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) $(OBJS)\monodll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +$(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 odbc32.lib $(__wxscintilla) import32.lib cw32$(__THREADSFLAG_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\monodll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) $@ !endif @@ -3869,9 +4235,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) $(OBJS)\basedll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +$(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 odbc32.lib import32.lib cw32$(__THREADSFLAG_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\basedll_version.res | implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) $@ !endif @@ -3884,10 +4250,14 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL | !endif +!if "$(MONOLITHIC)" == "0" +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) $(OBJS)\netdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__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 odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\netdll_version.res | implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net $@ !endif @@ -3900,10 +4270,14 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL | !endif +!if "$(MONOLITHIC)" == "0" +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) $(OBJS)\coredll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__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 odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\coredll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core $@ !endif @@ -3916,10 +4290,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD | !endif +!if "$(MONOLITHIC)" == "0" && "$(USE_GUI)" == "1" +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) $(OBJS)\advdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__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 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_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\advdll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv $@ !endif @@ -3932,10 +4310,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD | !endif +!if "$(MONOLITHIC)" == "0" && "$(USE_GUI)" == "1" +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) $(OBJS)\mediadll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__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 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_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\mediadll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media $@ !endif @@ -3948,10 +4330,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD | !endif +!if "$(MONOLITHIC)" == "0" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1" +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) $(OBJS)\odbcdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) +$(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) $(__wxscintilla) $(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 + 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_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\odbcdll_version.res | implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc $@ !endif @@ -3965,9 +4351,9 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL !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) $(OBJS)\dbgriddll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname) +$(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) $(__wxscintilla) $(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 + 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_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\dbgriddll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid $@ !endif @@ -3980,10 +4366,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD | !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) $(OBJS)\htmldll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__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 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_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\htmldll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html $@ !endif @@ -3996,10 +4386,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD | !endif +!if "$(MONOLITHIC)" == "0" && "$(USE_HTML)" == "1" +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) $(OBJS)\qadll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__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 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_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\qadll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa $@ !endif @@ -4012,10 +4406,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD | !endif +!if "$(MONOLITHIC)" == "0" && "$(USE_QA)" == "1" +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) $(OBJS)\xmldll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__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 odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\xmldll_version.res | implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml $@ !endif @@ -4028,10 +4426,14 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL | !endif +!if "$(MONOLITHIC)" == "0" +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) $(OBJS)\xrcdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__htmldll___depname) $(__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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.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)_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 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_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\xrcdll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc $@ !endif @@ -4044,10 +4446,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD | !endif +!if "$(MONOLITHIC)" == "0" && "$(USE_XRC)" == "1" +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) $(OBJS)\auidll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) +$(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 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_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\auidll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui $@ !endif @@ -4060,10 +4466,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD | !endif +!if "$(MONOLITHIC)" == "0" && "$(USE_AUI)" == "1" +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) $(OBJS)\richtextdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__htmldll___depname) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname) +$(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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(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 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_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\richtextdll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext $@ !endif @@ -4076,10 +4486,34 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD | !endif +!if "$(MONOLITHIC)" == "0" && "$(USE_RICHTEXT)" == "1" +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 odbc32.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_13)$(__RUNTIME_LIBS_5).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) $(OBJS)\gldll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__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 odbc32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) import32.lib cw32$(__THREADSFLAG_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\gldll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl $@ !endif @@ -4092,6 +4526,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 @@ -4121,8 +4559,8 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs build_cfg_file: $(SETUPHDIR) @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE) - @echo WXVER_MINOR=7 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE) + @echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @@ -4503,12 +4941,252 @@ $(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)\wxscintilla_AutoComplete.obj: ..\..\src\stc\scintilla\src\AutoComplete.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_CallTip.obj: ..\..\src\stc\scintilla\src\CallTip.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_CellBuffer.obj: ..\..\src\stc\scintilla\src\CellBuffer.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_CharClassify.obj: ..\..\src\stc\scintilla\src\CharClassify.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_ContractionState.obj: ..\..\src\stc\scintilla\src\ContractionState.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_Document.obj: ..\..\src\stc\scintilla\src\Document.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_DocumentAccessor.obj: ..\..\src\stc\scintilla\src\DocumentAccessor.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_Editor.obj: ..\..\src\stc\scintilla\src\Editor.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_ExternalLexer.obj: ..\..\src\stc\scintilla\src\ExternalLexer.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(OBJS)\wxscintilla_Indicator.obj: ..\..\src\stc\scintilla\src\Indicator.cxx + $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) $** + +$(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_LexAVE.obj: ..\..\src\stc\scintilla\src\LexAVE.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_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_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_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_LexPOV.obj: ..\..\src\stc\scintilla\src\LexPOV.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_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_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_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_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) $** - $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -4521,6 +5199,12 @@ $(OBJS)\monodll_arcfind.obj: ..\..\src\common\arcfind.cpp $(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) $** @@ -4554,6 +5238,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) $** @@ -4593,9 +5280,6 @@ $(OBJS)\monodll_fs_arc.obj: ..\..\src\common\fs_arc.cpp $(OBJS)\monodll_fs_filter.obj: ..\..\src\common\fs_filter.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_fs_zip.obj: ..\..\src\common\fs_zip.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** - $(OBJS)\monodll_hash.obj: ..\..\src\common\hash.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -4665,6 +5349,15 @@ $(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) $** + $(OBJS)\monodll_sysopt.obj: ..\..\src\common\sysopt.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -4677,12 +5370,21 @@ $(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) $** $(OBJS)\monodll_txtstrm.obj: ..\..\src\common\txtstrm.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_unichar.obj: ..\..\src\common\unichar.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_uri.obj: ..\..\src\common\uri.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -4692,7 +5394,10 @@ $(OBJS)\monodll_variant.obj: ..\..\src\common\variant.cpp $(OBJS)\monodll_wfstream.obj: ..\..\src\common\wfstream.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_wxchar.obj: ..\..\src\common\wxchar.cpp +$(OBJS)\monodll_wxcrt.obj: ..\..\src\common\wxcrt.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_wxprintf.obj: ..\..\src\common\wxprintf.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** $(OBJS)\monodll_xti.obj: ..\..\src\common\xti.cpp @@ -4749,6 +5454,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) $** @@ -4767,6 +5475,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) $** @@ -4965,6 +5676,9 @@ $(OBJS)\monodll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp $(OBJS)\monodll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5088,6 +5802,9 @@ $(OBJS)\monodll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp $(OBJS)\monodll_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5148,6 +5865,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) $** @@ -5175,6 +5895,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) $** @@ -5259,6 +5982,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) $** @@ -5350,11 +6082,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) $** @@ -5380,6 +6107,11 @@ $(OBJS)\monodll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_gdiplus.obj: ..\..\src\msw\gdiplus.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_graphics.obj: ..\..\src\msw\graphics.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5465,11 +6197,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) $** @@ -5770,6 +6497,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) $** @@ -5805,6 +6537,11 @@ $(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_choiccmn.obj: ..\..\src\common\choiccmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5880,6 +6617,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) $** @@ -5920,11 +6662,6 @@ $(OBJS)\monodll_effects.obj: ..\..\src\common\effects.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5960,6 +6697,11 @@ $(OBJS)\monodll_fontmap.obj: ..\..\src\common\fontmap.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_framecmn.obj: ..\..\src\common\framecmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6155,28 +6897,33 @@ $(OBJS)\monodll_sizer.obj: ..\..\src\common\sizer.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_srchcmn.obj: ..\..\src\common\srchcmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_statbar.obj: ..\..\src\common\statbar.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_stockitem.obj: ..\..\src\common\stockitem.cpp +$(OBJS)\monodll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_tbarbase.obj: ..\..\src\common\tbarbase.cpp +$(OBJS)\monodll_stockitem.obj: ..\..\src\common\stockitem.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_textcmn.obj: ..\..\src\common\textcmn.cpp +$(OBJS)\monodll_tbarbase.obj: ..\..\src\common\tbarbase.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_timercmn.obj: ..\..\src\common\timercmn.cpp +$(OBJS)\monodll_textcmn.obj: ..\..\src\common\textcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif @@ -6240,6 +6987,11 @@ $(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) $** @@ -6325,6 +7077,11 @@ $(OBJS)\monodll_splitter.obj: ..\..\src\generic\splitter.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6370,23 +7127,28 @@ $(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp +$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp +$(OBJS)\monodll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp +$(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif @@ -6400,6 +7162,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) $** @@ -6421,7 +7188,7 @@ $(OBJS)\monodll_helpext.obj: ..\..\src\generic\helpext.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_hyperlink.obj: ..\..\src\generic\hyperlink.cpp +$(OBJS)\monodll_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif @@ -6460,11 +7227,6 @@ $(OBJS)\monodll_wizard.obj: ..\..\src\generic\wizard.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_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6490,6 +7252,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_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -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 -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 $** @@ -6505,6 +7270,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) $** @@ -6538,6 +7309,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) $** @@ -6577,9 +7351,6 @@ $(OBJS)\monolib_fs_arc.obj: ..\..\src\common\fs_arc.cpp $(OBJS)\monolib_fs_filter.obj: ..\..\src\common\fs_filter.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_fs_zip.obj: ..\..\src\common\fs_zip.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** - $(OBJS)\monolib_hash.obj: ..\..\src\common\hash.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -6649,6 +7420,15 @@ $(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) $** + $(OBJS)\monolib_sysopt.obj: ..\..\src\common\sysopt.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -6661,12 +7441,21 @@ $(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) $** $(OBJS)\monolib_txtstrm.obj: ..\..\src\common\txtstrm.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_unichar.obj: ..\..\src\common\unichar.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_uri.obj: ..\..\src\common\uri.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -6676,7 +7465,10 @@ $(OBJS)\monolib_variant.obj: ..\..\src\common\variant.cpp $(OBJS)\monolib_wfstream.obj: ..\..\src\common\wfstream.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_wxchar.obj: ..\..\src\common\wxchar.cpp +$(OBJS)\monolib_wxcrt.obj: ..\..\src\common\wxcrt.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_wxprintf.obj: ..\..\src\common\wxprintf.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** $(OBJS)\monolib_xti.obj: ..\..\src\common\xti.cpp @@ -6733,6 +7525,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) $** @@ -6751,6 +7546,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) $** @@ -6949,6 +7747,9 @@ $(OBJS)\monolib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp $(OBJS)\monolib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7072,6 +7873,9 @@ $(OBJS)\monolib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp $(OBJS)\monolib_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7132,6 +7936,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) $** @@ -7159,6 +7966,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) $** @@ -7243,6 +8053,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) $** @@ -7334,11 +8153,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) $** @@ -7364,6 +8178,11 @@ $(OBJS)\monolib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_gdiplus.obj: ..\..\src\msw\gdiplus.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_graphics.obj: ..\..\src\msw\graphics.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7449,11 +8268,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) $** @@ -7754,6 +8568,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) $** @@ -7789,6 +8608,11 @@ $(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_choiccmn.obj: ..\..\src\common\choiccmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7864,6 +8688,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) $** @@ -7904,11 +8733,6 @@ $(OBJS)\monolib_effects.obj: ..\..\src\common\effects.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7944,6 +8768,11 @@ $(OBJS)\monolib_fontmap.obj: ..\..\src\common\fontmap.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_framecmn.obj: ..\..\src\common\framecmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -8139,28 +8968,33 @@ $(OBJS)\monolib_sizer.obj: ..\..\src\common\sizer.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_srchcmn.obj: ..\..\src\common\srchcmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_statbar.obj: ..\..\src\common\statbar.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_stockitem.obj: ..\..\src\common\stockitem.cpp +$(OBJS)\monolib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_tbarbase.obj: ..\..\src\common\tbarbase.cpp +$(OBJS)\monolib_stockitem.obj: ..\..\src\common\stockitem.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_textcmn.obj: ..\..\src\common\textcmn.cpp +$(OBJS)\monolib_tbarbase.obj: ..\..\src\common\tbarbase.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_timercmn.obj: ..\..\src\common\timercmn.cpp +$(OBJS)\monolib_textcmn.obj: ..\..\src\common\textcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif @@ -8224,6 +9058,11 @@ $(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) $** @@ -8309,6 +9148,11 @@ $(OBJS)\monolib_splitter.obj: ..\..\src\generic\splitter.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -8354,23 +9198,28 @@ $(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp +$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp +$(OBJS)\monolib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp +$(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif @@ -8384,6 +9233,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) $** @@ -8405,7 +9259,7 @@ $(OBJS)\monolib_helpext.obj: ..\..\src\generic\helpext.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_hyperlink.obj: ..\..\src\generic\hyperlink.cpp +$(OBJS)\monolib_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif @@ -8444,11 +9298,6 @@ $(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.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_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -8478,7 +9327,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) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -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 $** $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -8492,6 +9341,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) $** @@ -8525,6 +9380,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) $** @@ -8564,9 +9422,6 @@ $(OBJS)\basedll_fs_arc.obj: ..\..\src\common\fs_arc.cpp $(OBJS)\basedll_fs_filter.obj: ..\..\src\common\fs_filter.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_fs_zip.obj: ..\..\src\common\fs_zip.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** - $(OBJS)\basedll_hash.obj: ..\..\src\common\hash.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -8636,6 +9491,15 @@ $(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) $** + $(OBJS)\basedll_sysopt.obj: ..\..\src\common\sysopt.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -8648,12 +9512,21 @@ $(OBJS)\basedll_textbuf.obj: ..\..\src\common\textbuf.cpp $(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_timerimpl.obj: ..\..\src\common\timerimpl.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + $(OBJS)\basedll_tokenzr.obj: ..\..\src\common\tokenzr.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** $(OBJS)\basedll_txtstrm.obj: ..\..\src\common\txtstrm.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** +$(OBJS)\basedll_unichar.obj: ..\..\src\common\unichar.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + $(OBJS)\basedll_uri.obj: ..\..\src\common\uri.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -8663,7 +9536,10 @@ $(OBJS)\basedll_variant.obj: ..\..\src\common\variant.cpp $(OBJS)\basedll_wfstream.obj: ..\..\src\common\wfstream.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_wxchar.obj: ..\..\src\common\wxchar.cpp +$(OBJS)\basedll_wxcrt.obj: ..\..\src\common\wxcrt.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + +$(OBJS)\basedll_wxprintf.obj: ..\..\src\common\wxprintf.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** $(OBJS)\basedll_xti.obj: ..\..\src\common\xti.cpp @@ -8720,6 +9596,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) $** @@ -8738,6 +9617,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) $** @@ -8762,6 +9644,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) $** @@ -8795,6 +9683,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) $** @@ -8834,9 +9725,6 @@ $(OBJS)\baselib_fs_arc.obj: ..\..\src\common\fs_arc.cpp $(OBJS)\baselib_fs_filter.obj: ..\..\src\common\fs_filter.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_fs_zip.obj: ..\..\src\common\fs_zip.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** - $(OBJS)\baselib_hash.obj: ..\..\src\common\hash.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** @@ -8906,6 +9794,15 @@ $(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) $** + $(OBJS)\baselib_sysopt.obj: ..\..\src\common\sysopt.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** @@ -8918,12 +9815,21 @@ $(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) $** $(OBJS)\baselib_txtstrm.obj: ..\..\src\common\txtstrm.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** +$(OBJS)\baselib_unichar.obj: ..\..\src\common\unichar.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** + $(OBJS)\baselib_uri.obj: ..\..\src\common\uri.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** @@ -8933,7 +9839,10 @@ $(OBJS)\baselib_variant.obj: ..\..\src\common\variant.cpp $(OBJS)\baselib_wfstream.obj: ..\..\src\common\wfstream.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_wxchar.obj: ..\..\src\common\wxchar.cpp +$(OBJS)\baselib_wxcrt.obj: ..\..\src\common\wxcrt.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** + +$(OBJS)\baselib_wxprintf.obj: ..\..\src\common\wxprintf.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** $(OBJS)\baselib_xti.obj: ..\..\src\common\xti.cpp @@ -8990,6 +9899,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) $** @@ -9008,6 +9920,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) $** @@ -9021,7 +9936,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) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -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 $** $(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $** @@ -9102,7 +10017,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) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -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 $** $(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -9116,6 +10031,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) $** @@ -9351,11 +10269,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) $** @@ -9381,6 +10294,11 @@ $(OBJS)\coredll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_gdiplus.obj: ..\..\src\msw\gdiplus.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_graphics.obj: ..\..\src\msw\graphics.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -9466,11 +10384,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) $** @@ -9771,6 +10684,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) $** @@ -9806,6 +10724,11 @@ $(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_choiccmn.obj: ..\..\src\common\choiccmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -9881,6 +10804,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) $** @@ -9921,11 +10849,6 @@ $(OBJS)\coredll_effects.obj: ..\..\src\common\effects.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -9961,6 +10884,11 @@ $(OBJS)\coredll_fontmap.obj: ..\..\src\common\fontmap.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_framecmn.obj: ..\..\src\common\framecmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -10156,28 +11084,33 @@ $(OBJS)\coredll_sizer.obj: ..\..\src\common\sizer.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_srchcmn.obj: ..\..\src\common\srchcmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_statbar.obj: ..\..\src\common\statbar.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_stockitem.obj: ..\..\src\common\stockitem.cpp +$(OBJS)\coredll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_tbarbase.obj: ..\..\src\common\tbarbase.cpp +$(OBJS)\coredll_stockitem.obj: ..\..\src\common\stockitem.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_textcmn.obj: ..\..\src\common\textcmn.cpp +$(OBJS)\coredll_tbarbase.obj: ..\..\src\common\tbarbase.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_timercmn.obj: ..\..\src\common\timercmn.cpp +$(OBJS)\coredll_textcmn.obj: ..\..\src\common\textcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif @@ -10241,6 +11174,11 @@ $(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) $** @@ -10326,6 +11264,11 @@ $(OBJS)\coredll_splitter.obj: ..\..\src\generic\splitter.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -10376,6 +11319,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) $** @@ -10611,11 +11557,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) $** @@ -10641,6 +11582,11 @@ $(OBJS)\corelib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_gdiplus.obj: ..\..\src\msw\gdiplus.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_graphics.obj: ..\..\src\msw\graphics.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -10726,11 +11672,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) $** @@ -11031,6 +11972,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) $** @@ -11066,6 +12012,11 @@ $(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_choiccmn.obj: ..\..\src\common\choiccmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -11141,6 +12092,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) $** @@ -11181,11 +12137,6 @@ $(OBJS)\corelib_effects.obj: ..\..\src\common\effects.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -11221,6 +12172,11 @@ $(OBJS)\corelib_fontmap.obj: ..\..\src\common\fontmap.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_framecmn.obj: ..\..\src\common\framecmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -11416,28 +12372,33 @@ $(OBJS)\corelib_sizer.obj: ..\..\src\common\sizer.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_srchcmn.obj: ..\..\src\common\srchcmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_statbar.obj: ..\..\src\common\statbar.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_stockitem.obj: ..\..\src\common\stockitem.cpp +$(OBJS)\corelib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_tbarbase.obj: ..\..\src\common\tbarbase.cpp +$(OBJS)\corelib_stockitem.obj: ..\..\src\common\stockitem.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_textcmn.obj: ..\..\src\common\textcmn.cpp +$(OBJS)\corelib_tbarbase.obj: ..\..\src\common\tbarbase.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_timercmn.obj: ..\..\src\common\timercmn.cpp +$(OBJS)\corelib_textcmn.obj: ..\..\src\common\textcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif @@ -11501,6 +12462,11 @@ $(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) $** @@ -11586,6 +12552,11 @@ $(OBJS)\corelib_splitter.obj: ..\..\src\generic\splitter.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -11625,7 +12596,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) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -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 $** $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** @@ -11636,16 +12607,19 @@ $(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp $(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** +$(OBJS)\advdll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + $(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** -$(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp +$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** -$(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp +$(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** -$(OBJS)\advdll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp +$(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** $(OBJS)\advdll_datavgen.obj: ..\..\src\generic\datavgen.cpp @@ -11654,6 +12628,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) $** @@ -11666,7 +12643,7 @@ $(OBJS)\advdll_gridsel.obj: ..\..\src\generic\gridsel.cpp $(OBJS)\advdll_helpext.obj: ..\..\src\generic\helpext.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** -$(OBJS)\advdll_hyperlink.obj: ..\..\src\generic\hyperlink.cpp +$(OBJS)\advdll_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** $(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp @@ -11690,9 +12667,6 @@ $(OBJS)\advdll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.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_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** @@ -11720,16 +12694,19 @@ $(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp $(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** +$(OBJS)\advlib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + $(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** -$(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp +$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** -$(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp +$(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** -$(OBJS)\advlib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp +$(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** $(OBJS)\advlib_datavgen.obj: ..\..\src\generic\datavgen.cpp @@ -11738,6 +12715,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) $** @@ -11750,7 +12730,7 @@ $(OBJS)\advlib_gridsel.obj: ..\..\src\generic\gridsel.cpp $(OBJS)\advlib_helpext.obj: ..\..\src\generic\helpext.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** -$(OBJS)\advlib_hyperlink.obj: ..\..\src\generic\hyperlink.cpp +$(OBJS)\advlib_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** $(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp @@ -11774,9 +12754,6 @@ $(OBJS)\advlib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.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_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** @@ -11796,7 +12773,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) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -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 $** $(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp $(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) $** @@ -11807,6 +12784,9 @@ $(OBJS)\mediadll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp $(OBJS)\mediadll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp $(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) $** +$(OBJS)\mediadll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp + $(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) $** + $(OBJS)\mediadll_activex.obj: ..\..\src\msw\ole\activex.cpp $(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) $** @@ -11822,6 +12802,9 @@ $(OBJS)\medialib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp $(OBJS)\medialib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp $(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) $** +$(OBJS)\medialib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp + $(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) $** + $(OBJS)\medialib_activex.obj: ..\..\src\msw\ole\activex.cpp $(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) $** @@ -11829,7 +12812,7 @@ $(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) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -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) $** @@ -11850,7 +12833,7 @@ $(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) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -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) $** @@ -11865,7 +12848,7 @@ $(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) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -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 $** $(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) $** @@ -12018,7 +13001,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) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -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 $** $(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp $(CXX) -q -c -P -o$@ $(QADLL_CXXFLAGS) $** @@ -12039,7 +13022,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) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -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 $** $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp $(CXX) -q -c -P -o$@ $(XMLDLL_CXXFLAGS) $** @@ -12060,7 +13043,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) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -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 $** $(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** @@ -12095,6 +13078,9 @@ $(OBJS)\xrcdll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp $(OBJS)\xrcdll_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** +$(OBJS)\xrcdll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + $(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** @@ -12155,6 +13141,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) $** @@ -12182,6 +13171,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) $** @@ -12260,6 +13252,9 @@ $(OBJS)\xrclib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp $(OBJS)\xrclib_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** +$(OBJS)\xrclib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + $(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** @@ -12320,6 +13315,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) $** @@ -12347,6 +13345,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) $** @@ -12393,7 +13394,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) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -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 $** $(OBJS)\auidll_framemanager.obj: ..\..\src\aui\framemanager.cpp $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) $** @@ -12432,7 +13433,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) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -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 $** $(OBJS)\richtextdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) $** @@ -12491,11 +13492,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_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG) -i..\..\src\tiff -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) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -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 $** + +$(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) $** @@ -12503,6 +13534,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) $**