X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c3255f5fbab93ad229178ec1610a180afa35133a..6421119dd5b15a212827e925c912ac22d167bf34:/build/msw/makefile.bcc diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 4c02827bb8..f2224aa0c0 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.3 (http://bakefile.sourceforge.net) +# Bakefile 0.1.4 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -26,24 +26,31 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ -DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" -DUNICODE="$(UNICODE)" \ -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" -DDEBUG_INFO="$(DEBUG_INFO)" \ -DDEBUG_FLAG="$(DEBUG_FLAG)" -DMONOLITHIC="$(MONOLITHIC)" \ - -DUSE_GUI="$(USE_GUI)" -DUSE_HTML="$(USE_HTML)" \ + -DUSE_GUI="$(USE_GUI)" -DUSE_HTML="$(USE_HTML)" -DUSE_XRC="$(USE_XRC)" \ -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_ODBC="$(USE_ODBC)" \ -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" \ - -DVENDOR="$(VENDOR)" -DCFG="$(CFG)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" + -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 = 25 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) WXREGEX_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -I..\..\include -I$(SETUPHDIR) $(__UNICODE_DEFINE_p) \ - -w-8004 -w-8012 -w-8057 -w-8066 $(CPPFLAGS) $(CFLAGS) + $(__OPTIMIZEFLAG) -tWM -I..\..\include -I$(SETUPHDIR) -D__WXMSW__ \ + $(__UNICODE_DEFINE_p) -w-8008 -w-8012 -w-8057 -w-8064 -w-8066 -w-8070 \ + $(CPPFLAGS) $(CFLAGS) WXREGEX_OBJECTS = \ $(OBJS)\wxregex_regcomp.obj \ $(OBJS)\wxregex_regexec.obj \ $(OBJS)\wxregex_regerror.obj \ $(OBJS)\wxregex_regfree.obj WXZLIB_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -w-8004 -w-8012 -w-8057 $(CPPFLAGS) $(CFLAGS) + $(__OPTIMIZEFLAG) -tWM -w-8004 -w-8008 -w-8012 -w-8057 -w-8066 $(CPPFLAGS) \ + $(CFLAGS) WXZLIB_OBJECTS = \ $(OBJS)\wxzlib_adler32.obj \ $(OBJS)\wxzlib_compress.obj \ @@ -54,10 +61,8 @@ WXZLIB_OBJECTS = \ $(OBJS)\wxzlib_trees.obj \ $(OBJS)\wxzlib_zutil.obj \ $(OBJS)\wxzlib_inflate.obj \ - $(OBJS)\wxzlib_infblock.obj \ + $(OBJS)\wxzlib_infback.obj \ $(OBJS)\wxzlib_inftrees.obj \ - $(OBJS)\wxzlib_infcodes.obj \ - $(OBJS)\wxzlib_infutil.obj \ $(OBJS)\wxzlib_inffast.obj WXPNG_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -I..\..\src\zlib -w-8004 $(CPPFLAGS) $(CFLAGS) @@ -187,6 +192,7 @@ MONODLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ MONODLL_OBJECTS = \ $(OBJS)\monodll_dummy.obj \ $(OBJS)\monodll_appbase.obj \ + $(OBJS)\monodll_clntdata.obj \ $(OBJS)\monodll_cmdline.obj \ $(OBJS)\monodll_config.obj \ $(OBJS)\monodll_datetime.obj \ @@ -205,7 +211,6 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_filesys.obj \ $(OBJS)\monodll_fmapbase.obj \ $(OBJS)\monodll_fs_zip.obj \ - $(OBJS)\monodll_gzstream.obj \ $(OBJS)\monodll_hash.obj \ $(OBJS)\monodll_hashmap.obj \ $(OBJS)\monodll_init.obj \ @@ -221,6 +226,8 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_object.obj \ $(OBJS)\monodll_process.obj \ $(OBJS)\monodll_regex.obj \ + $(OBJS)\monodll_stdpbase.obj \ + $(OBJS)\monodll_sstream.obj \ $(OBJS)\monodll_stopwatch.obj \ $(OBJS)\monodll_strconv.obj \ $(OBJS)\monodll_stream.obj \ @@ -230,7 +237,8 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_textfile.obj \ $(OBJS)\monodll_tokenzr.obj \ $(OBJS)\monodll_txtstrm.obj \ - $(OBJS)\monodll_unzip.obj \ + $(OBJS)\monodll_archive.obj \ + $(OBJS)\monodll_uri.obj \ $(OBJS)\monodll_variant.obj \ $(OBJS)\monodll_wfstream.obj \ $(OBJS)\monodll_wxchar.obj \ @@ -246,6 +254,7 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_regconf.obj \ $(OBJS)\monodll_registry.obj \ $(OBJS)\monodll_snglinst.obj \ + $(OBJS)\monodll_stdpaths.obj \ $(OBJS)\monodll_thread.obj \ $(OBJS)\monodll_utils.obj \ $(OBJS)\monodll_utilsexc.obj \ @@ -285,6 +294,7 @@ MONOLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ MONOLIB_OBJECTS = \ $(OBJS)\monolib_dummy.obj \ $(OBJS)\monolib_appbase.obj \ + $(OBJS)\monolib_clntdata.obj \ $(OBJS)\monolib_cmdline.obj \ $(OBJS)\monolib_config.obj \ $(OBJS)\monolib_datetime.obj \ @@ -303,7 +313,6 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_filesys.obj \ $(OBJS)\monolib_fmapbase.obj \ $(OBJS)\monolib_fs_zip.obj \ - $(OBJS)\monolib_gzstream.obj \ $(OBJS)\monolib_hash.obj \ $(OBJS)\monolib_hashmap.obj \ $(OBJS)\monolib_init.obj \ @@ -319,6 +328,8 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_object.obj \ $(OBJS)\monolib_process.obj \ $(OBJS)\monolib_regex.obj \ + $(OBJS)\monolib_stdpbase.obj \ + $(OBJS)\monolib_sstream.obj \ $(OBJS)\monolib_stopwatch.obj \ $(OBJS)\monolib_strconv.obj \ $(OBJS)\monolib_stream.obj \ @@ -328,7 +339,8 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_textfile.obj \ $(OBJS)\monolib_tokenzr.obj \ $(OBJS)\monolib_txtstrm.obj \ - $(OBJS)\monolib_unzip.obj \ + $(OBJS)\monolib_archive.obj \ + $(OBJS)\monolib_uri.obj \ $(OBJS)\monolib_variant.obj \ $(OBJS)\monolib_wfstream.obj \ $(OBJS)\monolib_wxchar.obj \ @@ -344,6 +356,7 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_regconf.obj \ $(OBJS)\monolib_registry.obj \ $(OBJS)\monolib_snglinst.obj \ + $(OBJS)\monolib_stdpaths.obj \ $(OBJS)\monolib_thread.obj \ $(OBJS)\monolib_utils.obj \ $(OBJS)\monolib_utilsexc.obj \ @@ -384,6 +397,7 @@ BASEDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ BASEDLL_OBJECTS = \ $(OBJS)\basedll_dummy.obj \ $(OBJS)\basedll_appbase.obj \ + $(OBJS)\basedll_clntdata.obj \ $(OBJS)\basedll_cmdline.obj \ $(OBJS)\basedll_config.obj \ $(OBJS)\basedll_datetime.obj \ @@ -402,7 +416,6 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_filesys.obj \ $(OBJS)\basedll_fmapbase.obj \ $(OBJS)\basedll_fs_zip.obj \ - $(OBJS)\basedll_gzstream.obj \ $(OBJS)\basedll_hash.obj \ $(OBJS)\basedll_hashmap.obj \ $(OBJS)\basedll_init.obj \ @@ -418,6 +431,8 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_object.obj \ $(OBJS)\basedll_process.obj \ $(OBJS)\basedll_regex.obj \ + $(OBJS)\basedll_stdpbase.obj \ + $(OBJS)\basedll_sstream.obj \ $(OBJS)\basedll_stopwatch.obj \ $(OBJS)\basedll_strconv.obj \ $(OBJS)\basedll_stream.obj \ @@ -427,7 +442,8 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_textfile.obj \ $(OBJS)\basedll_tokenzr.obj \ $(OBJS)\basedll_txtstrm.obj \ - $(OBJS)\basedll_unzip.obj \ + $(OBJS)\basedll_archive.obj \ + $(OBJS)\basedll_uri.obj \ $(OBJS)\basedll_variant.obj \ $(OBJS)\basedll_wfstream.obj \ $(OBJS)\basedll_wxchar.obj \ @@ -443,6 +459,7 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_regconf.obj \ $(OBJS)\basedll_registry.obj \ $(OBJS)\basedll_snglinst.obj \ + $(OBJS)\basedll_stdpaths.obj \ $(OBJS)\basedll_thread.obj \ $(OBJS)\basedll_utils.obj \ $(OBJS)\basedll_utilsexc.obj \ @@ -467,6 +484,7 @@ BASELIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ BASELIB_OBJECTS = \ $(OBJS)\baselib_dummy.obj \ $(OBJS)\baselib_appbase.obj \ + $(OBJS)\baselib_clntdata.obj \ $(OBJS)\baselib_cmdline.obj \ $(OBJS)\baselib_config.obj \ $(OBJS)\baselib_datetime.obj \ @@ -485,7 +503,6 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_filesys.obj \ $(OBJS)\baselib_fmapbase.obj \ $(OBJS)\baselib_fs_zip.obj \ - $(OBJS)\baselib_gzstream.obj \ $(OBJS)\baselib_hash.obj \ $(OBJS)\baselib_hashmap.obj \ $(OBJS)\baselib_init.obj \ @@ -501,6 +518,8 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_object.obj \ $(OBJS)\baselib_process.obj \ $(OBJS)\baselib_regex.obj \ + $(OBJS)\baselib_stdpbase.obj \ + $(OBJS)\baselib_sstream.obj \ $(OBJS)\baselib_stopwatch.obj \ $(OBJS)\baselib_strconv.obj \ $(OBJS)\baselib_stream.obj \ @@ -510,7 +529,8 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_textfile.obj \ $(OBJS)\baselib_tokenzr.obj \ $(OBJS)\baselib_txtstrm.obj \ - $(OBJS)\baselib_unzip.obj \ + $(OBJS)\baselib_archive.obj \ + $(OBJS)\baselib_uri.obj \ $(OBJS)\baselib_variant.obj \ $(OBJS)\baselib_wfstream.obj \ $(OBJS)\baselib_wxchar.obj \ @@ -526,6 +546,7 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_regconf.obj \ $(OBJS)\baselib_registry.obj \ $(OBJS)\baselib_snglinst.obj \ + $(OBJS)\baselib_stdpaths.obj \ $(OBJS)\baselib_thread.obj \ $(OBJS)\baselib_utils.obj \ $(OBJS)\baselib_utilsexc.obj \ @@ -536,12 +557,6 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_main.obj \ $(OBJS)\baselib_mslu.obj \ $(OBJS)\baselib_volume.obj -NETDLL_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -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 \ - $(CPPFLAGS) $(CFLAGS) NETDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \ @@ -562,11 +577,6 @@ NETDLL_OBJECTS = \ $(OBJS)\netdll_url.obj \ $(OBJS)\netdll_gsocket.obj \ $(OBJS)\netdll_urlmsw.obj -NETLIB_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 $(CPPFLAGS) $(CFLAGS) NETLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \ @@ -587,12 +597,6 @@ NETLIB_OBJECTS = \ $(OBJS)\netlib_url.obj \ $(OBJS)\netlib_gsocket.obj \ $(OBJS)\netlib_urlmsw.obj -COREDLL_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -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 \ - $(CPPFLAGS) $(CFLAGS) COREDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \ @@ -609,11 +613,6 @@ COREDLL_OBJECTS = \ $(OBJS)\coredll_mslu.obj \ $(OBJS)\coredll_volume.obj \ $(____CORE_SRC_FILENAMES_2_OBJECTS) -CORELIB_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS) CORELIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \ @@ -639,7 +638,6 @@ ADVDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ ADVDLL_OBJECTS = \ $(OBJS)\advdll_dummy.obj \ $(OBJS)\advdll_calctrl.obj \ - $(OBJS)\advdll_dcbuffer.obj \ $(OBJS)\advdll_grid.obj \ $(OBJS)\advdll_gridctrl.obj \ $(OBJS)\advdll_gridsel.obj \ @@ -650,9 +648,9 @@ ADVDLL_OBJECTS = \ $(OBJS)\advdll_tipdlg.obj \ $(OBJS)\advdll_wizard.obj \ $(OBJS)\advdll_taskbarcmn.obj \ - $(OBJS)\advdll_joystick.obj \ $(OBJS)\advdll_sound.obj \ - $(OBJS)\advdll_taskbar.obj + $(OBJS)\advdll_taskbar.obj \ + $(OBJS)\advdll_joystick.obj ADVLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \ @@ -662,7 +660,6 @@ ADVLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ ADVLIB_OBJECTS = \ $(OBJS)\advlib_dummy.obj \ $(OBJS)\advlib_calctrl.obj \ - $(OBJS)\advlib_dcbuffer.obj \ $(OBJS)\advlib_grid.obj \ $(OBJS)\advlib_gridctrl.obj \ $(OBJS)\advlib_gridsel.obj \ @@ -673,9 +670,29 @@ ADVLIB_OBJECTS = \ $(OBJS)\advlib_tipdlg.obj \ $(OBJS)\advlib_wizard.obj \ $(OBJS)\advlib_taskbarcmn.obj \ - $(OBJS)\advlib_joystick.obj \ $(OBJS)\advlib_sound.obj \ - $(OBJS)\advlib_taskbar.obj + $(OBJS)\advlib_taskbar.obj \ + $(OBJS)\advlib_joystick.obj +MEDIADLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -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.obj +MEDIALIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -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.obj ODBCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \ @@ -794,6 +811,100 @@ XMLLIB_OBJECTS = \ $(OBJS)\xmllib_dummy.obj \ $(OBJS)\xmllib_xml.obj \ $(OBJS)\xmllib_xtixml.obj +XRCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -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 \ + $(OBJS)\xrcdll_xh_bmpbt.obj \ + $(OBJS)\xrcdll_xh_bmp.obj \ + $(OBJS)\xrcdll_xh_bttn.obj \ + $(OBJS)\xrcdll_xh_cald.obj \ + $(OBJS)\xrcdll_xh_chckb.obj \ + $(OBJS)\xrcdll_xh_chckl.obj \ + $(OBJS)\xrcdll_xh_choic.obj \ + $(OBJS)\xrcdll_xh_combo.obj \ + $(OBJS)\xrcdll_xh_dlg.obj \ + $(OBJS)\xrcdll_xh_frame.obj \ + $(OBJS)\xrcdll_xh_gauge.obj \ + $(OBJS)\xrcdll_xh_gdctl.obj \ + $(OBJS)\xrcdll_xh_html.obj \ + $(OBJS)\xrcdll_xh_listb.obj \ + $(OBJS)\xrcdll_xh_listc.obj \ + $(OBJS)\xrcdll_xh_menu.obj \ + $(OBJS)\xrcdll_xh_notbk.obj \ + $(OBJS)\xrcdll_xh_panel.obj \ + $(OBJS)\xrcdll_xh_radbt.obj \ + $(OBJS)\xrcdll_xh_radbx.obj \ + $(OBJS)\xrcdll_xh_scrol.obj \ + $(OBJS)\xrcdll_xh_scwin.obj \ + $(OBJS)\xrcdll_xh_sizer.obj \ + $(OBJS)\xrcdll_xh_slidr.obj \ + $(OBJS)\xrcdll_xh_spin.obj \ + $(OBJS)\xrcdll_xh_split.obj \ + $(OBJS)\xrcdll_xh_statbar.obj \ + $(OBJS)\xrcdll_xh_stbmp.obj \ + $(OBJS)\xrcdll_xh_stbox.obj \ + $(OBJS)\xrcdll_xh_stlin.obj \ + $(OBJS)\xrcdll_xh_sttxt.obj \ + $(OBJS)\xrcdll_xh_text.obj \ + $(OBJS)\xrcdll_xh_tglbtn.obj \ + $(OBJS)\xrcdll_xh_toolb.obj \ + $(OBJS)\xrcdll_xh_tree.obj \ + $(OBJS)\xrcdll_xh_unkwn.obj \ + $(OBJS)\xrcdll_xh_wizrd.obj \ + $(OBJS)\xrcdll_xmlres.obj \ + $(OBJS)\xrcdll_xmlrsall.obj +XRCLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -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_bmpbt.obj \ + $(OBJS)\xrclib_xh_bmp.obj \ + $(OBJS)\xrclib_xh_bttn.obj \ + $(OBJS)\xrclib_xh_cald.obj \ + $(OBJS)\xrclib_xh_chckb.obj \ + $(OBJS)\xrclib_xh_chckl.obj \ + $(OBJS)\xrclib_xh_choic.obj \ + $(OBJS)\xrclib_xh_combo.obj \ + $(OBJS)\xrclib_xh_dlg.obj \ + $(OBJS)\xrclib_xh_frame.obj \ + $(OBJS)\xrclib_xh_gauge.obj \ + $(OBJS)\xrclib_xh_gdctl.obj \ + $(OBJS)\xrclib_xh_html.obj \ + $(OBJS)\xrclib_xh_listb.obj \ + $(OBJS)\xrclib_xh_listc.obj \ + $(OBJS)\xrclib_xh_menu.obj \ + $(OBJS)\xrclib_xh_notbk.obj \ + $(OBJS)\xrclib_xh_panel.obj \ + $(OBJS)\xrclib_xh_radbt.obj \ + $(OBJS)\xrclib_xh_radbx.obj \ + $(OBJS)\xrclib_xh_scrol.obj \ + $(OBJS)\xrclib_xh_scwin.obj \ + $(OBJS)\xrclib_xh_sizer.obj \ + $(OBJS)\xrclib_xh_slidr.obj \ + $(OBJS)\xrclib_xh_spin.obj \ + $(OBJS)\xrclib_xh_split.obj \ + $(OBJS)\xrclib_xh_statbar.obj \ + $(OBJS)\xrclib_xh_stbmp.obj \ + $(OBJS)\xrclib_xh_stbox.obj \ + $(OBJS)\xrclib_xh_stlin.obj \ + $(OBJS)\xrclib_xh_sttxt.obj \ + $(OBJS)\xrclib_xh_text.obj \ + $(OBJS)\xrclib_xh_tglbtn.obj \ + $(OBJS)\xrclib_xh_toolb.obj \ + $(OBJS)\xrclib_xh_tree.obj \ + $(OBJS)\xrclib_xh_unkwn.obj \ + $(OBJS)\xrclib_xh_wizrd.obj \ + $(OBJS)\xrclib_xmlres.obj \ + $(OBJS)\xrclib_xmlrsall.obj GLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \ @@ -858,15 +969,20 @@ ____LIBDIRNAME_FILENAMES_6_p = -I..\..\lib\bcc_lib$(CFG) !if "$(SHARED)" == "1" ____LIBDIRNAME_FILENAMES_6_p = -I..\..\lib\bcc_dll$(CFG) !endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" __monodll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).dll !endif !if "$(USE_GUI)" == "1" ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(____CORE_SRC_FILENAMES_OBJECTS) \ $(OBJS)\monodll_calctrl.obj \ - $(OBJS)\monodll_dcbuffer.obj \ $(OBJS)\monodll_grid.obj \ $(OBJS)\monodll_gridctrl.obj \ $(OBJS)\monodll_gridsel.obj \ @@ -877,9 +993,11 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_tipdlg.obj \ $(OBJS)\monodll_wizard.obj \ $(OBJS)\monodll_taskbarcmn.obj \ - $(OBJS)\monodll_joystick.obj \ $(OBJS)\monodll_sound.obj \ $(OBJS)\monodll_taskbar.obj \ + $(OBJS)\monodll_joystick.obj \ + $(OBJS)\monodll_mediactrlcmn.obj \ + $(OBJS)\monodll_mediactrl.obj \ $(OBJS)\monodll_helpbest.obj \ $(OBJS)\monodll_helpctrl.obj \ $(OBJS)\monodll_helpdata.obj \ @@ -904,7 +1022,46 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_htmllbox.obj \ $(OBJS)\monodll_db.obj \ $(OBJS)\monodll_dbtable.obj \ - $(OBJS)\monodll_dbgrid.obj + $(OBJS)\monodll_dbgrid.obj \ + $(OBJS)\monodll_xh_bmpbt.obj \ + $(OBJS)\monodll_xh_bmp.obj \ + $(OBJS)\monodll_xh_bttn.obj \ + $(OBJS)\monodll_xh_cald.obj \ + $(OBJS)\monodll_xh_chckb.obj \ + $(OBJS)\monodll_xh_chckl.obj \ + $(OBJS)\monodll_xh_choic.obj \ + $(OBJS)\monodll_xh_combo.obj \ + $(OBJS)\monodll_xh_dlg.obj \ + $(OBJS)\monodll_xh_frame.obj \ + $(OBJS)\monodll_xh_gauge.obj \ + $(OBJS)\monodll_xh_gdctl.obj \ + $(OBJS)\monodll_xh_html.obj \ + $(OBJS)\monodll_xh_listb.obj \ + $(OBJS)\monodll_xh_listc.obj \ + $(OBJS)\monodll_xh_menu.obj \ + $(OBJS)\monodll_xh_notbk.obj \ + $(OBJS)\monodll_xh_panel.obj \ + $(OBJS)\monodll_xh_radbt.obj \ + $(OBJS)\monodll_xh_radbx.obj \ + $(OBJS)\monodll_xh_scrol.obj \ + $(OBJS)\monodll_xh_scwin.obj \ + $(OBJS)\monodll_xh_sizer.obj \ + $(OBJS)\monodll_xh_slidr.obj \ + $(OBJS)\monodll_xh_spin.obj \ + $(OBJS)\monodll_xh_split.obj \ + $(OBJS)\monodll_xh_statbar.obj \ + $(OBJS)\monodll_xh_stbmp.obj \ + $(OBJS)\monodll_xh_stbox.obj \ + $(OBJS)\monodll_xh_stlin.obj \ + $(OBJS)\monodll_xh_sttxt.obj \ + $(OBJS)\monodll_xh_text.obj \ + $(OBJS)\monodll_xh_tglbtn.obj \ + $(OBJS)\monodll_xh_toolb.obj \ + $(OBJS)\monodll_xh_tree.obj \ + $(OBJS)\monodll_xh_unkwn.obj \ + $(OBJS)\monodll_xh_wizrd.obj \ + $(OBJS)\monodll_xmlres.obj \ + $(OBJS)\monodll_xmlrsall.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_OBJECTS = \ @@ -923,7 +1080,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dcscreen.obj \ $(OBJS)\monodll_dialup.obj \ $(OBJS)\monodll_dib.obj \ - $(OBJS)\monodll_dirdlg.obj \ $(OBJS)\monodll_display.obj \ $(OBJS)\monodll_enhmeta.obj \ $(OBJS)\monodll_evtloop.obj \ @@ -933,16 +1089,12 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gdiimage.obj \ $(OBJS)\monodll_gdiobj.obj \ $(OBJS)\monodll_gsockmsw.obj \ - $(OBJS)\monodll_helpchm.obj \ - $(OBJS)\monodll_helpwin.obj \ $(OBJS)\monodll_icon.obj \ $(OBJS)\monodll_minifram.obj \ - $(OBJS)\monodll_automtn.obj \ $(OBJS)\monodll_dataobj.obj \ $(OBJS)\monodll_dropsrc.obj \ $(OBJS)\monodll_droptgt.obj \ $(OBJS)\monodll_oleutils.obj \ - $(OBJS)\monodll_uuid.obj \ $(OBJS)\monodll_palette.obj \ $(OBJS)\monodll_pen.obj \ $(OBJS)\monodll_popupwin.obj \ @@ -957,6 +1109,10 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_utilsgui.obj \ $(OBJS)\monodll_uxtheme.obj \ $(OBJS)\monodll_window.obj \ + $(OBJS)\monodll_helpchm.obj \ + $(OBJS)\monodll_helpwin.obj \ + $(OBJS)\monodll_automtn.obj \ + $(OBJS)\monodll_uuid.obj \ $(OBJS)\monodll_statusbr.obj \ $(OBJS)\monodll_prntdlgg.obj \ $(OBJS)\monodll_accel.obj \ @@ -969,10 +1125,9 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_combobox.obj \ $(OBJS)\monodll_control.obj \ $(OBJS)\monodll_dialog.obj \ + $(OBJS)\monodll_dirdlg.obj \ $(OBJS)\monodll_dragimag.obj \ - $(OBJS)\monodll_fdrepdlg.obj \ $(OBJS)\monodll_filedlg.obj \ - $(OBJS)\monodll_fontdlg.obj \ $(OBJS)\monodll_frame.obj \ $(OBJS)\monodll_gauge95.obj \ $(OBJS)\monodll_imaglist.obj \ @@ -1004,6 +1159,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_textctrl.obj \ $(OBJS)\monodll_tglbtn.obj \ $(OBJS)\monodll_treectrl.obj \ + $(OBJS)\monodll_fdrepdlg.obj \ + $(OBJS)\monodll_fontdlg.obj \ $(OBJS)\monodll_accesscmn.obj \ $(OBJS)\monodll_appcmn.obj \ $(OBJS)\monodll_artprov.obj \ @@ -1012,7 +1169,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_bookctrl.obj \ $(OBJS)\monodll_choiccmn.obj \ $(OBJS)\monodll_clipcmn.obj \ - $(OBJS)\monodll_clntdata.obj \ $(OBJS)\monodll_cmdproc.obj \ $(OBJS)\monodll_cmndata.obj \ $(OBJS)\monodll_containr.obj \ @@ -1068,6 +1224,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_settcmn.obj \ $(OBJS)\monodll_sizer.obj \ $(OBJS)\monodll_statbar.obj \ + $(OBJS)\monodll_stockitem.obj \ $(OBJS)\monodll_tbarbase.obj \ $(OBJS)\monodll_textcmn.obj \ $(OBJS)\monodll_timercmn.obj \ @@ -1080,6 +1237,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xpmdecod.obj \ $(OBJS)\monodll_busyinfo.obj \ $(OBJS)\monodll_choicdgg.obj \ + $(OBJS)\monodll_choicbkg.obj \ $(OBJS)\monodll_dcpsg.obj \ $(OBJS)\monodll_dirctrlg.obj \ $(OBJS)\monodll_dragimgg.obj \ @@ -1117,7 +1275,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dcscreen.obj \ $(OBJS)\monodll_dialup.obj \ $(OBJS)\monodll_dib.obj \ - $(OBJS)\monodll_dirdlg.obj \ $(OBJS)\monodll_display.obj \ $(OBJS)\monodll_enhmeta.obj \ $(OBJS)\monodll_evtloop.obj \ @@ -1127,16 +1284,12 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gdiimage.obj \ $(OBJS)\monodll_gdiobj.obj \ $(OBJS)\monodll_gsockmsw.obj \ - $(OBJS)\monodll_helpchm.obj \ - $(OBJS)\monodll_helpwin.obj \ $(OBJS)\monodll_icon.obj \ $(OBJS)\monodll_minifram.obj \ - $(OBJS)\monodll_automtn.obj \ $(OBJS)\monodll_dataobj.obj \ $(OBJS)\monodll_dropsrc.obj \ $(OBJS)\monodll_droptgt.obj \ $(OBJS)\monodll_oleutils.obj \ - $(OBJS)\monodll_uuid.obj \ $(OBJS)\monodll_palette.obj \ $(OBJS)\monodll_pen.obj \ $(OBJS)\monodll_popupwin.obj \ @@ -1151,6 +1304,10 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_utilsgui.obj \ $(OBJS)\monodll_uxtheme.obj \ $(OBJS)\monodll_window.obj \ + $(OBJS)\monodll_helpchm.obj \ + $(OBJS)\monodll_helpwin.obj \ + $(OBJS)\monodll_automtn.obj \ + $(OBJS)\monodll_uuid.obj \ $(OBJS)\monodll_accel.obj \ $(OBJS)\monodll_colrdlgg.obj \ $(OBJS)\monodll_dirdlgg.obj \ @@ -1208,7 +1365,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_bookctrl.obj \ $(OBJS)\monodll_choiccmn.obj \ $(OBJS)\monodll_clipcmn.obj \ - $(OBJS)\monodll_clntdata.obj \ $(OBJS)\monodll_cmdproc.obj \ $(OBJS)\monodll_cmndata.obj \ $(OBJS)\monodll_containr.obj \ @@ -1264,6 +1420,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_settcmn.obj \ $(OBJS)\monodll_sizer.obj \ $(OBJS)\monodll_statbar.obj \ + $(OBJS)\monodll_stockitem.obj \ $(OBJS)\monodll_tbarbase.obj \ $(OBJS)\monodll_textcmn.obj \ $(OBJS)\monodll_timercmn.obj \ @@ -1276,6 +1433,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xpmdecod.obj \ $(OBJS)\monodll_busyinfo.obj \ $(OBJS)\monodll_choicdgg.obj \ + $(OBJS)\monodll_choicbkg.obj \ $(OBJS)\monodll_dcpsg.obj \ $(OBJS)\monodll_dirctrlg.obj \ $(OBJS)\monodll_dragimgg.obj \ @@ -1298,13 +1456,12 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ !endif !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0" __monolib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif !if "$(USE_GUI)" == "1" ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(____CORE_SRC_FILENAMES_1_OBJECTS) \ $(OBJS)\monolib_calctrl.obj \ - $(OBJS)\monolib_dcbuffer.obj \ $(OBJS)\monolib_grid.obj \ $(OBJS)\monolib_gridctrl.obj \ $(OBJS)\monolib_gridsel.obj \ @@ -1315,9 +1472,11 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_tipdlg.obj \ $(OBJS)\monolib_wizard.obj \ $(OBJS)\monolib_taskbarcmn.obj \ - $(OBJS)\monolib_joystick.obj \ $(OBJS)\monolib_sound.obj \ $(OBJS)\monolib_taskbar.obj \ + $(OBJS)\monolib_joystick.obj \ + $(OBJS)\monolib_mediactrlcmn.obj \ + $(OBJS)\monolib_mediactrl.obj \ $(OBJS)\monolib_helpbest.obj \ $(OBJS)\monolib_helpctrl.obj \ $(OBJS)\monolib_helpdata.obj \ @@ -1342,7 +1501,46 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_htmllbox.obj \ $(OBJS)\monolib_db.obj \ $(OBJS)\monolib_dbtable.obj \ - $(OBJS)\monolib_dbgrid.obj + $(OBJS)\monolib_dbgrid.obj \ + $(OBJS)\monolib_xh_bmpbt.obj \ + $(OBJS)\monolib_xh_bmp.obj \ + $(OBJS)\monolib_xh_bttn.obj \ + $(OBJS)\monolib_xh_cald.obj \ + $(OBJS)\monolib_xh_chckb.obj \ + $(OBJS)\monolib_xh_chckl.obj \ + $(OBJS)\monolib_xh_choic.obj \ + $(OBJS)\monolib_xh_combo.obj \ + $(OBJS)\monolib_xh_dlg.obj \ + $(OBJS)\monolib_xh_frame.obj \ + $(OBJS)\monolib_xh_gauge.obj \ + $(OBJS)\monolib_xh_gdctl.obj \ + $(OBJS)\monolib_xh_html.obj \ + $(OBJS)\monolib_xh_listb.obj \ + $(OBJS)\monolib_xh_listc.obj \ + $(OBJS)\monolib_xh_menu.obj \ + $(OBJS)\monolib_xh_notbk.obj \ + $(OBJS)\monolib_xh_panel.obj \ + $(OBJS)\monolib_xh_radbt.obj \ + $(OBJS)\monolib_xh_radbx.obj \ + $(OBJS)\monolib_xh_scrol.obj \ + $(OBJS)\monolib_xh_scwin.obj \ + $(OBJS)\monolib_xh_sizer.obj \ + $(OBJS)\monolib_xh_slidr.obj \ + $(OBJS)\monolib_xh_spin.obj \ + $(OBJS)\monolib_xh_split.obj \ + $(OBJS)\monolib_xh_statbar.obj \ + $(OBJS)\monolib_xh_stbmp.obj \ + $(OBJS)\monolib_xh_stbox.obj \ + $(OBJS)\monolib_xh_stlin.obj \ + $(OBJS)\monolib_xh_sttxt.obj \ + $(OBJS)\monolib_xh_text.obj \ + $(OBJS)\monolib_xh_tglbtn.obj \ + $(OBJS)\monolib_xh_toolb.obj \ + $(OBJS)\monolib_xh_tree.obj \ + $(OBJS)\monolib_xh_unkwn.obj \ + $(OBJS)\monolib_xh_wizrd.obj \ + $(OBJS)\monolib_xmlres.obj \ + $(OBJS)\monolib_xmlrsall.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_1_OBJECTS = \ @@ -1361,7 +1559,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dcscreen.obj \ $(OBJS)\monolib_dialup.obj \ $(OBJS)\monolib_dib.obj \ - $(OBJS)\monolib_dirdlg.obj \ $(OBJS)\monolib_display.obj \ $(OBJS)\monolib_enhmeta.obj \ $(OBJS)\monolib_evtloop.obj \ @@ -1371,16 +1568,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gdiimage.obj \ $(OBJS)\monolib_gdiobj.obj \ $(OBJS)\monolib_gsockmsw.obj \ - $(OBJS)\monolib_helpchm.obj \ - $(OBJS)\monolib_helpwin.obj \ $(OBJS)\monolib_icon.obj \ $(OBJS)\monolib_minifram.obj \ - $(OBJS)\monolib_automtn.obj \ $(OBJS)\monolib_dataobj.obj \ $(OBJS)\monolib_dropsrc.obj \ $(OBJS)\monolib_droptgt.obj \ $(OBJS)\monolib_oleutils.obj \ - $(OBJS)\monolib_uuid.obj \ $(OBJS)\monolib_palette.obj \ $(OBJS)\monolib_pen.obj \ $(OBJS)\monolib_popupwin.obj \ @@ -1395,6 +1588,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_utilsgui.obj \ $(OBJS)\monolib_uxtheme.obj \ $(OBJS)\monolib_window.obj \ + $(OBJS)\monolib_helpchm.obj \ + $(OBJS)\monolib_helpwin.obj \ + $(OBJS)\monolib_automtn.obj \ + $(OBJS)\monolib_uuid.obj \ $(OBJS)\monolib_statusbr.obj \ $(OBJS)\monolib_prntdlgg.obj \ $(OBJS)\monolib_accel.obj \ @@ -1407,10 +1604,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_combobox.obj \ $(OBJS)\monolib_control.obj \ $(OBJS)\monolib_dialog.obj \ + $(OBJS)\monolib_dirdlg.obj \ $(OBJS)\monolib_dragimag.obj \ - $(OBJS)\monolib_fdrepdlg.obj \ $(OBJS)\monolib_filedlg.obj \ - $(OBJS)\monolib_fontdlg.obj \ $(OBJS)\monolib_frame.obj \ $(OBJS)\monolib_gauge95.obj \ $(OBJS)\monolib_imaglist.obj \ @@ -1442,6 +1638,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_textctrl.obj \ $(OBJS)\monolib_tglbtn.obj \ $(OBJS)\monolib_treectrl.obj \ + $(OBJS)\monolib_fdrepdlg.obj \ + $(OBJS)\monolib_fontdlg.obj \ $(OBJS)\monolib_accesscmn.obj \ $(OBJS)\monolib_appcmn.obj \ $(OBJS)\monolib_artprov.obj \ @@ -1450,7 +1648,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_bookctrl.obj \ $(OBJS)\monolib_choiccmn.obj \ $(OBJS)\monolib_clipcmn.obj \ - $(OBJS)\monolib_clntdata.obj \ $(OBJS)\monolib_cmdproc.obj \ $(OBJS)\monolib_cmndata.obj \ $(OBJS)\monolib_containr.obj \ @@ -1506,6 +1703,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_settcmn.obj \ $(OBJS)\monolib_sizer.obj \ $(OBJS)\monolib_statbar.obj \ + $(OBJS)\monolib_stockitem.obj \ $(OBJS)\monolib_tbarbase.obj \ $(OBJS)\monolib_textcmn.obj \ $(OBJS)\monolib_timercmn.obj \ @@ -1518,6 +1716,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xpmdecod.obj \ $(OBJS)\monolib_busyinfo.obj \ $(OBJS)\monolib_choicdgg.obj \ + $(OBJS)\monolib_choicbkg.obj \ $(OBJS)\monolib_dcpsg.obj \ $(OBJS)\monolib_dirctrlg.obj \ $(OBJS)\monolib_dragimgg.obj \ @@ -1555,7 +1754,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dcscreen.obj \ $(OBJS)\monolib_dialup.obj \ $(OBJS)\monolib_dib.obj \ - $(OBJS)\monolib_dirdlg.obj \ $(OBJS)\monolib_display.obj \ $(OBJS)\monolib_enhmeta.obj \ $(OBJS)\monolib_evtloop.obj \ @@ -1565,16 +1763,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gdiimage.obj \ $(OBJS)\monolib_gdiobj.obj \ $(OBJS)\monolib_gsockmsw.obj \ - $(OBJS)\monolib_helpchm.obj \ - $(OBJS)\monolib_helpwin.obj \ $(OBJS)\monolib_icon.obj \ $(OBJS)\monolib_minifram.obj \ - $(OBJS)\monolib_automtn.obj \ $(OBJS)\monolib_dataobj.obj \ $(OBJS)\monolib_dropsrc.obj \ $(OBJS)\monolib_droptgt.obj \ $(OBJS)\monolib_oleutils.obj \ - $(OBJS)\monolib_uuid.obj \ $(OBJS)\monolib_palette.obj \ $(OBJS)\monolib_pen.obj \ $(OBJS)\monolib_popupwin.obj \ @@ -1589,6 +1783,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_utilsgui.obj \ $(OBJS)\monolib_uxtheme.obj \ $(OBJS)\monolib_window.obj \ + $(OBJS)\monolib_helpchm.obj \ + $(OBJS)\monolib_helpwin.obj \ + $(OBJS)\monolib_automtn.obj \ + $(OBJS)\monolib_uuid.obj \ $(OBJS)\monolib_accel.obj \ $(OBJS)\monolib_colrdlgg.obj \ $(OBJS)\monolib_dirdlgg.obj \ @@ -1646,7 +1844,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_bookctrl.obj \ $(OBJS)\monolib_choiccmn.obj \ $(OBJS)\monolib_clipcmn.obj \ - $(OBJS)\monolib_clntdata.obj \ $(OBJS)\monolib_cmdproc.obj \ $(OBJS)\monolib_cmndata.obj \ $(OBJS)\monolib_containr.obj \ @@ -1702,6 +1899,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_settcmn.obj \ $(OBJS)\monolib_sizer.obj \ $(OBJS)\monolib_statbar.obj \ + $(OBJS)\monolib_stockitem.obj \ $(OBJS)\monolib_tbarbase.obj \ $(OBJS)\monolib_textcmn.obj \ $(OBJS)\monolib_timercmn.obj \ @@ -1714,6 +1912,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xpmdecod.obj \ $(OBJS)\monolib_busyinfo.obj \ $(OBJS)\monolib_choicdgg.obj \ + $(OBJS)\monolib_choicbkg.obj \ $(OBJS)\monolib_dcpsg.obj \ $(OBJS)\monolib_dirctrlg.obj \ $(OBJS)\monolib_dragimgg.obj \ @@ -1736,23 +1935,23 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" __basedll___depname = \ - $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).dll !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" __baselib___depname = \ - $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib + $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" __netdll___depname = \ - $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG).dll !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" __netlib___depname = \ - $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib + $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" __coredll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG).dll !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_2_OBJECTS = \ @@ -1771,7 +1970,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dcscreen.obj \ $(OBJS)\coredll_dialup.obj \ $(OBJS)\coredll_dib.obj \ - $(OBJS)\coredll_dirdlg.obj \ $(OBJS)\coredll_display.obj \ $(OBJS)\coredll_enhmeta.obj \ $(OBJS)\coredll_evtloop.obj \ @@ -1781,16 +1979,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_gdiimage.obj \ $(OBJS)\coredll_gdiobj.obj \ $(OBJS)\coredll_gsockmsw.obj \ - $(OBJS)\coredll_helpchm.obj \ - $(OBJS)\coredll_helpwin.obj \ $(OBJS)\coredll_icon.obj \ $(OBJS)\coredll_minifram.obj \ - $(OBJS)\coredll_automtn.obj \ $(OBJS)\coredll_dataobj.obj \ $(OBJS)\coredll_dropsrc.obj \ $(OBJS)\coredll_droptgt.obj \ $(OBJS)\coredll_oleutils.obj \ - $(OBJS)\coredll_uuid.obj \ $(OBJS)\coredll_palette.obj \ $(OBJS)\coredll_pen.obj \ $(OBJS)\coredll_popupwin.obj \ @@ -1805,6 +1999,10 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_utilsgui.obj \ $(OBJS)\coredll_uxtheme.obj \ $(OBJS)\coredll_window.obj \ + $(OBJS)\coredll_helpchm.obj \ + $(OBJS)\coredll_helpwin.obj \ + $(OBJS)\coredll_automtn.obj \ + $(OBJS)\coredll_uuid.obj \ $(OBJS)\coredll_statusbr.obj \ $(OBJS)\coredll_prntdlgg.obj \ $(OBJS)\coredll_accel.obj \ @@ -1817,10 +2015,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_combobox.obj \ $(OBJS)\coredll_control.obj \ $(OBJS)\coredll_dialog.obj \ + $(OBJS)\coredll_dirdlg.obj \ $(OBJS)\coredll_dragimag.obj \ - $(OBJS)\coredll_fdrepdlg.obj \ $(OBJS)\coredll_filedlg.obj \ - $(OBJS)\coredll_fontdlg.obj \ $(OBJS)\coredll_frame.obj \ $(OBJS)\coredll_gauge95.obj \ $(OBJS)\coredll_imaglist.obj \ @@ -1852,6 +2049,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_textctrl.obj \ $(OBJS)\coredll_tglbtn.obj \ $(OBJS)\coredll_treectrl.obj \ + $(OBJS)\coredll_fdrepdlg.obj \ + $(OBJS)\coredll_fontdlg.obj \ $(OBJS)\coredll_accesscmn.obj \ $(OBJS)\coredll_appcmn.obj \ $(OBJS)\coredll_artprov.obj \ @@ -1860,7 +2059,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_bookctrl.obj \ $(OBJS)\coredll_choiccmn.obj \ $(OBJS)\coredll_clipcmn.obj \ - $(OBJS)\coredll_clntdata.obj \ $(OBJS)\coredll_cmdproc.obj \ $(OBJS)\coredll_cmndata.obj \ $(OBJS)\coredll_containr.obj \ @@ -1916,6 +2114,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_settcmn.obj \ $(OBJS)\coredll_sizer.obj \ $(OBJS)\coredll_statbar.obj \ + $(OBJS)\coredll_stockitem.obj \ $(OBJS)\coredll_tbarbase.obj \ $(OBJS)\coredll_textcmn.obj \ $(OBJS)\coredll_timercmn.obj \ @@ -1928,6 +2127,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_xpmdecod.obj \ $(OBJS)\coredll_busyinfo.obj \ $(OBJS)\coredll_choicdgg.obj \ + $(OBJS)\coredll_choicbkg.obj \ $(OBJS)\coredll_dcpsg.obj \ $(OBJS)\coredll_dirctrlg.obj \ $(OBJS)\coredll_dragimgg.obj \ @@ -1965,7 +2165,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dcscreen.obj \ $(OBJS)\coredll_dialup.obj \ $(OBJS)\coredll_dib.obj \ - $(OBJS)\coredll_dirdlg.obj \ $(OBJS)\coredll_display.obj \ $(OBJS)\coredll_enhmeta.obj \ $(OBJS)\coredll_evtloop.obj \ @@ -1975,16 +2174,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_gdiimage.obj \ $(OBJS)\coredll_gdiobj.obj \ $(OBJS)\coredll_gsockmsw.obj \ - $(OBJS)\coredll_helpchm.obj \ - $(OBJS)\coredll_helpwin.obj \ $(OBJS)\coredll_icon.obj \ $(OBJS)\coredll_minifram.obj \ - $(OBJS)\coredll_automtn.obj \ $(OBJS)\coredll_dataobj.obj \ $(OBJS)\coredll_dropsrc.obj \ $(OBJS)\coredll_droptgt.obj \ $(OBJS)\coredll_oleutils.obj \ - $(OBJS)\coredll_uuid.obj \ $(OBJS)\coredll_palette.obj \ $(OBJS)\coredll_pen.obj \ $(OBJS)\coredll_popupwin.obj \ @@ -1999,6 +2194,10 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_utilsgui.obj \ $(OBJS)\coredll_uxtheme.obj \ $(OBJS)\coredll_window.obj \ + $(OBJS)\coredll_helpchm.obj \ + $(OBJS)\coredll_helpwin.obj \ + $(OBJS)\coredll_automtn.obj \ + $(OBJS)\coredll_uuid.obj \ $(OBJS)\coredll_accel.obj \ $(OBJS)\coredll_colrdlgg.obj \ $(OBJS)\coredll_dirdlgg.obj \ @@ -2056,7 +2255,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_bookctrl.obj \ $(OBJS)\coredll_choiccmn.obj \ $(OBJS)\coredll_clipcmn.obj \ - $(OBJS)\coredll_clntdata.obj \ $(OBJS)\coredll_cmdproc.obj \ $(OBJS)\coredll_cmndata.obj \ $(OBJS)\coredll_containr.obj \ @@ -2112,6 +2310,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_settcmn.obj \ $(OBJS)\coredll_sizer.obj \ $(OBJS)\coredll_statbar.obj \ + $(OBJS)\coredll_stockitem.obj \ $(OBJS)\coredll_tbarbase.obj \ $(OBJS)\coredll_textcmn.obj \ $(OBJS)\coredll_timercmn.obj \ @@ -2124,6 +2323,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_xpmdecod.obj \ $(OBJS)\coredll_busyinfo.obj \ $(OBJS)\coredll_choicdgg.obj \ + $(OBJS)\coredll_choicbkg.obj \ $(OBJS)\coredll_dcpsg.obj \ $(OBJS)\coredll_dirctrlg.obj \ $(OBJS)\coredll_dragimgg.obj \ @@ -2146,7 +2346,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" __corelib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_3_OBJECTS = \ @@ -2165,7 +2365,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dcscreen.obj \ $(OBJS)\corelib_dialup.obj \ $(OBJS)\corelib_dib.obj \ - $(OBJS)\corelib_dirdlg.obj \ $(OBJS)\corelib_display.obj \ $(OBJS)\corelib_enhmeta.obj \ $(OBJS)\corelib_evtloop.obj \ @@ -2175,16 +2374,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_gdiimage.obj \ $(OBJS)\corelib_gdiobj.obj \ $(OBJS)\corelib_gsockmsw.obj \ - $(OBJS)\corelib_helpchm.obj \ - $(OBJS)\corelib_helpwin.obj \ $(OBJS)\corelib_icon.obj \ $(OBJS)\corelib_minifram.obj \ - $(OBJS)\corelib_automtn.obj \ $(OBJS)\corelib_dataobj.obj \ $(OBJS)\corelib_dropsrc.obj \ $(OBJS)\corelib_droptgt.obj \ $(OBJS)\corelib_oleutils.obj \ - $(OBJS)\corelib_uuid.obj \ $(OBJS)\corelib_palette.obj \ $(OBJS)\corelib_pen.obj \ $(OBJS)\corelib_popupwin.obj \ @@ -2199,6 +2394,10 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_utilsgui.obj \ $(OBJS)\corelib_uxtheme.obj \ $(OBJS)\corelib_window.obj \ + $(OBJS)\corelib_helpchm.obj \ + $(OBJS)\corelib_helpwin.obj \ + $(OBJS)\corelib_automtn.obj \ + $(OBJS)\corelib_uuid.obj \ $(OBJS)\corelib_statusbr.obj \ $(OBJS)\corelib_prntdlgg.obj \ $(OBJS)\corelib_accel.obj \ @@ -2211,10 +2410,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_combobox.obj \ $(OBJS)\corelib_control.obj \ $(OBJS)\corelib_dialog.obj \ + $(OBJS)\corelib_dirdlg.obj \ $(OBJS)\corelib_dragimag.obj \ - $(OBJS)\corelib_fdrepdlg.obj \ $(OBJS)\corelib_filedlg.obj \ - $(OBJS)\corelib_fontdlg.obj \ $(OBJS)\corelib_frame.obj \ $(OBJS)\corelib_gauge95.obj \ $(OBJS)\corelib_imaglist.obj \ @@ -2246,6 +2444,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_textctrl.obj \ $(OBJS)\corelib_tglbtn.obj \ $(OBJS)\corelib_treectrl.obj \ + $(OBJS)\corelib_fdrepdlg.obj \ + $(OBJS)\corelib_fontdlg.obj \ $(OBJS)\corelib_accesscmn.obj \ $(OBJS)\corelib_appcmn.obj \ $(OBJS)\corelib_artprov.obj \ @@ -2254,7 +2454,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_bookctrl.obj \ $(OBJS)\corelib_choiccmn.obj \ $(OBJS)\corelib_clipcmn.obj \ - $(OBJS)\corelib_clntdata.obj \ $(OBJS)\corelib_cmdproc.obj \ $(OBJS)\corelib_cmndata.obj \ $(OBJS)\corelib_containr.obj \ @@ -2310,6 +2509,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_settcmn.obj \ $(OBJS)\corelib_sizer.obj \ $(OBJS)\corelib_statbar.obj \ + $(OBJS)\corelib_stockitem.obj \ $(OBJS)\corelib_tbarbase.obj \ $(OBJS)\corelib_textcmn.obj \ $(OBJS)\corelib_timercmn.obj \ @@ -2322,6 +2522,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_xpmdecod.obj \ $(OBJS)\corelib_busyinfo.obj \ $(OBJS)\corelib_choicdgg.obj \ + $(OBJS)\corelib_choicbkg.obj \ $(OBJS)\corelib_dcpsg.obj \ $(OBJS)\corelib_dirctrlg.obj \ $(OBJS)\corelib_dragimgg.obj \ @@ -2359,7 +2560,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dcscreen.obj \ $(OBJS)\corelib_dialup.obj \ $(OBJS)\corelib_dib.obj \ - $(OBJS)\corelib_dirdlg.obj \ $(OBJS)\corelib_display.obj \ $(OBJS)\corelib_enhmeta.obj \ $(OBJS)\corelib_evtloop.obj \ @@ -2369,16 +2569,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_gdiimage.obj \ $(OBJS)\corelib_gdiobj.obj \ $(OBJS)\corelib_gsockmsw.obj \ - $(OBJS)\corelib_helpchm.obj \ - $(OBJS)\corelib_helpwin.obj \ $(OBJS)\corelib_icon.obj \ $(OBJS)\corelib_minifram.obj \ - $(OBJS)\corelib_automtn.obj \ $(OBJS)\corelib_dataobj.obj \ $(OBJS)\corelib_dropsrc.obj \ $(OBJS)\corelib_droptgt.obj \ $(OBJS)\corelib_oleutils.obj \ - $(OBJS)\corelib_uuid.obj \ $(OBJS)\corelib_palette.obj \ $(OBJS)\corelib_pen.obj \ $(OBJS)\corelib_popupwin.obj \ @@ -2393,6 +2589,10 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_utilsgui.obj \ $(OBJS)\corelib_uxtheme.obj \ $(OBJS)\corelib_window.obj \ + $(OBJS)\corelib_helpchm.obj \ + $(OBJS)\corelib_helpwin.obj \ + $(OBJS)\corelib_automtn.obj \ + $(OBJS)\corelib_uuid.obj \ $(OBJS)\corelib_accel.obj \ $(OBJS)\corelib_colrdlgg.obj \ $(OBJS)\corelib_dirdlgg.obj \ @@ -2450,7 +2650,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_bookctrl.obj \ $(OBJS)\corelib_choiccmn.obj \ $(OBJS)\corelib_clipcmn.obj \ - $(OBJS)\corelib_clntdata.obj \ $(OBJS)\corelib_cmdproc.obj \ $(OBJS)\corelib_cmndata.obj \ $(OBJS)\corelib_containr.obj \ @@ -2506,6 +2705,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_settcmn.obj \ $(OBJS)\corelib_sizer.obj \ $(OBJS)\corelib_statbar.obj \ + $(OBJS)\corelib_stockitem.obj \ $(OBJS)\corelib_tbarbase.obj \ $(OBJS)\corelib_textcmn.obj \ $(OBJS)\corelib_timercmn.obj \ @@ -2518,6 +2718,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_xpmdecod.obj \ $(OBJS)\corelib_busyinfo.obj \ $(OBJS)\corelib_choicdgg.obj \ + $(OBJS)\corelib_choicbkg.obj \ $(OBJS)\corelib_dcpsg.obj \ $(OBJS)\corelib_dirctrlg.obj \ $(OBJS)\corelib_dragimgg.obj \ @@ -2540,68 +2741,85 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" __advdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG).dll !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" __advlib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" +__mediadll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).dll +!endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" +__medialib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1" __odbcdll___depname = \ - $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).dll !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1" __odbclib___depname = \ - $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib + $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" __dbgriddll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).dll !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" __dbgridlib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1" __htmldll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).dll !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_HTML)" == "1" __htmllib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" __xmldll___depname = \ - $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG).dll !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" __xmllib___depname = \ - $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib + $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +!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 +!endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_XRC)" == "1" +__xrclib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib !endif !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" __gldll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).dll !endif !if "$(MONOLITHIC)" == "0" __WXLIBGLDEP_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIBGLDEP_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIBGLDEP_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif !if "$(MONOLITHIC)" == "1" __WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif !if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" __gllib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib !endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_2 = i +__RUNTIME_LIBS_3 = i !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_2 = +__RUNTIME_LIBS_3 = !endif !if "$(USE_GUI)" == "1" __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib @@ -2671,101 +2889,121 @@ $(OBJS): ### Targets: ### -all: setup_h $(LIBDIRNAME)\wxregex$(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) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___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 $(__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) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib + -if exist $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib -if exist $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib -if exist $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib -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)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib - -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib - -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib - -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.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 + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).ild + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).ilf + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).ils + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).tds + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).ilc + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).ild + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).ilf + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).ils + -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib + -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG).tds + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG).ilc + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG).ild + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG).ilf + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG).ils + -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib + -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG).tds + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG).ilc + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG).ild + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG).ilf + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG).ils + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG).tds + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG).ilc + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG).ild + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG).ilf + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG).ils + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).tds + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).ilc + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).ild + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).ilf + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).ils + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).tds + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).ilc + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).ild + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).ilf + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).ils + -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib + -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).tds + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).ilc + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).ild + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).ilf + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).ils + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).tds + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).ilc + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).ild + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).ilf + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).ils + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG).tds + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG).ilc + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG).ild + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG).ilf + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG).ils + -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib + -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG).tds + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG).ilc + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG).ild + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG).ilf + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG).ils + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.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 + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).ild + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).ilf + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).ils + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib + @echo cd ..\..\samples >$(OBJS)\samples.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>$(OBJS)\samples.bat + call $(OBJS)\samples.bat + @del $(OBJS)\samples.bat setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h -$(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib: $(WXREGEX_OBJECTS) +$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(WXREGEX_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| $(WXREGEX_OBJECTS) @@ -2808,15 +3046,15 @@ $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib: $(WXEXPAT_OBJECTS) | !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(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) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib 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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32mt$(__RUNTIME_LIBS_2).lib,, + 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) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32mt$(__RUNTIME_LIBS_3).lib,, | - implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@ + implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) $@ !endif !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(OBJS)\monolib_dummy.obj $(MONOLIB_OBJECTS) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib: $(OBJS)\monolib_dummy.obj $(MONOLIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| $(MONOLIB_OBJECTS) @@ -2824,15 +3062,15 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $( !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(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) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(BASEDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32mt$(__RUNTIME_LIBS_2).lib,, + c0d32.obj $(BASEDLL_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) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32mt$(__RUNTIME_LIBS_3).lib,, | - implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@ + implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) $@ !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" -$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(OBJS)\baselib_dummy.obj $(BASELIB_OBJECTS) +$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib: $(OBJS)\baselib_dummy.obj $(BASELIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| $(BASELIB_OBJECTS) @@ -2840,15 +3078,15 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(OBJS)\baselib_dummy. !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(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) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(NETDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_2).lib,, + c0d32.obj $(NETDLL_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) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32mt$(__RUNTIME_LIBS_3).lib,, | - implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net $@ + implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net $@ !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" -$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(OBJS)\netlib_dummy.obj $(NETLIB_OBJECTS) +$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib: $(OBJS)\netlib_dummy.obj $(NETLIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| $(NETLIB_OBJECTS) @@ -2856,15 +3094,15 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(OBJS)\netlib_dum !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(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) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_2).lib,, + 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) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32mt$(__RUNTIME_LIBS_3).lib,, | - implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core $@ + implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core $@ !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib: $(OBJS)\corelib_dummy.obj $(CORELIB_OBJECTS) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib: $(OBJS)\corelib_dummy.obj $(CORELIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| $(CORELIB_OBJECTS) @@ -2872,31 +3110,47 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.li !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(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) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_2).lib,, + 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) 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 cw32mt$(__RUNTIME_LIBS_3).lib,, | - implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv $@ + implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv $@ !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib: $(OBJS)\advlib_dummy.obj $(ADVLIB_OBJECTS) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib: $(OBJS)\advlib_dummy.obj $(ADVLIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| $(ADVLIB_OBJECTS) | !endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__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) 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 cw32mt$(__RUNTIME_LIBS_3).lib,, +| + implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media $@ +!endif + +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib: $(OBJS)\medialib_dummy.obj $(MEDIALIB_OBJECTS) + if exist $@ del $@ + tlib /a /p4096 $@ @&&| + $(MEDIALIB_OBJECTS) +| +!endif + !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1" -$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll: $(OBJS)\odbcdll_dummy.obj $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(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) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(ODBCDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_2).lib,, + c0d32.obj $(ODBCDLL_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) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32mt$(__RUNTIME_LIBS_3).lib,, | - implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc $@ + implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc $@ !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1" -$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(OBJS)\odbclib_dummy.obj $(ODBCLIB_OBJECTS) +$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib: $(OBJS)\odbclib_dummy.obj $(ODBCLIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| $(ODBCLIB_OBJECTS) @@ -2904,15 +3158,15 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(OBJS)\odbclib_d !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).dll: $(OBJS)\dbgriddll_dummy.obj $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(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) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_2).lib,, + 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) 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 cw32mt$(__RUNTIME_LIBS_3).lib,, | - implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid $@ + implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid $@ !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib: $(OBJS)\dbgridlib_dummy.obj $(DBGRIDLIB_OBJECTS) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib: $(OBJS)\dbgridlib_dummy.obj $(DBGRIDLIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| $(DBGRIDLIB_OBJECTS) @@ -2920,15 +3174,15 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid. !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(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) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_2).lib,, + 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) 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 cw32mt$(__RUNTIME_LIBS_3).lib,, | - implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html $@ + implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html $@ !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_HTML)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib: $(OBJS)\htmllib_dummy.obj $(HTMLLIB_OBJECTS) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib: $(OBJS)\htmllib_dummy.obj $(HTMLLIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| $(HTMLLIB_OBJECTS) @@ -2936,31 +3190,47 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.li !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(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) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(XMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_2).lib,, + c0d32.obj $(XMLDLL_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) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32mt$(__RUNTIME_LIBS_3).lib,, | - implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml $@ + implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml $@ !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" -$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib: $(OBJS)\xmllib_dummy.obj $(XMLLIB_OBJECTS) +$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib: $(OBJS)\xmllib_dummy.obj $(XMLLIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| $(XMLLIB_OBJECTS) | !endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__htmldll___depname) $(__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) 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 cw32mt$(__RUNTIME_LIBS_3).lib,, +| + implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc $@ +!endif + +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_XRC)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib: $(OBJS)\xrclib_dummy.obj $(XRCLIB_OBJECTS) + if exist $@ del $@ + tlib /a /p4096 $@ @&&| + $(XRCLIB_OBJECTS) +| +!endif + !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(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) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) import32.lib cw32mt$(__RUNTIME_LIBS_2).lib,, + 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) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) import32.lib cw32mt$(__RUNTIME_LIBS_3).lib,, | - implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl $@ + implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl $@ !endif !if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib: $(OBJS)\gllib_dummy.obj $(GLLIB_OBJECTS) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib: $(OBJS)\gllib_dummy.obj $(GLLIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| $(GLLIB_OBJECTS) @@ -2968,9 +3238,10 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib: !endif samples: - cd ..\..\samples - $(MAKE) -f makefile.bcc $(MAKEARGS) all - cd ..\..\.. + @echo cd ..\..\samples >$(OBJS)\samples.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>$(OBJS)\samples.bat + call $(OBJS)\samples.bat + @del $(OBJS)\samples.bat $(LIBDIRNAME): if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME) @@ -2990,7 +3261,7 @@ $(SETUPHDIR)\wx\setup.h: build_cfg_file: $(SETUPHDIR) @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=5 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @@ -3055,18 +3326,12 @@ $(OBJS)\wxzlib_zutil.obj: ..\..\src\zlib\zutil.c $(OBJS)\wxzlib_inflate.obj: ..\..\src\zlib\inflate.c $(CC) -q -c -P- -o$@ $(WXZLIB_CFLAGS) $** -$(OBJS)\wxzlib_infblock.obj: ..\..\src\zlib\infblock.c +$(OBJS)\wxzlib_infback.obj: ..\..\src\zlib\infback.c $(CC) -q -c -P- -o$@ $(WXZLIB_CFLAGS) $** $(OBJS)\wxzlib_inftrees.obj: ..\..\src\zlib\inftrees.c $(CC) -q -c -P- -o$@ $(WXZLIB_CFLAGS) $** -$(OBJS)\wxzlib_infcodes.obj: ..\..\src\zlib\infcodes.c - $(CC) -q -c -P- -o$@ $(WXZLIB_CFLAGS) $** - -$(OBJS)\wxzlib_infutil.obj: ..\..\src\zlib\infutil.c - $(CC) -q -c -P- -o$@ $(WXZLIB_CFLAGS) $** - $(OBJS)\wxzlib_inffast.obj: ..\..\src\zlib\inffast.c $(CC) -q -c -P- -o$@ $(WXZLIB_CFLAGS) $** @@ -3373,6 +3638,9 @@ $(OBJS)\monodll_dummy.obj: ..\..\src\msw\dummy.cpp $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_clntdata.obj: ..\..\src\common\clntdata.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_cmdline.obj: ..\..\src\common\cmdline.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -3427,9 +3695,6 @@ $(OBJS)\monodll_fmapbase.obj: ..\..\src\common\fmapbase.cpp $(OBJS)\monodll_fs_zip.obj: ..\..\src\common\fs_zip.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_gzstream.obj: ..\..\src\common\gzstream.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** - $(OBJS)\monodll_hash.obj: ..\..\src\common\hash.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -3475,6 +3740,12 @@ $(OBJS)\monodll_process.obj: ..\..\src\common\process.cpp $(OBJS)\monodll_regex.obj: ..\..\src\common\regex.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_stdpbase.obj: ..\..\src\common\stdpbase.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_sstream.obj: ..\..\src\common\sstream.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_stopwatch.obj: ..\..\src\common\stopwatch.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -3502,8 +3773,11 @@ $(OBJS)\monodll_tokenzr.obj: ..\..\src\common\tokenzr.cpp $(OBJS)\monodll_txtstrm.obj: ..\..\src\common\txtstrm.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_unzip.obj: ..\..\src\common\unzip.c - $(CC) -q -c -P- -o$@ $(MONODLL_CFLAGS) $** +$(OBJS)\monodll_archive.obj: ..\..\src\common\archive.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_uri.obj: ..\..\src\common\uri.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** $(OBJS)\monodll_variant.obj: ..\..\src\common\variant.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -3550,6 +3824,9 @@ $(OBJS)\monodll_registry.obj: ..\..\src\msw\registry.cpp $(OBJS)\monodll_snglinst.obj: ..\..\src\msw\snglinst.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_thread.obj: ..\..\src\msw\thread.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -3610,8 +3887,8 @@ $(OBJS)\monodll_socket.obj: ..\..\src\common\socket.cpp $(OBJS)\monodll_url.obj: ..\..\src\common\url.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.c - $(CC) -q -c -P- -o$@ $(MONODLL_CFLAGS) $** +$(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -3619,13 +3896,13 @@ $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_dragimag.obj: ..\..\src\msw\dragimag.cpp +$(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_filedlg.obj: ..\..\src\msw\filedlg.cpp +$(OBJS)\monodll_dragimag.obj: ..\..\src\msw\dragimag.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp +$(OBJS)\monodll_filedlg.obj: ..\..\src\msw\filedlg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** $(OBJS)\monodll_frame.obj: ..\..\src\msw\frame.cpp @@ -3679,6 +3956,9 @@ $(OBJS)\monodll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp $(OBJS)\monodll_treectrl.obj: ..\..\src\msw\treectrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -3751,9 +4031,6 @@ $(OBJS)\monodll_win32.obj: ..\..\src\univ\themes\win32.cpp $(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_dcbuffer.obj: ..\..\src\generic\dcbuffer.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** - $(OBJS)\monodll_grid.obj: ..\..\src\generic\grid.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -3784,13 +4061,19 @@ $(OBJS)\monodll_wizard.obj: ..\..\src\generic\wizard.cpp $(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp +$(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp +$(OBJS)\monodll_mediactrl.obj: ..\..\src\msw\mediactrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** $(OBJS)\monodll_helpbest.obj: ..\..\src\msw\helpbest.cpp @@ -3868,184 +4151,276 @@ $(OBJS)\monodll_dbtable.obj: ..\..\src\common\dbtable.cpp $(OBJS)\monodll_dbgrid.obj: ..\..\src\common\dbgrid.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_xml.obj: ..\..\src\xml\xml.cpp +$(OBJS)\monodll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_xtixml.obj: ..\..\src\common\xtixml.cpp +$(OBJS)\monodll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_app.obj: ..\..\src\msw\app.cpp +$(OBJS)\monodll_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_bitmap.obj: ..\..\src\msw\bitmap.cpp +$(OBJS)\monodll_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_brush.obj: ..\..\src\msw\brush.cpp +$(OBJS)\monodll_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_caret.obj: ..\..\src\msw\caret.cpp +$(OBJS)\monodll_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_clipbrd.obj: ..\..\src\msw\clipbrd.cpp +$(OBJS)\monodll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_colour.obj: ..\..\src\msw\colour.cpp +$(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_cursor.obj: ..\..\src\msw\cursor.cpp +$(OBJS)\monodll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_data.obj: ..\..\src\msw\data.cpp +$(OBJS)\monodll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dc.obj: ..\..\src\msw\dc.cpp +$(OBJS)\monodll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dcclient.obj: ..\..\src\msw\dcclient.cpp +$(OBJS)\monodll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dcmemory.obj: ..\..\src\msw\dcmemory.cpp +$(OBJS)\monodll_xh_html.obj: ..\..\src\xrc\xh_html.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dcprint.obj: ..\..\src\msw\dcprint.cpp +$(OBJS)\monodll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dcscreen.obj: ..\..\src\msw\dcscreen.cpp +$(OBJS)\monodll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dialup.obj: ..\..\src\msw\dialup.cpp +$(OBJS)\monodll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dib.obj: ..\..\src\msw\dib.cpp +$(OBJS)\monodll_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp +$(OBJS)\monodll_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_display.obj: ..\..\src\msw\display.cpp +$(OBJS)\monodll_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_enhmeta.obj: ..\..\src\msw\enhmeta.cpp +$(OBJS)\monodll_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_split.obj: ..\..\src\xrc\xh_split.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) $** + +$(OBJS)\monodll_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_text.obj: ..\..\src\xrc\xh_text.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xmlres.obj: ..\..\src\xrc\xmlres.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xml.obj: ..\..\src\xml\xml.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xtixml.obj: ..\..\src\common\xtixml.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_app.obj: ..\..\src\msw\app.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp +$(OBJS)\monodll_bitmap.obj: ..\..\src\msw\bitmap.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_font.obj: ..\..\src\msw\font.cpp +$(OBJS)\monodll_brush.obj: ..\..\src\msw\brush.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_fontenum.obj: ..\..\src\msw\fontenum.cpp +$(OBJS)\monodll_caret.obj: ..\..\src\msw\caret.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_fontutil.obj: ..\..\src\msw\fontutil.cpp +$(OBJS)\monodll_clipbrd.obj: ..\..\src\msw\clipbrd.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gdiimage.obj: ..\..\src\msw\gdiimage.cpp +$(OBJS)\monodll_colour.obj: ..\..\src\msw\colour.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp +$(OBJS)\monodll_cursor.obj: ..\..\src\msw\cursor.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.c - $(CC) -q -c -P- -o$@ $(MONODLL_CFLAGS) $** +$(OBJS)\monodll_data.obj: ..\..\src\msw\data.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_helpchm.obj: ..\..\src\msw\helpchm.cpp +$(OBJS)\monodll_dc.obj: ..\..\src\msw\dc.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_helpwin.obj: ..\..\src\msw\helpwin.cpp +$(OBJS)\monodll_dcclient.obj: ..\..\src\msw\dcclient.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_icon.obj: ..\..\src\msw\icon.cpp +$(OBJS)\monodll_dcmemory.obj: ..\..\src\msw\dcmemory.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_minifram.obj: ..\..\src\msw\minifram.cpp +$(OBJS)\monodll_dcprint.obj: ..\..\src\msw\dcprint.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_automtn.obj: ..\..\src\msw\ole\automtn.cpp +$(OBJS)\monodll_dcscreen.obj: ..\..\src\msw\dcscreen.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp +$(OBJS)\monodll_dialup.obj: ..\..\src\msw\dialup.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp +$(OBJS)\monodll_dib.obj: ..\..\src\msw\dib.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp +$(OBJS)\monodll_display.obj: ..\..\src\msw\display.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp +$(OBJS)\monodll_enhmeta.obj: ..\..\src\msw\enhmeta.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp +$(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) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_fontenum.obj: ..\..\src\msw\fontenum.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_fontutil.obj: ..\..\src\msw\fontutil.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_gdiimage.obj: ..\..\src\msw\gdiimage.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_icon.obj: ..\..\src\msw\icon.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_minifram.obj: ..\..\src\msw\minifram.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif @@ -4119,6 +4494,26 @@ $(OBJS)\monodll_window.obj: ..\..\src\msw\window.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_helpchm.obj: ..\..\src\msw\helpchm.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_helpwin.obj: ..\..\src\msw\helpwin.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_automtn.obj: ..\..\src\msw\ole\automtn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monodll_statusbr.obj: ..\..\src\generic\statusbr.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -4224,16 +4619,6 @@ $(OBJS)\monodll_dialog.obj: ..\..\src\univ\dialog.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" -$(OBJS)\monodll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\monodll_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monodll_imaglist.obj: ..\..\src\msw\imaglist.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -4374,6 +4759,16 @@ $(OBJS)\monodll_textctrl.obj: ..\..\src\univ\textctrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\monodll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\monodll_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.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) $** @@ -4414,11 +4809,6 @@ $(OBJS)\monodll_clipcmn.obj: ..\..\src\common\clipcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_clntdata.obj: ..\..\src\common\clntdata.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_cmdproc.obj: ..\..\src\common\cmdproc.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -4694,6 +5084,11 @@ $(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 + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_tbarbase.obj: ..\..\src\common\tbarbase.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -4754,6 +5149,11 @@ $(OBJS)\monodll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -4855,6 +5255,9 @@ $(OBJS)\monolib_dummy.obj: ..\..\src\msw\dummy.cpp $(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_clntdata.obj: ..\..\src\common\clntdata.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_cmdline.obj: ..\..\src\common\cmdline.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -4909,9 +5312,6 @@ $(OBJS)\monolib_fmapbase.obj: ..\..\src\common\fmapbase.cpp $(OBJS)\monolib_fs_zip.obj: ..\..\src\common\fs_zip.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_gzstream.obj: ..\..\src\common\gzstream.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** - $(OBJS)\monolib_hash.obj: ..\..\src\common\hash.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -4957,6 +5357,12 @@ $(OBJS)\monolib_process.obj: ..\..\src\common\process.cpp $(OBJS)\monolib_regex.obj: ..\..\src\common\regex.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_stdpbase.obj: ..\..\src\common\stdpbase.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_sstream.obj: ..\..\src\common\sstream.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_stopwatch.obj: ..\..\src\common\stopwatch.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -4984,8 +5390,11 @@ $(OBJS)\monolib_tokenzr.obj: ..\..\src\common\tokenzr.cpp $(OBJS)\monolib_txtstrm.obj: ..\..\src\common\txtstrm.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_unzip.obj: ..\..\src\common\unzip.c - $(CC) -q -c -P- -o$@ $(MONOLIB_CFLAGS) $** +$(OBJS)\monolib_archive.obj: ..\..\src\common\archive.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_uri.obj: ..\..\src\common\uri.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** $(OBJS)\monolib_variant.obj: ..\..\src\common\variant.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -5032,6 +5441,9 @@ $(OBJS)\monolib_registry.obj: ..\..\src\msw\registry.cpp $(OBJS)\monolib_snglinst.obj: ..\..\src\msw\snglinst.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_thread.obj: ..\..\src\msw\thread.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -5092,8 +5504,8 @@ $(OBJS)\monolib_socket.obj: ..\..\src\common\socket.cpp $(OBJS)\monolib_url.obj: ..\..\src\common\url.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.c - $(CC) -q -c -P- -o$@ $(MONOLIB_CFLAGS) $** +$(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -5101,13 +5513,13 @@ $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_dragimag.obj: ..\..\src\msw\dragimag.cpp +$(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_filedlg.obj: ..\..\src\msw\filedlg.cpp +$(OBJS)\monolib_dragimag.obj: ..\..\src\msw\dragimag.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp +$(OBJS)\monolib_filedlg.obj: ..\..\src\msw\filedlg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** $(OBJS)\monolib_frame.obj: ..\..\src\msw\frame.cpp @@ -5161,6 +5573,9 @@ $(OBJS)\monolib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp $(OBJS)\monolib_treectrl.obj: ..\..\src\msw\treectrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -5233,9 +5648,6 @@ $(OBJS)\monolib_win32.obj: ..\..\src\univ\themes\win32.cpp $(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_dcbuffer.obj: ..\..\src\generic\dcbuffer.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** - $(OBJS)\monolib_grid.obj: ..\..\src\generic\grid.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -5266,13 +5678,19 @@ $(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp $(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp +$(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp +$(OBJS)\monolib_mediactrl.obj: ..\..\src\msw\mediactrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** $(OBJS)\monolib_helpbest.obj: ..\..\src\msw\helpbest.cpp @@ -5350,6 +5768,123 @@ $(OBJS)\monolib_dbtable.obj: ..\..\src\common\dbtable.cpp $(OBJS)\monolib_dbgrid.obj: ..\..\src\common\dbgrid.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_choic.obj: ..\..\src\xrc\xh_choic.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) $** + +$(OBJS)\monolib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_html.obj: ..\..\src\xrc\xh_html.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_panel.obj: ..\..\src\xrc\xh_panel.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) $** + +$(OBJS)\monolib_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_split.obj: ..\..\src\xrc\xh_split.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) $** + +$(OBJS)\monolib_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_text.obj: ..\..\src\xrc\xh_text.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xmlres.obj: ..\..\src\xrc\xmlres.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_xml.obj: ..\..\src\xml\xml.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -5431,11 +5966,6 @@ $(OBJS)\monolib_dib.obj: ..\..\src\msw\dib.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_display.obj: ..\..\src\msw\display.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -5477,17 +6007,7 @@ $(OBJS)\monolib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.c - $(CC) -q -c -P- -o$@ $(MONOLIB_CFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_helpchm.obj: ..\..\src\msw\helpchm.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_helpwin.obj: ..\..\src\msw\helpwin.cpp +$(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif @@ -5501,11 +6021,6 @@ $(OBJS)\monolib_minifram.obj: ..\..\src\msw\minifram.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_automtn.obj: ..\..\src\msw\ole\automtn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -5526,11 +6041,6 @@ $(OBJS)\monolib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_palette.obj: ..\..\src\msw\palette.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -5601,6 +6111,26 @@ $(OBJS)\monolib_window.obj: ..\..\src\msw\window.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_helpchm.obj: ..\..\src\msw\helpchm.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_helpwin.obj: ..\..\src\msw\helpwin.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_automtn.obj: ..\..\src\msw\ole\automtn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monolib_statusbr.obj: ..\..\src\generic\statusbr.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -5706,16 +6236,6 @@ $(OBJS)\monolib_dialog.obj: ..\..\src\univ\dialog.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" -$(OBJS)\monolib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\monolib_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monolib_imaglist.obj: ..\..\src\msw\imaglist.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -5856,6 +6376,16 @@ $(OBJS)\monolib_textctrl.obj: ..\..\src\univ\textctrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\monolib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\monolib_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.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) $** @@ -5896,11 +6426,6 @@ $(OBJS)\monolib_clipcmn.obj: ..\..\src\common\clipcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_clntdata.obj: ..\..\src\common\clntdata.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_cmdproc.obj: ..\..\src\common\cmdproc.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -6176,6 +6701,11 @@ $(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 + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_tbarbase.obj: ..\..\src\common\tbarbase.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -6236,6 +6766,11 @@ $(OBJS)\monolib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_dcpsg.obj: ..\..\src\generic\dcpsg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -6337,6 +6872,9 @@ $(OBJS)\basedll_dummy.obj: ..\..\src\msw\dummy.cpp $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** +$(OBJS)\basedll_clntdata.obj: ..\..\src\common\clntdata.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + $(OBJS)\basedll_cmdline.obj: ..\..\src\common\cmdline.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -6391,9 +6929,6 @@ $(OBJS)\basedll_fmapbase.obj: ..\..\src\common\fmapbase.cpp $(OBJS)\basedll_fs_zip.obj: ..\..\src\common\fs_zip.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_gzstream.obj: ..\..\src\common\gzstream.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** - $(OBJS)\basedll_hash.obj: ..\..\src\common\hash.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -6439,6 +6974,12 @@ $(OBJS)\basedll_process.obj: ..\..\src\common\process.cpp $(OBJS)\basedll_regex.obj: ..\..\src\common\regex.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** +$(OBJS)\basedll_stdpbase.obj: ..\..\src\common\stdpbase.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + +$(OBJS)\basedll_sstream.obj: ..\..\src\common\sstream.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + $(OBJS)\basedll_stopwatch.obj: ..\..\src\common\stopwatch.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -6466,8 +7007,11 @@ $(OBJS)\basedll_tokenzr.obj: ..\..\src\common\tokenzr.cpp $(OBJS)\basedll_txtstrm.obj: ..\..\src\common\txtstrm.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_unzip.obj: ..\..\src\common\unzip.c - $(CC) -q -c -P- -o$@ $(BASEDLL_CFLAGS) $** +$(OBJS)\basedll_archive.obj: ..\..\src\common\archive.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + +$(OBJS)\basedll_uri.obj: ..\..\src\common\uri.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** $(OBJS)\basedll_variant.obj: ..\..\src\common\variant.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -6514,6 +7058,9 @@ $(OBJS)\basedll_registry.obj: ..\..\src\msw\registry.cpp $(OBJS)\basedll_snglinst.obj: ..\..\src\msw\snglinst.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** +$(OBJS)\basedll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + $(OBJS)\basedll_thread.obj: ..\..\src\msw\thread.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -6550,6 +7097,9 @@ $(OBJS)\baselib_dummy.obj: ..\..\src\msw\dummy.cpp $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** +$(OBJS)\baselib_clntdata.obj: ..\..\src\common\clntdata.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** + $(OBJS)\baselib_cmdline.obj: ..\..\src\common\cmdline.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** @@ -6604,9 +7154,6 @@ $(OBJS)\baselib_fmapbase.obj: ..\..\src\common\fmapbase.cpp $(OBJS)\baselib_fs_zip.obj: ..\..\src\common\fs_zip.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_gzstream.obj: ..\..\src\common\gzstream.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** - $(OBJS)\baselib_hash.obj: ..\..\src\common\hash.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** @@ -6652,6 +7199,12 @@ $(OBJS)\baselib_process.obj: ..\..\src\common\process.cpp $(OBJS)\baselib_regex.obj: ..\..\src\common\regex.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** +$(OBJS)\baselib_stdpbase.obj: ..\..\src\common\stdpbase.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** + +$(OBJS)\baselib_sstream.obj: ..\..\src\common\sstream.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** + $(OBJS)\baselib_stopwatch.obj: ..\..\src\common\stopwatch.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** @@ -6679,8 +7232,11 @@ $(OBJS)\baselib_tokenzr.obj: ..\..\src\common\tokenzr.cpp $(OBJS)\baselib_txtstrm.obj: ..\..\src\common\txtstrm.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_unzip.obj: ..\..\src\common\unzip.c - $(CC) -q -c -P- -o$@ $(BASELIB_CFLAGS) $** +$(OBJS)\baselib_archive.obj: ..\..\src\common\archive.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** + +$(OBJS)\baselib_uri.obj: ..\..\src\common\uri.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** $(OBJS)\baselib_variant.obj: ..\..\src\common\variant.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** @@ -6727,6 +7283,9 @@ $(OBJS)\baselib_registry.obj: ..\..\src\msw\registry.cpp $(OBJS)\baselib_snglinst.obj: ..\..\src\msw\snglinst.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** +$(OBJS)\baselib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** + $(OBJS)\baselib_thread.obj: ..\..\src\msw\thread.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** @@ -6790,8 +7349,8 @@ $(OBJS)\netdll_socket.obj: ..\..\src\common\socket.cpp $(OBJS)\netdll_url.obj: ..\..\src\common\url.cpp $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $** -$(OBJS)\netdll_gsocket.obj: ..\..\src\msw\gsocket.c - $(CC) -q -c -P- -o$@ $(NETDLL_CFLAGS) $** +$(OBJS)\netdll_gsocket.obj: ..\..\src\msw\gsocket.cpp + $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $** $(OBJS)\netdll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $** @@ -6829,8 +7388,8 @@ $(OBJS)\netlib_socket.obj: ..\..\src\common\socket.cpp $(OBJS)\netlib_url.obj: ..\..\src\common\url.cpp $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $** -$(OBJS)\netlib_gsocket.obj: ..\..\src\msw\gsocket.c - $(CC) -q -c -P- -o$@ $(NETLIB_CFLAGS) $** +$(OBJS)\netlib_gsocket.obj: ..\..\src\msw\gsocket.cpp + $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $** $(OBJS)\netlib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $** @@ -6862,13 +7421,13 @@ $(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp $(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -$(OBJS)\coredll_dragimag.obj: ..\..\src\msw\dragimag.cpp +$(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -$(OBJS)\coredll_filedlg.obj: ..\..\src\msw\filedlg.cpp +$(OBJS)\coredll_dragimag.obj: ..\..\src\msw\dragimag.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -$(OBJS)\coredll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp +$(OBJS)\coredll_filedlg.obj: ..\..\src\msw\filedlg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** $(OBJS)\coredll_frame.obj: ..\..\src\msw\frame.cpp @@ -6922,6 +7481,9 @@ $(OBJS)\coredll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp $(OBJS)\coredll_treectrl.obj: ..\..\src\msw\treectrl.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +$(OBJS)\coredll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** + $(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -7066,11 +7628,6 @@ $(OBJS)\coredll_dib.obj: ..\..\src\msw\dib.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_display.obj: ..\..\src\msw\display.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -7097,32 +7654,22 @@ $(OBJS)\coredll_fontenum.obj: ..\..\src\msw\fontenum.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_fontutil.obj: ..\..\src\msw\fontutil.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gdiimage.obj: ..\..\src\msw\gdiimage.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp +$(OBJS)\coredll_fontutil.obj: ..\..\src\msw\fontutil.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gsockmsw.obj: ..\..\src\msw\gsockmsw.c - $(CC) -q -c -P- -o$@ $(COREDLL_CFLAGS) $** +$(OBJS)\coredll_gdiimage.obj: ..\..\src\msw\gdiimage.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_helpchm.obj: ..\..\src\msw\helpchm.cpp +$(OBJS)\coredll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_helpwin.obj: ..\..\src\msw\helpwin.cpp +$(OBJS)\coredll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif @@ -7136,11 +7683,6 @@ $(OBJS)\coredll_minifram.obj: ..\..\src\msw\minifram.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_automtn.obj: ..\..\src\msw\ole\automtn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -7161,11 +7703,6 @@ $(OBJS)\coredll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_palette.obj: ..\..\src\msw\palette.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -7236,6 +7773,26 @@ $(OBJS)\coredll_window.obj: ..\..\src\msw\window.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_helpchm.obj: ..\..\src\msw\helpchm.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_helpwin.obj: ..\..\src\msw\helpwin.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_automtn.obj: ..\..\src\msw\ole\automtn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\coredll_statusbr.obj: ..\..\src\generic\statusbr.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -7341,16 +7898,6 @@ $(OBJS)\coredll_dialog.obj: ..\..\src\univ\dialog.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" -$(OBJS)\coredll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\coredll_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\coredll_imaglist.obj: ..\..\src\msw\imaglist.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -7491,6 +8038,16 @@ $(OBJS)\coredll_textctrl.obj: ..\..\src\univ\textctrl.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\coredll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\coredll_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.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) $** @@ -7531,11 +8088,6 @@ $(OBJS)\coredll_clipcmn.obj: ..\..\src\common\clipcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_clntdata.obj: ..\..\src\common\clntdata.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_cmdproc.obj: ..\..\src\common\cmdproc.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -7811,6 +8363,11 @@ $(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 + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_tbarbase.obj: ..\..\src\common\tbarbase.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -7871,6 +8428,11 @@ $(OBJS)\coredll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -7993,13 +8555,13 @@ $(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp $(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -$(OBJS)\corelib_dragimag.obj: ..\..\src\msw\dragimag.cpp +$(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -$(OBJS)\corelib_filedlg.obj: ..\..\src\msw\filedlg.cpp +$(OBJS)\corelib_dragimag.obj: ..\..\src\msw\dragimag.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -$(OBJS)\corelib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp +$(OBJS)\corelib_filedlg.obj: ..\..\src\msw\filedlg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** $(OBJS)\corelib_frame.obj: ..\..\src\msw\frame.cpp @@ -8053,6 +8615,9 @@ $(OBJS)\corelib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp $(OBJS)\corelib_treectrl.obj: ..\..\src\msw\treectrl.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +$(OBJS)\corelib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** + $(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -8197,11 +8762,6 @@ $(OBJS)\corelib_dib.obj: ..\..\src\msw\dib.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_display.obj: ..\..\src\msw\display.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -8243,17 +8803,7 @@ $(OBJS)\corelib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gsockmsw.obj: ..\..\src\msw\gsockmsw.c - $(CC) -q -c -P- -o$@ $(CORELIB_CFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_helpchm.obj: ..\..\src\msw\helpchm.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_helpwin.obj: ..\..\src\msw\helpwin.cpp +$(OBJS)\corelib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif @@ -8267,11 +8817,6 @@ $(OBJS)\corelib_minifram.obj: ..\..\src\msw\minifram.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_automtn.obj: ..\..\src\msw\ole\automtn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -8292,11 +8837,6 @@ $(OBJS)\corelib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_palette.obj: ..\..\src\msw\palette.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -8367,6 +8907,26 @@ $(OBJS)\corelib_window.obj: ..\..\src\msw\window.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_helpchm.obj: ..\..\src\msw\helpchm.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_helpwin.obj: ..\..\src\msw\helpwin.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_automtn.obj: ..\..\src\msw\ole\automtn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\corelib_statusbr.obj: ..\..\src\generic\statusbr.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -8472,16 +9032,6 @@ $(OBJS)\corelib_dialog.obj: ..\..\src\univ\dialog.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" -$(OBJS)\corelib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\corelib_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\corelib_imaglist.obj: ..\..\src\msw\imaglist.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -8622,6 +9172,16 @@ $(OBJS)\corelib_textctrl.obj: ..\..\src\univ\textctrl.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\corelib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\corelib_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.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) $** @@ -8662,11 +9222,6 @@ $(OBJS)\corelib_clipcmn.obj: ..\..\src\common\clipcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_clntdata.obj: ..\..\src\common\clntdata.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_cmdproc.obj: ..\..\src\common\cmdproc.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -8942,6 +9497,11 @@ $(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 + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_tbarbase.obj: ..\..\src\common\tbarbase.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -9002,6 +9562,11 @@ $(OBJS)\corelib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_dcpsg.obj: ..\..\src\generic\dcpsg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -9103,9 +9668,6 @@ $(OBJS)\advdll_dummy.obj: ..\..\src\msw\dummy.cpp $(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** -$(OBJS)\advdll_dcbuffer.obj: ..\..\src\generic\dcbuffer.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** - $(OBJS)\advdll_grid.obj: ..\..\src\generic\grid.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** @@ -9136,24 +9698,21 @@ $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** -$(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** - $(OBJS)\advdll_sound.obj: ..\..\src\msw\sound.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** $(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** +$(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + $(OBJS)\advlib_dummy.obj: ..\..\src\msw\dummy.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) -H $** $(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** -$(OBJS)\advlib_dcbuffer.obj: ..\..\src\generic\dcbuffer.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** - $(OBJS)\advlib_grid.obj: ..\..\src\generic\grid.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** @@ -9184,15 +9743,33 @@ $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** -$(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** - $(OBJS)\advlib_sound.obj: ..\..\src\msw\sound.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** $(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** +$(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\mediadll_dummy.obj: ..\..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) -H $** + +$(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp + $(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) $** + +$(OBJS)\mediadll_mediactrl.obj: ..\..\src\msw\mediactrl.cpp + $(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) $** + +$(OBJS)\medialib_dummy.obj: ..\..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) -H $** + +$(OBJS)\medialib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp + $(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) $** + +$(OBJS)\medialib_mediactrl.obj: ..\..\src\msw\mediactrl.cpp + $(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) $** + $(OBJS)\odbcdll_dummy.obj: ..\..\src\msw\dummy.cpp $(CXX) -q -c -P -o$@ $(ODBCDLL_CXXFLAGS) -H $** @@ -9379,6 +9956,246 @@ $(OBJS)\xmllib_xml.obj: ..\..\src\xml\xml.cpp $(OBJS)\xmllib_xtixml.obj: ..\..\src\common\xtixml.cpp $(CXX) -q -c -P -o$@ $(XMLLIB_CXXFLAGS) $** +$(OBJS)\xrcdll_dummy.obj: ..\..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) -H $** + +$(OBJS)\xrcdll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_choic.obj: ..\..\src\xrc\xh_choic.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) $** + +$(OBJS)\xrcdll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_html.obj: ..\..\src\xrc\xh_html.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_panel.obj: ..\..\src\xrc\xh_panel.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) $** + +$(OBJS)\xrcdll_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_split.obj: ..\..\src\xrc\xh_split.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) $** + +$(OBJS)\xrcdll_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_text.obj: ..\..\src\xrc\xh_text.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xmlres.obj: ..\..\src\xrc\xmlres.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrclib_dummy.obj: ..\..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) -H $** + +$(OBJS)\xrclib_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_choic.obj: ..\..\src\xrc\xh_choic.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) $** + +$(OBJS)\xrclib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_html.obj: ..\..\src\xrc\xh_html.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_panel.obj: ..\..\src\xrc\xh_panel.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) $** + +$(OBJS)\xrclib_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_split.obj: ..\..\src\xrc\xh_split.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) $** + +$(OBJS)\xrclib_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_text.obj: ..\..\src\xrc\xh_text.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xmlres.obj: ..\..\src\xrc\xmlres.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + $(OBJS)\gldll_dummy.obj: ..\..\src\msw\dummy.cpp $(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) -H $**