X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8c9f8f91cd62335261ee29762747218f28d129de..3903f408241aedc3b2f5e24349d0ac939ba9164c:/build/msw/makefile.bcc diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index d5e219aaeb..84291b1d62 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.8 (http://bakefile.sourceforge.net) +# Bakefile 0.2.0 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -23,10 +23,12 @@ BCCDIR = $(MAKEDIR)\.. MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \ - -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_XRC="$(USE_XRC)" \ + -DCPP="$(CPP)" -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_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \ + -DUSE_AUI="$(USE_AUI)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \ -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_ODBC="$(USE_ODBC)" -DUSE_QA="$(USE_QA)" \ -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \ -DUSE_THREADS="$(USE_THREADS)" -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" \ @@ -34,8 +36,8 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ -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)5 +WX_RELEASE_NODOT = 27 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) LIBDIRNAME = ..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG) @@ -153,6 +155,7 @@ WXTIFF_OBJECTS = \ $(OBJS)\wxtiff_tif_dirwrite.obj \ $(OBJS)\wxtiff_tif_dumpmode.obj \ $(OBJS)\wxtiff_tif_error.obj \ + $(OBJS)\wxtiff_tif_extension.obj \ $(OBJS)\wxtiff_tif_fax3.obj \ $(OBJS)\wxtiff_tif_fax3sm.obj \ $(OBJS)\wxtiff_tif_getimage.obj \ @@ -185,17 +188,18 @@ WXEXPAT_OBJECTS = \ MONODLL_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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=1 -DWXMAKINGDLL \ - $(CPPFLAGS) $(CFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + -DwxUSE_BASE=1 -DWXMAKINGDLL $(CPPFLAGS) $(CFLAGS) MONODLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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=1 -DWXMAKINGDLL -Hu \ - -H=$(OBJS)\wxprec_monodll.csm $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + -DwxUSE_BASE=1 -DWXMAKINGDLL -Hu -H=$(OBJS)\wxprec_monodll.csm $(CPPFLAGS) \ + $(CXXFLAGS) MONODLL_OBJECTS = \ $(OBJS)\monodll_dummy.obj \ $(OBJS)\monodll_appbase.obj \ @@ -203,6 +207,7 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_clntdata.obj \ $(OBJS)\monodll_cmdline.obj \ $(OBJS)\monodll_config.obj \ + $(OBJS)\monodll_convauto.obj \ $(OBJS)\monodll_datetime.obj \ $(OBJS)\monodll_datstrm.obj \ $(OBJS)\monodll_dircmn.obj \ @@ -232,6 +237,7 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_module.obj \ $(OBJS)\monodll_mstream.obj \ $(OBJS)\monodll_object.obj \ + $(OBJS)\monodll_powercmn.obj \ $(OBJS)\monodll_process.obj \ $(OBJS)\monodll_regex.obj \ $(OBJS)\monodll_stdpbase.obj \ @@ -260,6 +266,7 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_dir.obj \ $(OBJS)\monodll_dlmsw.obj \ $(OBJS)\monodll_mimetype.obj \ + $(OBJS)\monodll_power.obj \ $(OBJS)\monodll_regconf.obj \ $(OBJS)\monodll_registry.obj \ $(OBJS)\monodll_snglinst.obj \ @@ -293,16 +300,17 @@ MONODLL_OBJECTS = \ MONOLIB_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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=1 $(CPPFLAGS) $(CFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) MONOLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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=1 -Hu \ - -H=$(OBJS)\wxprec_monolib.csm $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + -DwxUSE_BASE=1 -Hu -H=$(OBJS)\wxprec_monolib.csm $(CPPFLAGS) $(CXXFLAGS) MONOLIB_OBJECTS = \ $(OBJS)\monolib_dummy.obj \ $(OBJS)\monolib_appbase.obj \ @@ -310,6 +318,7 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_clntdata.obj \ $(OBJS)\monolib_cmdline.obj \ $(OBJS)\monolib_config.obj \ + $(OBJS)\monolib_convauto.obj \ $(OBJS)\monolib_datetime.obj \ $(OBJS)\monolib_datstrm.obj \ $(OBJS)\monolib_dircmn.obj \ @@ -339,6 +348,7 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_module.obj \ $(OBJS)\monolib_mstream.obj \ $(OBJS)\monolib_object.obj \ + $(OBJS)\monolib_powercmn.obj \ $(OBJS)\monolib_process.obj \ $(OBJS)\monolib_regex.obj \ $(OBJS)\monolib_stdpbase.obj \ @@ -367,6 +377,7 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_dir.obj \ $(OBJS)\monolib_dlmsw.obj \ $(OBJS)\monolib_mimetype.obj \ + $(OBJS)\monolib_power.obj \ $(OBJS)\monolib_regconf.obj \ $(OBJS)\monolib_registry.obj \ $(OBJS)\monolib_snglinst.obj \ @@ -400,17 +411,18 @@ MONOLIB_OBJECTS = \ BASEDLL_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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 -DWXMAKINGDLL_BASE \ - -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) BASEDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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 -DWXMAKINGDLL_BASE \ - -DwxUSE_BASE=1 -Hu -H=$(OBJS)\wxprec_basedll.csm $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 -Hu \ + -H=$(OBJS)\wxprec_basedll.csm $(CPPFLAGS) $(CXXFLAGS) BASEDLL_OBJECTS = \ $(OBJS)\basedll_dummy.obj \ $(OBJS)\basedll_appbase.obj \ @@ -418,6 +430,7 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_clntdata.obj \ $(OBJS)\basedll_cmdline.obj \ $(OBJS)\basedll_config.obj \ + $(OBJS)\basedll_convauto.obj \ $(OBJS)\basedll_datetime.obj \ $(OBJS)\basedll_datstrm.obj \ $(OBJS)\basedll_dircmn.obj \ @@ -447,6 +460,7 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_module.obj \ $(OBJS)\basedll_mstream.obj \ $(OBJS)\basedll_object.obj \ + $(OBJS)\basedll_powercmn.obj \ $(OBJS)\basedll_process.obj \ $(OBJS)\basedll_regex.obj \ $(OBJS)\basedll_stdpbase.obj \ @@ -475,6 +489,7 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_dir.obj \ $(OBJS)\basedll_dlmsw.obj \ $(OBJS)\basedll_mimetype.obj \ + $(OBJS)\basedll_power.obj \ $(OBJS)\basedll_regconf.obj \ $(OBJS)\basedll_registry.obj \ $(OBJS)\basedll_snglinst.obj \ @@ -493,17 +508,18 @@ BASEDLL_OBJECTS = \ BASELIB_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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 -DwxUSE_BASE=1 \ - $(CPPFLAGS) $(CFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) BASELIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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 -DwxUSE_BASE=1 -Hu \ - -H=$(OBJS)\wxprec_baselib.csm $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + -DwxUSE_GUI=0 -DwxUSE_BASE=1 -Hu -H=$(OBJS)\wxprec_baselib.csm $(CPPFLAGS) \ + $(CXXFLAGS) BASELIB_OBJECTS = \ $(OBJS)\baselib_dummy.obj \ $(OBJS)\baselib_appbase.obj \ @@ -511,6 +527,7 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_clntdata.obj \ $(OBJS)\baselib_cmdline.obj \ $(OBJS)\baselib_config.obj \ + $(OBJS)\baselib_convauto.obj \ $(OBJS)\baselib_datetime.obj \ $(OBJS)\baselib_datstrm.obj \ $(OBJS)\baselib_dircmn.obj \ @@ -540,6 +557,7 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_module.obj \ $(OBJS)\baselib_mstream.obj \ $(OBJS)\baselib_object.obj \ + $(OBJS)\baselib_powercmn.obj \ $(OBJS)\baselib_process.obj \ $(OBJS)\baselib_regex.obj \ $(OBJS)\baselib_stdpbase.obj \ @@ -568,6 +586,7 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_dir.obj \ $(OBJS)\baselib_dlmsw.obj \ $(OBJS)\baselib_mimetype.obj \ + $(OBJS)\baselib_power.obj \ $(OBJS)\baselib_regconf.obj \ $(OBJS)\baselib_registry.obj \ $(OBJS)\baselib_snglinst.obj \ @@ -586,10 +605,11 @@ BASELIB_OBJECTS = \ NETDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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 -Hu -H=$(OBJS)\wxprec_netdll.csm $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET -Hu \ + -H=$(OBJS)\wxprec_netdll.csm $(CPPFLAGS) $(CXXFLAGS) NETDLL_OBJECTS = \ $(OBJS)\netdll_dummy.obj \ $(OBJS)\netdll_fs_inet.obj \ @@ -607,10 +627,10 @@ NETDLL_OBJECTS = \ NETLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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 -Hu \ - -H=$(OBJS)\wxprec_netlib.csm $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + -DwxUSE_GUI=0 -Hu -H=$(OBJS)\wxprec_netlib.csm $(CPPFLAGS) $(CXXFLAGS) NETLIB_OBJECTS = \ $(OBJS)\netlib_dummy.obj \ $(OBJS)\netlib_fs_inet.obj \ @@ -628,10 +648,11 @@ NETLIB_OBJECTS = \ COREDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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 -Hu -H=$(OBJS)\wxprec_coredll.csm $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 -Hu \ + -H=$(OBJS)\wxprec_coredll.csm $(CPPFLAGS) $(CXXFLAGS) COREDLL_OBJECTS = \ $(OBJS)\coredll_dummy.obj \ $(OBJS)\coredll_event.obj \ @@ -645,10 +666,10 @@ COREDLL_OBJECTS = \ CORELIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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 -Hu \ - -H=$(OBJS)\wxprec_corelib.csm $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + -DwxUSE_BASE=0 -Hu -H=$(OBJS)\wxprec_corelib.csm $(CPPFLAGS) $(CXXFLAGS) CORELIB_OBJECTS = \ $(OBJS)\corelib_dummy.obj \ $(OBJS)\corelib_event.obj \ @@ -662,52 +683,59 @@ CORELIB_OBJECTS = \ ADVDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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_ADV -Hu \ - -H=$(OBJS)\wxprec_advdll.csm $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + -DWXUSINGDLL -DWXMAKINGDLL_ADV -Hu -H=$(OBJS)\wxprec_advdll.csm $(CPPFLAGS) \ + $(CXXFLAGS) ADVDLL_OBJECTS = \ $(OBJS)\advdll_dummy.obj \ $(____ADVANCED_SRC_FILENAMES_2_OBJECTS) ADVLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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_advlib.csm \ - $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib -Hu \ + -H=$(OBJS)\wxprec_advlib.csm $(CPPFLAGS) $(CXXFLAGS) ADVLIB_OBJECTS = \ $(OBJS)\advlib_dummy.obj \ $(____ADVANCED_SRC_FILENAMES_3_OBJECTS) MEDIADLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + -DWXUSINGDLL -DWXMAKINGDLL_MEDIA -Hu -H=$(OBJS)\wxprec_mediadll.csm \ + $(CPPFLAGS) $(CXXFLAGS) MEDIADLL_OBJECTS = \ $(OBJS)\mediadll_dummy.obj \ $(OBJS)\mediadll_mediactrlcmn.obj \ - $(OBJS)\mediadll_mediactrl.obj + $(OBJS)\mediadll_mediactrl_am.obj \ + $(OBJS)\mediadll_mediactrl_wmp10.obj \ + $(OBJS)\mediadll_activex.obj MEDIALIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib -Hu \ + -H=$(OBJS)\wxprec_medialib.csm $(CPPFLAGS) $(CXXFLAGS) MEDIALIB_OBJECTS = \ $(OBJS)\medialib_dummy.obj \ $(OBJS)\medialib_mediactrlcmn.obj \ - $(OBJS)\medialib_mediactrl.obj + $(OBJS)\medialib_mediactrl_am.obj \ + $(OBJS)\medialib_mediactrl_wmp10.obj \ + $(OBJS)\medialib_activex.obj ODBCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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_ODBC -Hu -H=$(OBJS)\wxprec_odbcdll.csm $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC -Hu \ + -H=$(OBJS)\wxprec_odbcdll.csm $(CPPFLAGS) $(CXXFLAGS) ODBCDLL_OBJECTS = \ $(OBJS)\odbcdll_dummy.obj \ $(OBJS)\odbcdll_db.obj \ @@ -715,10 +743,10 @@ ODBCDLL_OBJECTS = \ ODBCLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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 -Hu \ - -H=$(OBJS)\wxprec_odbclib.csm $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + -DwxUSE_GUI=0 -Hu -H=$(OBJS)\wxprec_odbclib.csm $(CPPFLAGS) $(CXXFLAGS) ODBCLIB_OBJECTS = \ $(OBJS)\odbclib_dummy.obj \ $(OBJS)\odbclib_db.obj \ @@ -726,36 +754,40 @@ ODBCLIB_OBJECTS = \ DBGRIDDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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_DBGRID \ - -Hu -H=$(OBJS)\wxprec_dbgriddll.csm $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + -DWXUSINGDLL -DWXMAKINGDLL_DBGRID -Hu -H=$(OBJS)\wxprec_dbgriddll.csm \ + $(CPPFLAGS) $(CXXFLAGS) DBGRIDDLL_OBJECTS = \ $(OBJS)\dbgriddll_dummy.obj \ $(OBJS)\dbgriddll_dbgrid.obj DBGRIDLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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_dbgridlib.csm \ - $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib -Hu \ + -H=$(OBJS)\wxprec_dbgridlib.csm $(CPPFLAGS) $(CXXFLAGS) DBGRIDLIB_OBJECTS = \ $(OBJS)\dbgridlib_dummy.obj \ $(OBJS)\dbgridlib_dbgrid.obj HTMLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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_HTML -Hu \ - -H=$(OBJS)\wxprec_htmldll.csm $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + -DWXUSINGDLL -DWXMAKINGDLL_HTML -Hu -H=$(OBJS)\wxprec_htmldll.csm \ + $(CPPFLAGS) $(CXXFLAGS) HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_dummy.obj \ $(OBJS)\htmldll_helpbest.obj \ $(OBJS)\htmldll_helpctrl.obj \ $(OBJS)\htmldll_helpdata.obj \ + $(OBJS)\htmldll_helpdlg.obj \ $(OBJS)\htmldll_helpfrm.obj \ + $(OBJS)\htmldll_helpwnd.obj \ $(OBJS)\htmldll_htmlcell.obj \ $(OBJS)\htmldll_htmlfilt.obj \ $(OBJS)\htmldll_htmlpars.obj \ @@ -777,16 +809,18 @@ HTMLDLL_OBJECTS = \ HTMLLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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_htmllib.csm \ - $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib -Hu \ + -H=$(OBJS)\wxprec_htmllib.csm $(CPPFLAGS) $(CXXFLAGS) HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_dummy.obj \ $(OBJS)\htmllib_helpbest.obj \ $(OBJS)\htmllib_helpctrl.obj \ $(OBJS)\htmllib_helpdata.obj \ + $(OBJS)\htmllib_helpdlg.obj \ $(OBJS)\htmllib_helpfrm.obj \ + $(OBJS)\htmllib_helpwnd.obj \ $(OBJS)\htmllib_htmlcell.obj \ $(OBJS)\htmllib_htmlfilt.obj \ $(OBJS)\htmllib_htmlpars.obj \ @@ -808,10 +842,11 @@ HTMLLIB_OBJECTS = \ QADLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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_QA -Hu \ - -H=$(OBJS)\wxprec_qadll.csm $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + -DWXUSINGDLL -DWXMAKINGDLL_QA -Hu -H=$(OBJS)\wxprec_qadll.csm $(CPPFLAGS) \ + $(CXXFLAGS) QADLL_OBJECTS = \ $(OBJS)\qadll_dummy.obj \ $(OBJS)\qadll_debugrpt.obj \ @@ -819,10 +854,10 @@ QADLL_OBJECTS = \ QALIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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_qalib.csm \ - $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib -Hu \ + -H=$(OBJS)\wxprec_qalib.csm $(CPPFLAGS) $(CXXFLAGS) QALIB_OBJECTS = \ $(OBJS)\qalib_dummy.obj \ $(OBJS)\qalib_debugrpt.obj \ @@ -830,10 +865,11 @@ QALIB_OBJECTS = \ XMLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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_XML -Hu -H=$(OBJS)\wxprec_xmldll.csm $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_XML -Hu \ + -H=$(OBJS)\wxprec_xmldll.csm $(CPPFLAGS) $(CXXFLAGS) XMLDLL_OBJECTS = \ $(OBJS)\xmldll_dummy.obj \ $(OBJS)\xmldll_xml.obj \ @@ -841,10 +877,10 @@ XMLDLL_OBJECTS = \ XMLLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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 -Hu \ - -H=$(OBJS)\wxprec_xmllib.csm $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + -DwxUSE_GUI=0 -Hu -H=$(OBJS)\wxprec_xmllib.csm $(CPPFLAGS) $(CXXFLAGS) XMLLIB_OBJECTS = \ $(OBJS)\xmllib_dummy.obj \ $(OBJS)\xmllib_xml.obj \ @@ -852,10 +888,11 @@ XMLLIB_OBJECTS = \ XRCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + -DWXUSINGDLL -DWXMAKINGDLL_XRC -Hu -H=$(OBJS)\wxprec_xrcdll.csm $(CPPFLAGS) \ + $(CXXFLAGS) XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_dummy.obj \ $(OBJS)\xrcdll_xh_bmpbt.obj \ @@ -866,18 +903,26 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_chckl.obj \ $(OBJS)\xrcdll_xh_choic.obj \ $(OBJS)\xrcdll_xh_choicbk.obj \ + $(OBJS)\xrcdll_xh_clrpicker.obj \ $(OBJS)\xrcdll_xh_combo.obj \ $(OBJS)\xrcdll_xh_datectrl.obj \ + $(OBJS)\xrcdll_xh_dirpicker.obj \ $(OBJS)\xrcdll_xh_dlg.obj \ $(OBJS)\xrcdll_xh_frame.obj \ + $(OBJS)\xrcdll_xh_mdi.obj \ + $(OBJS)\xrcdll_xh_filepicker.obj \ + $(OBJS)\xrcdll_xh_fontpicker.obj \ $(OBJS)\xrcdll_xh_gauge.obj \ $(OBJS)\xrcdll_xh_gdctl.obj \ + $(OBJS)\xrcdll_xh_grid.obj \ $(OBJS)\xrcdll_xh_html.obj \ + $(OBJS)\xrcdll_xh_hyperlink.obj \ $(OBJS)\xrcdll_xh_listb.obj \ $(OBJS)\xrcdll_xh_listbk.obj \ $(OBJS)\xrcdll_xh_listc.obj \ $(OBJS)\xrcdll_xh_menu.obj \ $(OBJS)\xrcdll_xh_notbk.obj \ + $(OBJS)\xrcdll_xh_odcombo.obj \ $(OBJS)\xrcdll_xh_panel.obj \ $(OBJS)\xrcdll_xh_radbt.obj \ $(OBJS)\xrcdll_xh_radbx.obj \ @@ -896,6 +941,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_tglbtn.obj \ $(OBJS)\xrcdll_xh_toolb.obj \ $(OBJS)\xrcdll_xh_tree.obj \ + $(OBJS)\xrcdll_xh_treebk.obj \ $(OBJS)\xrcdll_xh_unkwn.obj \ $(OBJS)\xrcdll_xh_wizrd.obj \ $(OBJS)\xrcdll_xmlres.obj \ @@ -903,10 +949,10 @@ XRCDLL_OBJECTS = \ XRCLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib -Hu \ + -H=$(OBJS)\wxprec_xrclib.csm $(CPPFLAGS) $(CXXFLAGS) XRCLIB_OBJECTS = \ $(OBJS)\xrclib_dummy.obj \ $(OBJS)\xrclib_xh_bmpbt.obj \ @@ -917,18 +963,26 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_chckl.obj \ $(OBJS)\xrclib_xh_choic.obj \ $(OBJS)\xrclib_xh_choicbk.obj \ + $(OBJS)\xrclib_xh_clrpicker.obj \ $(OBJS)\xrclib_xh_combo.obj \ $(OBJS)\xrclib_xh_datectrl.obj \ + $(OBJS)\xrclib_xh_dirpicker.obj \ $(OBJS)\xrclib_xh_dlg.obj \ $(OBJS)\xrclib_xh_frame.obj \ + $(OBJS)\xrclib_xh_mdi.obj \ + $(OBJS)\xrclib_xh_filepicker.obj \ + $(OBJS)\xrclib_xh_fontpicker.obj \ $(OBJS)\xrclib_xh_gauge.obj \ $(OBJS)\xrclib_xh_gdctl.obj \ + $(OBJS)\xrclib_xh_grid.obj \ $(OBJS)\xrclib_xh_html.obj \ + $(OBJS)\xrclib_xh_hyperlink.obj \ $(OBJS)\xrclib_xh_listb.obj \ $(OBJS)\xrclib_xh_listbk.obj \ $(OBJS)\xrclib_xh_listc.obj \ $(OBJS)\xrclib_xh_menu.obj \ $(OBJS)\xrclib_xh_notbk.obj \ + $(OBJS)\xrclib_xh_odcombo.obj \ $(OBJS)\xrclib_xh_panel.obj \ $(OBJS)\xrclib_xh_radbt.obj \ $(OBJS)\xrclib_xh_radbx.obj \ @@ -947,27 +1001,83 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_tglbtn.obj \ $(OBJS)\xrclib_xh_toolb.obj \ $(OBJS)\xrclib_xh_tree.obj \ + $(OBJS)\xrclib_xh_treebk.obj \ $(OBJS)\xrclib_xh_unkwn.obj \ $(OBJS)\xrclib_xh_wizrd.obj \ $(OBJS)\xrclib_xmlres.obj \ $(OBJS)\xrclib_xmlrsall.obj +AUIDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + -DWXUSINGDLL -DWXMAKINGDLL_AUI -Hu -H=$(OBJS)\wxprec_auidll.csm $(CPPFLAGS) \ + $(CXXFLAGS) +AUIDLL_OBJECTS = \ + $(OBJS)\auidll_dummy.obj \ + $(OBJS)\auidll_framemanager.obj \ + $(OBJS)\auidll_dockart.obj \ + $(OBJS)\auidll_floatpane.obj +AUILIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib -Hu \ + -H=$(OBJS)\wxprec_auilib.csm $(CPPFLAGS) $(CXXFLAGS) +AUILIB_OBJECTS = \ + $(OBJS)\auilib_dummy.obj \ + $(OBJS)\auilib_framemanager.obj \ + $(OBJS)\auilib_dockart.obj \ + $(OBJS)\auilib_floatpane.obj +RICHTEXTDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + -DWXUSINGDLL -DWXMAKINGDLL_RICHTEXT -Hu -H=$(OBJS)\wxprec_richtextdll.csm \ + $(CPPFLAGS) $(CXXFLAGS) +RICHTEXTDLL_OBJECTS = \ + $(OBJS)\richtextdll_dummy.obj \ + $(OBJS)\richtextdll_richtextctrl.obj \ + $(OBJS)\richtextdll_richtextbuffer.obj \ + $(OBJS)\richtextdll_richtextstyles.obj \ + $(OBJS)\richtextdll_richtextxml.obj \ + $(OBJS)\richtextdll_richtexthtml.obj +RICHTEXTLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib -Hu \ + -H=$(OBJS)\wxprec_richtextlib.csm $(CPPFLAGS) $(CXXFLAGS) +RICHTEXTLIB_OBJECTS = \ + $(OBJS)\richtextlib_dummy.obj \ + $(OBJS)\richtextlib_richtextctrl.obj \ + $(OBJS)\richtextlib_richtextbuffer.obj \ + $(OBJS)\richtextlib_richtextstyles.obj \ + $(OBJS)\richtextlib_richtextxml.obj \ + $(OBJS)\richtextlib_richtexthtml.obj GLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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_GL -Hu \ - -H=$(OBJS)\wxprec_gldll.csm $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + -DWXUSINGDLL -DWXMAKINGDLL_GL -Hu -H=$(OBJS)\wxprec_gldll.csm $(CPPFLAGS) \ + $(CXXFLAGS) GLDLL_OBJECTS = \ $(OBJS)\gldll_dummy.obj \ $(OBJS)\gldll_glcanvas.obj GLLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -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_gllib.csm \ - $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I..\..\include -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib -Hu \ + -H=$(OBJS)\wxprec_gllib.csm $(CPPFLAGS) $(CXXFLAGS) GLLIB_OBJECTS = \ $(OBJS)\gllib_dummy.obj \ $(OBJS)\gllib_glcanvas.obj @@ -1032,11 +1142,15 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(____CORE_SRC_FILENAMES_OBJECTS) \ $(____ADVANCED_SRC_FILENAMES_OBJECTS) \ $(OBJS)\monodll_mediactrlcmn.obj \ - $(OBJS)\monodll_mediactrl.obj \ + $(OBJS)\monodll_mediactrl_am.obj \ + $(OBJS)\monodll_mediactrl_wmp10.obj \ + $(OBJS)\monodll_activex.obj \ $(OBJS)\monodll_helpbest.obj \ $(OBJS)\monodll_helpctrl.obj \ $(OBJS)\monodll_helpdata.obj \ + $(OBJS)\monodll_helpdlg.obj \ $(OBJS)\monodll_helpfrm.obj \ + $(OBJS)\monodll_helpwnd.obj \ $(OBJS)\monodll_htmlcell.obj \ $(OBJS)\monodll_htmlfilt.obj \ $(OBJS)\monodll_htmlpars.obj \ @@ -1068,18 +1182,26 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_chckl.obj \ $(OBJS)\monodll_xh_choic.obj \ $(OBJS)\monodll_xh_choicbk.obj \ + $(OBJS)\monodll_xh_clrpicker.obj \ $(OBJS)\monodll_xh_combo.obj \ $(OBJS)\monodll_xh_datectrl.obj \ + $(OBJS)\monodll_xh_dirpicker.obj \ $(OBJS)\monodll_xh_dlg.obj \ $(OBJS)\monodll_xh_frame.obj \ + $(OBJS)\monodll_xh_mdi.obj \ + $(OBJS)\monodll_xh_filepicker.obj \ + $(OBJS)\monodll_xh_fontpicker.obj \ $(OBJS)\monodll_xh_gauge.obj \ $(OBJS)\monodll_xh_gdctl.obj \ + $(OBJS)\monodll_xh_grid.obj \ $(OBJS)\monodll_xh_html.obj \ + $(OBJS)\monodll_xh_hyperlink.obj \ $(OBJS)\monodll_xh_listb.obj \ $(OBJS)\monodll_xh_listbk.obj \ $(OBJS)\monodll_xh_listc.obj \ $(OBJS)\monodll_xh_menu.obj \ $(OBJS)\monodll_xh_notbk.obj \ + $(OBJS)\monodll_xh_odcombo.obj \ $(OBJS)\monodll_xh_panel.obj \ $(OBJS)\monodll_xh_radbt.obj \ $(OBJS)\monodll_xh_radbx.obj \ @@ -1098,10 +1220,19 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_tglbtn.obj \ $(OBJS)\monodll_xh_toolb.obj \ $(OBJS)\monodll_xh_tree.obj \ + $(OBJS)\monodll_xh_treebk.obj \ $(OBJS)\monodll_xh_unkwn.obj \ $(OBJS)\monodll_xh_wizrd.obj \ $(OBJS)\monodll_xmlres.obj \ - $(OBJS)\monodll_xmlrsall.obj + $(OBJS)\monodll_xmlrsall.obj \ + $(OBJS)\monodll_framemanager.obj \ + $(OBJS)\monodll_dockart.obj \ + $(OBJS)\monodll_floatpane.obj \ + $(OBJS)\monodll_richtextctrl.obj \ + $(OBJS)\monodll_richtextbuffer.obj \ + $(OBJS)\monodll_richtextstyles.obj \ + $(OBJS)\monodll_richtextxml.obj \ + $(OBJS)\monodll_richtexthtml.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_OBJECTS = \ @@ -1159,9 +1290,9 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_bmpbuttn.obj \ $(OBJS)\monodll_button.obj \ $(OBJS)\monodll_checkbox.obj \ - $(OBJS)\monodll_checklst.obj \ $(OBJS)\monodll_choice.obj \ $(OBJS)\monodll_colordlg.obj \ + $(OBJS)\monodll_combo.obj \ $(OBJS)\monodll_combobox.obj \ $(OBJS)\monodll_control.obj \ $(OBJS)\monodll_dialog.obj \ @@ -1199,6 +1330,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_textctrl.obj \ $(OBJS)\monodll_tglbtn.obj \ $(OBJS)\monodll_treectrl.obj \ + $(OBJS)\monodll_checklst.obj \ $(OBJS)\monodll_fdrepdlg.obj \ $(OBJS)\monodll_fontdlg.obj \ $(OBJS)\monodll_accesscmn.obj \ @@ -1209,6 +1341,9 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_bookctrl.obj \ $(OBJS)\monodll_choiccmn.obj \ $(OBJS)\monodll_clipcmn.obj \ + $(OBJS)\monodll_clrpickercmn.obj \ + $(OBJS)\monodll_colourcmn.obj \ + $(OBJS)\monodll_combocmn.obj \ $(OBJS)\monodll_cmdproc.obj \ $(OBJS)\monodll_cmndata.obj \ $(OBJS)\monodll_containr.obj \ @@ -1225,9 +1360,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dpycmn.obj \ $(OBJS)\monodll_dseldlg.obj \ $(OBJS)\monodll_effects.obj \ + $(OBJS)\monodll_evtloopcmn.obj \ $(OBJS)\monodll_fddlgcmn.obj \ + $(OBJS)\monodll_filepickercmn.obj \ + $(OBJS)\monodll_fontpickercmn.obj \ $(OBJS)\monodll_fldlgcmn.obj \ $(OBJS)\monodll_fontcmn.obj \ + $(OBJS)\monodll_fontenumcmn.obj \ $(OBJS)\monodll_fontmap.obj \ $(OBJS)\monodll_framecmn.obj \ $(OBJS)\monodll_gaugecmn.obj \ @@ -1255,6 +1394,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_menucmn.obj \ $(OBJS)\monodll_nbkbase.obj \ $(OBJS)\monodll_paper.obj \ + $(OBJS)\monodll_pickerbase.obj \ $(OBJS)\monodll_popupcmn.obj \ $(OBJS)\monodll_prntbase.obj \ $(OBJS)\monodll_quantize.obj \ @@ -1276,11 +1416,16 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_wincmn.obj \ $(OBJS)\monodll_xpmdecod.obj \ $(OBJS)\monodll_busyinfo.obj \ + $(OBJS)\monodll_buttonbar.obj \ $(OBJS)\monodll_choicdgg.obj \ $(OBJS)\monodll_choicbkg.obj \ + $(OBJS)\monodll_clrpickerg.obj \ + $(OBJS)\monodll_combog.obj \ $(OBJS)\monodll_dcpsg.obj \ $(OBJS)\monodll_dirctrlg.obj \ $(OBJS)\monodll_dragimgg.obj \ + $(OBJS)\monodll_filepickerg.obj \ + $(OBJS)\monodll_fontpickerg.obj \ $(OBJS)\monodll_listbkg.obj \ $(OBJS)\monodll_logg.obj \ $(OBJS)\monodll_numdlgg.obj \ @@ -1294,7 +1439,9 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_splitter.obj \ $(OBJS)\monodll_textdlgg.obj \ $(OBJS)\monodll_tipwin.obj \ + $(OBJS)\monodll_toolbkg.obj \ $(OBJS)\monodll_treectlg.obj \ + $(OBJS)\monodll_treebkg.obj \ $(OBJS)\monodll_vlbox.obj \ $(OBJS)\monodll_vscroll.obj !endif @@ -1390,6 +1537,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_stattext.obj \ $(OBJS)\monodll_statusbr.obj \ $(OBJS)\monodll_textctrl.obj \ + $(OBJS)\monodll_tglbtn.obj \ $(OBJS)\monodll_theme.obj \ $(OBJS)\monodll_toolbar.obj \ $(OBJS)\monodll_topluniv.obj \ @@ -1405,6 +1553,9 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_bookctrl.obj \ $(OBJS)\monodll_choiccmn.obj \ $(OBJS)\monodll_clipcmn.obj \ + $(OBJS)\monodll_clrpickercmn.obj \ + $(OBJS)\monodll_colourcmn.obj \ + $(OBJS)\monodll_combocmn.obj \ $(OBJS)\monodll_cmdproc.obj \ $(OBJS)\monodll_cmndata.obj \ $(OBJS)\monodll_containr.obj \ @@ -1421,9 +1572,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dpycmn.obj \ $(OBJS)\monodll_dseldlg.obj \ $(OBJS)\monodll_effects.obj \ + $(OBJS)\monodll_evtloopcmn.obj \ $(OBJS)\monodll_fddlgcmn.obj \ + $(OBJS)\monodll_filepickercmn.obj \ + $(OBJS)\monodll_fontpickercmn.obj \ $(OBJS)\monodll_fldlgcmn.obj \ $(OBJS)\monodll_fontcmn.obj \ + $(OBJS)\monodll_fontenumcmn.obj \ $(OBJS)\monodll_fontmap.obj \ $(OBJS)\monodll_framecmn.obj \ $(OBJS)\monodll_gaugecmn.obj \ @@ -1451,6 +1606,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_menucmn.obj \ $(OBJS)\monodll_nbkbase.obj \ $(OBJS)\monodll_paper.obj \ + $(OBJS)\monodll_pickerbase.obj \ $(OBJS)\monodll_popupcmn.obj \ $(OBJS)\monodll_prntbase.obj \ $(OBJS)\monodll_quantize.obj \ @@ -1472,11 +1628,16 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_wincmn.obj \ $(OBJS)\monodll_xpmdecod.obj \ $(OBJS)\monodll_busyinfo.obj \ + $(OBJS)\monodll_buttonbar.obj \ $(OBJS)\monodll_choicdgg.obj \ $(OBJS)\monodll_choicbkg.obj \ + $(OBJS)\monodll_clrpickerg.obj \ + $(OBJS)\monodll_combog.obj \ $(OBJS)\monodll_dcpsg.obj \ $(OBJS)\monodll_dirctrlg.obj \ $(OBJS)\monodll_dragimgg.obj \ + $(OBJS)\monodll_filepickerg.obj \ + $(OBJS)\monodll_fontpickerg.obj \ $(OBJS)\monodll_listbkg.obj \ $(OBJS)\monodll_logg.obj \ $(OBJS)\monodll_numdlgg.obj \ @@ -1490,19 +1651,25 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_splitter.obj \ $(OBJS)\monodll_textdlgg.obj \ $(OBJS)\monodll_tipwin.obj \ + $(OBJS)\monodll_toolbkg.obj \ $(OBJS)\monodll_treectlg.obj \ + $(OBJS)\monodll_treebkg.obj \ $(OBJS)\monodll_vlbox.obj \ $(OBJS)\monodll_vscroll.obj !endif !if "$(WXUNIV)" == "0" ____ADVANCED_SRC_FILENAMES_OBJECTS = \ + $(OBJS)\monodll_datavcmn.obj \ $(OBJS)\monodll_calctrl.obj \ + $(OBJS)\monodll_datavgen.obj \ $(OBJS)\monodll_datectlg.obj \ $(OBJS)\monodll_grid.obj \ $(OBJS)\monodll_gridctrl.obj \ $(OBJS)\monodll_gridsel.obj \ $(OBJS)\monodll_helpext.obj \ + $(OBJS)\monodll_hyperlink.obj \ $(OBJS)\monodll_laywin.obj \ + $(OBJS)\monodll_odcombo.obj \ $(OBJS)\monodll_propdlg.obj \ $(OBJS)\monodll_sashwin.obj \ $(OBJS)\monodll_splash.obj \ @@ -1516,13 +1683,17 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ !endif !if "$(WXUNIV)" == "1" ____ADVANCED_SRC_FILENAMES_OBJECTS = \ + $(OBJS)\monodll_datavcmn.obj \ $(OBJS)\monodll_calctrl.obj \ + $(OBJS)\monodll_datavgen.obj \ $(OBJS)\monodll_datectlg.obj \ $(OBJS)\monodll_grid.obj \ $(OBJS)\monodll_gridctrl.obj \ $(OBJS)\monodll_gridsel.obj \ $(OBJS)\monodll_helpext.obj \ + $(OBJS)\monodll_hyperlink.obj \ $(OBJS)\monodll_laywin.obj \ + $(OBJS)\monodll_odcombo.obj \ $(OBJS)\monodll_propdlg.obj \ $(OBJS)\monodll_sashwin.obj \ $(OBJS)\monodll_splash.obj \ @@ -1542,11 +1713,15 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(____CORE_SRC_FILENAMES_1_OBJECTS) \ $(____ADVANCED_SRC_FILENAMES_1_OBJECTS) \ $(OBJS)\monolib_mediactrlcmn.obj \ - $(OBJS)\monolib_mediactrl.obj \ + $(OBJS)\monolib_mediactrl_am.obj \ + $(OBJS)\monolib_mediactrl_wmp10.obj \ + $(OBJS)\monolib_activex.obj \ $(OBJS)\monolib_helpbest.obj \ $(OBJS)\monolib_helpctrl.obj \ $(OBJS)\monolib_helpdata.obj \ + $(OBJS)\monolib_helpdlg.obj \ $(OBJS)\monolib_helpfrm.obj \ + $(OBJS)\monolib_helpwnd.obj \ $(OBJS)\monolib_htmlcell.obj \ $(OBJS)\monolib_htmlfilt.obj \ $(OBJS)\monolib_htmlpars.obj \ @@ -1578,18 +1753,26 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_chckl.obj \ $(OBJS)\monolib_xh_choic.obj \ $(OBJS)\monolib_xh_choicbk.obj \ + $(OBJS)\monolib_xh_clrpicker.obj \ $(OBJS)\monolib_xh_combo.obj \ $(OBJS)\monolib_xh_datectrl.obj \ + $(OBJS)\monolib_xh_dirpicker.obj \ $(OBJS)\monolib_xh_dlg.obj \ $(OBJS)\monolib_xh_frame.obj \ + $(OBJS)\monolib_xh_mdi.obj \ + $(OBJS)\monolib_xh_filepicker.obj \ + $(OBJS)\monolib_xh_fontpicker.obj \ $(OBJS)\monolib_xh_gauge.obj \ $(OBJS)\monolib_xh_gdctl.obj \ + $(OBJS)\monolib_xh_grid.obj \ $(OBJS)\monolib_xh_html.obj \ + $(OBJS)\monolib_xh_hyperlink.obj \ $(OBJS)\monolib_xh_listb.obj \ $(OBJS)\monolib_xh_listbk.obj \ $(OBJS)\monolib_xh_listc.obj \ $(OBJS)\monolib_xh_menu.obj \ $(OBJS)\monolib_xh_notbk.obj \ + $(OBJS)\monolib_xh_odcombo.obj \ $(OBJS)\monolib_xh_panel.obj \ $(OBJS)\monolib_xh_radbt.obj \ $(OBJS)\monolib_xh_radbx.obj \ @@ -1608,10 +1791,19 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_tglbtn.obj \ $(OBJS)\monolib_xh_toolb.obj \ $(OBJS)\monolib_xh_tree.obj \ + $(OBJS)\monolib_xh_treebk.obj \ $(OBJS)\monolib_xh_unkwn.obj \ $(OBJS)\monolib_xh_wizrd.obj \ $(OBJS)\monolib_xmlres.obj \ - $(OBJS)\monolib_xmlrsall.obj + $(OBJS)\monolib_xmlrsall.obj \ + $(OBJS)\monolib_framemanager.obj \ + $(OBJS)\monolib_dockart.obj \ + $(OBJS)\monolib_floatpane.obj \ + $(OBJS)\monolib_richtextctrl.obj \ + $(OBJS)\monolib_richtextbuffer.obj \ + $(OBJS)\monolib_richtextstyles.obj \ + $(OBJS)\monolib_richtextxml.obj \ + $(OBJS)\monolib_richtexthtml.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_1_OBJECTS = \ @@ -1669,9 +1861,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_bmpbuttn.obj \ $(OBJS)\monolib_button.obj \ $(OBJS)\monolib_checkbox.obj \ - $(OBJS)\monolib_checklst.obj \ $(OBJS)\monolib_choice.obj \ $(OBJS)\monolib_colordlg.obj \ + $(OBJS)\monolib_combo.obj \ $(OBJS)\monolib_combobox.obj \ $(OBJS)\monolib_control.obj \ $(OBJS)\monolib_dialog.obj \ @@ -1709,6 +1901,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_textctrl.obj \ $(OBJS)\monolib_tglbtn.obj \ $(OBJS)\monolib_treectrl.obj \ + $(OBJS)\monolib_checklst.obj \ $(OBJS)\monolib_fdrepdlg.obj \ $(OBJS)\monolib_fontdlg.obj \ $(OBJS)\monolib_accesscmn.obj \ @@ -1719,6 +1912,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_bookctrl.obj \ $(OBJS)\monolib_choiccmn.obj \ $(OBJS)\monolib_clipcmn.obj \ + $(OBJS)\monolib_clrpickercmn.obj \ + $(OBJS)\monolib_colourcmn.obj \ + $(OBJS)\monolib_combocmn.obj \ $(OBJS)\monolib_cmdproc.obj \ $(OBJS)\monolib_cmndata.obj \ $(OBJS)\monolib_containr.obj \ @@ -1735,9 +1931,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dpycmn.obj \ $(OBJS)\monolib_dseldlg.obj \ $(OBJS)\monolib_effects.obj \ + $(OBJS)\monolib_evtloopcmn.obj \ $(OBJS)\monolib_fddlgcmn.obj \ + $(OBJS)\monolib_filepickercmn.obj \ + $(OBJS)\monolib_fontpickercmn.obj \ $(OBJS)\monolib_fldlgcmn.obj \ $(OBJS)\monolib_fontcmn.obj \ + $(OBJS)\monolib_fontenumcmn.obj \ $(OBJS)\monolib_fontmap.obj \ $(OBJS)\monolib_framecmn.obj \ $(OBJS)\monolib_gaugecmn.obj \ @@ -1765,6 +1965,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_menucmn.obj \ $(OBJS)\monolib_nbkbase.obj \ $(OBJS)\monolib_paper.obj \ + $(OBJS)\monolib_pickerbase.obj \ $(OBJS)\monolib_popupcmn.obj \ $(OBJS)\monolib_prntbase.obj \ $(OBJS)\monolib_quantize.obj \ @@ -1786,11 +1987,16 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_wincmn.obj \ $(OBJS)\monolib_xpmdecod.obj \ $(OBJS)\monolib_busyinfo.obj \ + $(OBJS)\monolib_buttonbar.obj \ $(OBJS)\monolib_choicdgg.obj \ $(OBJS)\monolib_choicbkg.obj \ + $(OBJS)\monolib_clrpickerg.obj \ + $(OBJS)\monolib_combog.obj \ $(OBJS)\monolib_dcpsg.obj \ $(OBJS)\monolib_dirctrlg.obj \ $(OBJS)\monolib_dragimgg.obj \ + $(OBJS)\monolib_filepickerg.obj \ + $(OBJS)\monolib_fontpickerg.obj \ $(OBJS)\monolib_listbkg.obj \ $(OBJS)\monolib_logg.obj \ $(OBJS)\monolib_numdlgg.obj \ @@ -1804,7 +2010,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_splitter.obj \ $(OBJS)\monolib_textdlgg.obj \ $(OBJS)\monolib_tipwin.obj \ + $(OBJS)\monolib_toolbkg.obj \ $(OBJS)\monolib_treectlg.obj \ + $(OBJS)\monolib_treebkg.obj \ $(OBJS)\monolib_vlbox.obj \ $(OBJS)\monolib_vscroll.obj !endif @@ -1900,6 +2108,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_stattext.obj \ $(OBJS)\monolib_statusbr.obj \ $(OBJS)\monolib_textctrl.obj \ + $(OBJS)\monolib_tglbtn.obj \ $(OBJS)\monolib_theme.obj \ $(OBJS)\monolib_toolbar.obj \ $(OBJS)\monolib_topluniv.obj \ @@ -1915,6 +2124,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_bookctrl.obj \ $(OBJS)\monolib_choiccmn.obj \ $(OBJS)\monolib_clipcmn.obj \ + $(OBJS)\monolib_clrpickercmn.obj \ + $(OBJS)\monolib_colourcmn.obj \ + $(OBJS)\monolib_combocmn.obj \ $(OBJS)\monolib_cmdproc.obj \ $(OBJS)\monolib_cmndata.obj \ $(OBJS)\monolib_containr.obj \ @@ -1931,9 +2143,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dpycmn.obj \ $(OBJS)\monolib_dseldlg.obj \ $(OBJS)\monolib_effects.obj \ + $(OBJS)\monolib_evtloopcmn.obj \ $(OBJS)\monolib_fddlgcmn.obj \ + $(OBJS)\monolib_filepickercmn.obj \ + $(OBJS)\monolib_fontpickercmn.obj \ $(OBJS)\monolib_fldlgcmn.obj \ $(OBJS)\monolib_fontcmn.obj \ + $(OBJS)\monolib_fontenumcmn.obj \ $(OBJS)\monolib_fontmap.obj \ $(OBJS)\monolib_framecmn.obj \ $(OBJS)\monolib_gaugecmn.obj \ @@ -1961,6 +2177,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_menucmn.obj \ $(OBJS)\monolib_nbkbase.obj \ $(OBJS)\monolib_paper.obj \ + $(OBJS)\monolib_pickerbase.obj \ $(OBJS)\monolib_popupcmn.obj \ $(OBJS)\monolib_prntbase.obj \ $(OBJS)\monolib_quantize.obj \ @@ -1982,11 +2199,16 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_wincmn.obj \ $(OBJS)\monolib_xpmdecod.obj \ $(OBJS)\monolib_busyinfo.obj \ + $(OBJS)\monolib_buttonbar.obj \ $(OBJS)\monolib_choicdgg.obj \ $(OBJS)\monolib_choicbkg.obj \ + $(OBJS)\monolib_clrpickerg.obj \ + $(OBJS)\monolib_combog.obj \ $(OBJS)\monolib_dcpsg.obj \ $(OBJS)\monolib_dirctrlg.obj \ $(OBJS)\monolib_dragimgg.obj \ + $(OBJS)\monolib_filepickerg.obj \ + $(OBJS)\monolib_fontpickerg.obj \ $(OBJS)\monolib_listbkg.obj \ $(OBJS)\monolib_logg.obj \ $(OBJS)\monolib_numdlgg.obj \ @@ -2000,19 +2222,25 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_splitter.obj \ $(OBJS)\monolib_textdlgg.obj \ $(OBJS)\monolib_tipwin.obj \ + $(OBJS)\monolib_toolbkg.obj \ $(OBJS)\monolib_treectlg.obj \ + $(OBJS)\monolib_treebkg.obj \ $(OBJS)\monolib_vlbox.obj \ $(OBJS)\monolib_vscroll.obj !endif !if "$(WXUNIV)" == "0" ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ + $(OBJS)\monolib_datavcmn.obj \ $(OBJS)\monolib_calctrl.obj \ + $(OBJS)\monolib_datavgen.obj \ $(OBJS)\monolib_datectlg.obj \ $(OBJS)\monolib_grid.obj \ $(OBJS)\monolib_gridctrl.obj \ $(OBJS)\monolib_gridsel.obj \ $(OBJS)\monolib_helpext.obj \ + $(OBJS)\monolib_hyperlink.obj \ $(OBJS)\monolib_laywin.obj \ + $(OBJS)\monolib_odcombo.obj \ $(OBJS)\monolib_propdlg.obj \ $(OBJS)\monolib_sashwin.obj \ $(OBJS)\monolib_splash.obj \ @@ -2026,13 +2254,17 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ !endif !if "$(WXUNIV)" == "1" ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ + $(OBJS)\monolib_datavcmn.obj \ $(OBJS)\monolib_calctrl.obj \ + $(OBJS)\monolib_datavgen.obj \ $(OBJS)\monolib_datectlg.obj \ $(OBJS)\monolib_grid.obj \ $(OBJS)\monolib_gridctrl.obj \ $(OBJS)\monolib_gridsel.obj \ $(OBJS)\monolib_helpext.obj \ + $(OBJS)\monolib_hyperlink.obj \ $(OBJS)\monolib_laywin.obj \ + $(OBJS)\monolib_odcombo.obj \ $(OBJS)\monolib_propdlg.obj \ $(OBJS)\monolib_sashwin.obj \ $(OBJS)\monolib_splash.obj \ @@ -2119,9 +2351,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_bmpbuttn.obj \ $(OBJS)\coredll_button.obj \ $(OBJS)\coredll_checkbox.obj \ - $(OBJS)\coredll_checklst.obj \ $(OBJS)\coredll_choice.obj \ $(OBJS)\coredll_colordlg.obj \ + $(OBJS)\coredll_combo.obj \ $(OBJS)\coredll_combobox.obj \ $(OBJS)\coredll_control.obj \ $(OBJS)\coredll_dialog.obj \ @@ -2159,6 +2391,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_textctrl.obj \ $(OBJS)\coredll_tglbtn.obj \ $(OBJS)\coredll_treectrl.obj \ + $(OBJS)\coredll_checklst.obj \ $(OBJS)\coredll_fdrepdlg.obj \ $(OBJS)\coredll_fontdlg.obj \ $(OBJS)\coredll_accesscmn.obj \ @@ -2169,6 +2402,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_bookctrl.obj \ $(OBJS)\coredll_choiccmn.obj \ $(OBJS)\coredll_clipcmn.obj \ + $(OBJS)\coredll_clrpickercmn.obj \ + $(OBJS)\coredll_colourcmn.obj \ + $(OBJS)\coredll_combocmn.obj \ $(OBJS)\coredll_cmdproc.obj \ $(OBJS)\coredll_cmndata.obj \ $(OBJS)\coredll_containr.obj \ @@ -2185,9 +2421,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dpycmn.obj \ $(OBJS)\coredll_dseldlg.obj \ $(OBJS)\coredll_effects.obj \ + $(OBJS)\coredll_evtloopcmn.obj \ $(OBJS)\coredll_fddlgcmn.obj \ + $(OBJS)\coredll_filepickercmn.obj \ + $(OBJS)\coredll_fontpickercmn.obj \ $(OBJS)\coredll_fldlgcmn.obj \ $(OBJS)\coredll_fontcmn.obj \ + $(OBJS)\coredll_fontenumcmn.obj \ $(OBJS)\coredll_fontmap.obj \ $(OBJS)\coredll_framecmn.obj \ $(OBJS)\coredll_gaugecmn.obj \ @@ -2215,6 +2455,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_menucmn.obj \ $(OBJS)\coredll_nbkbase.obj \ $(OBJS)\coredll_paper.obj \ + $(OBJS)\coredll_pickerbase.obj \ $(OBJS)\coredll_popupcmn.obj \ $(OBJS)\coredll_prntbase.obj \ $(OBJS)\coredll_quantize.obj \ @@ -2236,11 +2477,16 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_wincmn.obj \ $(OBJS)\coredll_xpmdecod.obj \ $(OBJS)\coredll_busyinfo.obj \ + $(OBJS)\coredll_buttonbar.obj \ $(OBJS)\coredll_choicdgg.obj \ $(OBJS)\coredll_choicbkg.obj \ + $(OBJS)\coredll_clrpickerg.obj \ + $(OBJS)\coredll_combog.obj \ $(OBJS)\coredll_dcpsg.obj \ $(OBJS)\coredll_dirctrlg.obj \ $(OBJS)\coredll_dragimgg.obj \ + $(OBJS)\coredll_filepickerg.obj \ + $(OBJS)\coredll_fontpickerg.obj \ $(OBJS)\coredll_listbkg.obj \ $(OBJS)\coredll_logg.obj \ $(OBJS)\coredll_numdlgg.obj \ @@ -2254,7 +2500,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_splitter.obj \ $(OBJS)\coredll_textdlgg.obj \ $(OBJS)\coredll_tipwin.obj \ + $(OBJS)\coredll_toolbkg.obj \ $(OBJS)\coredll_treectlg.obj \ + $(OBJS)\coredll_treebkg.obj \ $(OBJS)\coredll_vlbox.obj \ $(OBJS)\coredll_vscroll.obj !endif @@ -2350,6 +2598,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_stattext.obj \ $(OBJS)\coredll_statusbr.obj \ $(OBJS)\coredll_textctrl.obj \ + $(OBJS)\coredll_tglbtn.obj \ $(OBJS)\coredll_theme.obj \ $(OBJS)\coredll_toolbar.obj \ $(OBJS)\coredll_topluniv.obj \ @@ -2365,6 +2614,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_bookctrl.obj \ $(OBJS)\coredll_choiccmn.obj \ $(OBJS)\coredll_clipcmn.obj \ + $(OBJS)\coredll_clrpickercmn.obj \ + $(OBJS)\coredll_colourcmn.obj \ + $(OBJS)\coredll_combocmn.obj \ $(OBJS)\coredll_cmdproc.obj \ $(OBJS)\coredll_cmndata.obj \ $(OBJS)\coredll_containr.obj \ @@ -2381,9 +2633,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dpycmn.obj \ $(OBJS)\coredll_dseldlg.obj \ $(OBJS)\coredll_effects.obj \ + $(OBJS)\coredll_evtloopcmn.obj \ $(OBJS)\coredll_fddlgcmn.obj \ + $(OBJS)\coredll_filepickercmn.obj \ + $(OBJS)\coredll_fontpickercmn.obj \ $(OBJS)\coredll_fldlgcmn.obj \ $(OBJS)\coredll_fontcmn.obj \ + $(OBJS)\coredll_fontenumcmn.obj \ $(OBJS)\coredll_fontmap.obj \ $(OBJS)\coredll_framecmn.obj \ $(OBJS)\coredll_gaugecmn.obj \ @@ -2411,6 +2667,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_menucmn.obj \ $(OBJS)\coredll_nbkbase.obj \ $(OBJS)\coredll_paper.obj \ + $(OBJS)\coredll_pickerbase.obj \ $(OBJS)\coredll_popupcmn.obj \ $(OBJS)\coredll_prntbase.obj \ $(OBJS)\coredll_quantize.obj \ @@ -2432,11 +2689,16 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_wincmn.obj \ $(OBJS)\coredll_xpmdecod.obj \ $(OBJS)\coredll_busyinfo.obj \ + $(OBJS)\coredll_buttonbar.obj \ $(OBJS)\coredll_choicdgg.obj \ $(OBJS)\coredll_choicbkg.obj \ + $(OBJS)\coredll_clrpickerg.obj \ + $(OBJS)\coredll_combog.obj \ $(OBJS)\coredll_dcpsg.obj \ $(OBJS)\coredll_dirctrlg.obj \ $(OBJS)\coredll_dragimgg.obj \ + $(OBJS)\coredll_filepickerg.obj \ + $(OBJS)\coredll_fontpickerg.obj \ $(OBJS)\coredll_listbkg.obj \ $(OBJS)\coredll_logg.obj \ $(OBJS)\coredll_numdlgg.obj \ @@ -2450,7 +2712,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_splitter.obj \ $(OBJS)\coredll_textdlgg.obj \ $(OBJS)\coredll_tipwin.obj \ + $(OBJS)\coredll_toolbkg.obj \ $(OBJS)\coredll_treectlg.obj \ + $(OBJS)\coredll_treebkg.obj \ $(OBJS)\coredll_vlbox.obj \ $(OBJS)\coredll_vscroll.obj !endif @@ -2514,9 +2778,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_bmpbuttn.obj \ $(OBJS)\corelib_button.obj \ $(OBJS)\corelib_checkbox.obj \ - $(OBJS)\corelib_checklst.obj \ $(OBJS)\corelib_choice.obj \ $(OBJS)\corelib_colordlg.obj \ + $(OBJS)\corelib_combo.obj \ $(OBJS)\corelib_combobox.obj \ $(OBJS)\corelib_control.obj \ $(OBJS)\corelib_dialog.obj \ @@ -2554,6 +2818,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_textctrl.obj \ $(OBJS)\corelib_tglbtn.obj \ $(OBJS)\corelib_treectrl.obj \ + $(OBJS)\corelib_checklst.obj \ $(OBJS)\corelib_fdrepdlg.obj \ $(OBJS)\corelib_fontdlg.obj \ $(OBJS)\corelib_accesscmn.obj \ @@ -2564,6 +2829,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_bookctrl.obj \ $(OBJS)\corelib_choiccmn.obj \ $(OBJS)\corelib_clipcmn.obj \ + $(OBJS)\corelib_clrpickercmn.obj \ + $(OBJS)\corelib_colourcmn.obj \ + $(OBJS)\corelib_combocmn.obj \ $(OBJS)\corelib_cmdproc.obj \ $(OBJS)\corelib_cmndata.obj \ $(OBJS)\corelib_containr.obj \ @@ -2580,9 +2848,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dpycmn.obj \ $(OBJS)\corelib_dseldlg.obj \ $(OBJS)\corelib_effects.obj \ + $(OBJS)\corelib_evtloopcmn.obj \ $(OBJS)\corelib_fddlgcmn.obj \ + $(OBJS)\corelib_filepickercmn.obj \ + $(OBJS)\corelib_fontpickercmn.obj \ $(OBJS)\corelib_fldlgcmn.obj \ $(OBJS)\corelib_fontcmn.obj \ + $(OBJS)\corelib_fontenumcmn.obj \ $(OBJS)\corelib_fontmap.obj \ $(OBJS)\corelib_framecmn.obj \ $(OBJS)\corelib_gaugecmn.obj \ @@ -2610,6 +2882,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_menucmn.obj \ $(OBJS)\corelib_nbkbase.obj \ $(OBJS)\corelib_paper.obj \ + $(OBJS)\corelib_pickerbase.obj \ $(OBJS)\corelib_popupcmn.obj \ $(OBJS)\corelib_prntbase.obj \ $(OBJS)\corelib_quantize.obj \ @@ -2631,11 +2904,16 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_wincmn.obj \ $(OBJS)\corelib_xpmdecod.obj \ $(OBJS)\corelib_busyinfo.obj \ + $(OBJS)\corelib_buttonbar.obj \ $(OBJS)\corelib_choicdgg.obj \ $(OBJS)\corelib_choicbkg.obj \ + $(OBJS)\corelib_clrpickerg.obj \ + $(OBJS)\corelib_combog.obj \ $(OBJS)\corelib_dcpsg.obj \ $(OBJS)\corelib_dirctrlg.obj \ $(OBJS)\corelib_dragimgg.obj \ + $(OBJS)\corelib_filepickerg.obj \ + $(OBJS)\corelib_fontpickerg.obj \ $(OBJS)\corelib_listbkg.obj \ $(OBJS)\corelib_logg.obj \ $(OBJS)\corelib_numdlgg.obj \ @@ -2649,7 +2927,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_splitter.obj \ $(OBJS)\corelib_textdlgg.obj \ $(OBJS)\corelib_tipwin.obj \ + $(OBJS)\corelib_toolbkg.obj \ $(OBJS)\corelib_treectlg.obj \ + $(OBJS)\corelib_treebkg.obj \ $(OBJS)\corelib_vlbox.obj \ $(OBJS)\corelib_vscroll.obj !endif @@ -2745,6 +3025,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_stattext.obj \ $(OBJS)\corelib_statusbr.obj \ $(OBJS)\corelib_textctrl.obj \ + $(OBJS)\corelib_tglbtn.obj \ $(OBJS)\corelib_theme.obj \ $(OBJS)\corelib_toolbar.obj \ $(OBJS)\corelib_topluniv.obj \ @@ -2760,6 +3041,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_bookctrl.obj \ $(OBJS)\corelib_choiccmn.obj \ $(OBJS)\corelib_clipcmn.obj \ + $(OBJS)\corelib_clrpickercmn.obj \ + $(OBJS)\corelib_colourcmn.obj \ + $(OBJS)\corelib_combocmn.obj \ $(OBJS)\corelib_cmdproc.obj \ $(OBJS)\corelib_cmndata.obj \ $(OBJS)\corelib_containr.obj \ @@ -2776,9 +3060,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dpycmn.obj \ $(OBJS)\corelib_dseldlg.obj \ $(OBJS)\corelib_effects.obj \ + $(OBJS)\corelib_evtloopcmn.obj \ $(OBJS)\corelib_fddlgcmn.obj \ + $(OBJS)\corelib_filepickercmn.obj \ + $(OBJS)\corelib_fontpickercmn.obj \ $(OBJS)\corelib_fldlgcmn.obj \ $(OBJS)\corelib_fontcmn.obj \ + $(OBJS)\corelib_fontenumcmn.obj \ $(OBJS)\corelib_fontmap.obj \ $(OBJS)\corelib_framecmn.obj \ $(OBJS)\corelib_gaugecmn.obj \ @@ -2806,6 +3094,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_menucmn.obj \ $(OBJS)\corelib_nbkbase.obj \ $(OBJS)\corelib_paper.obj \ + $(OBJS)\corelib_pickerbase.obj \ $(OBJS)\corelib_popupcmn.obj \ $(OBJS)\corelib_prntbase.obj \ $(OBJS)\corelib_quantize.obj \ @@ -2827,11 +3116,16 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_wincmn.obj \ $(OBJS)\corelib_xpmdecod.obj \ $(OBJS)\corelib_busyinfo.obj \ + $(OBJS)\corelib_buttonbar.obj \ $(OBJS)\corelib_choicdgg.obj \ $(OBJS)\corelib_choicbkg.obj \ + $(OBJS)\corelib_clrpickerg.obj \ + $(OBJS)\corelib_combog.obj \ $(OBJS)\corelib_dcpsg.obj \ $(OBJS)\corelib_dirctrlg.obj \ $(OBJS)\corelib_dragimgg.obj \ + $(OBJS)\corelib_filepickerg.obj \ + $(OBJS)\corelib_fontpickerg.obj \ $(OBJS)\corelib_listbkg.obj \ $(OBJS)\corelib_logg.obj \ $(OBJS)\corelib_numdlgg.obj \ @@ -2845,7 +3139,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_splitter.obj \ $(OBJS)\corelib_textdlgg.obj \ $(OBJS)\corelib_tipwin.obj \ + $(OBJS)\corelib_toolbkg.obj \ $(OBJS)\corelib_treectlg.obj \ + $(OBJS)\corelib_treebkg.obj \ $(OBJS)\corelib_vlbox.obj \ $(OBJS)\corelib_vscroll.obj !endif @@ -2855,13 +3151,17 @@ __advdll___depname = \ !endif !if "$(WXUNIV)" == "0" ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ + $(OBJS)\advdll_datavcmn.obj \ $(OBJS)\advdll_calctrl.obj \ + $(OBJS)\advdll_datavgen.obj \ $(OBJS)\advdll_datectlg.obj \ $(OBJS)\advdll_grid.obj \ $(OBJS)\advdll_gridctrl.obj \ $(OBJS)\advdll_gridsel.obj \ $(OBJS)\advdll_helpext.obj \ + $(OBJS)\advdll_hyperlink.obj \ $(OBJS)\advdll_laywin.obj \ + $(OBJS)\advdll_odcombo.obj \ $(OBJS)\advdll_propdlg.obj \ $(OBJS)\advdll_sashwin.obj \ $(OBJS)\advdll_splash.obj \ @@ -2875,13 +3175,17 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ !endif !if "$(WXUNIV)" == "1" ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ + $(OBJS)\advdll_datavcmn.obj \ $(OBJS)\advdll_calctrl.obj \ + $(OBJS)\advdll_datavgen.obj \ $(OBJS)\advdll_datectlg.obj \ $(OBJS)\advdll_grid.obj \ $(OBJS)\advdll_gridctrl.obj \ $(OBJS)\advdll_gridsel.obj \ $(OBJS)\advdll_helpext.obj \ + $(OBJS)\advdll_hyperlink.obj \ $(OBJS)\advdll_laywin.obj \ + $(OBJS)\advdll_odcombo.obj \ $(OBJS)\advdll_propdlg.obj \ $(OBJS)\advdll_sashwin.obj \ $(OBJS)\advdll_splash.obj \ @@ -2898,13 +3202,17 @@ __advlib___depname = \ !endif !if "$(WXUNIV)" == "0" ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ + $(OBJS)\advlib_datavcmn.obj \ $(OBJS)\advlib_calctrl.obj \ + $(OBJS)\advlib_datavgen.obj \ $(OBJS)\advlib_datectlg.obj \ $(OBJS)\advlib_grid.obj \ $(OBJS)\advlib_gridctrl.obj \ $(OBJS)\advlib_gridsel.obj \ $(OBJS)\advlib_helpext.obj \ + $(OBJS)\advlib_hyperlink.obj \ $(OBJS)\advlib_laywin.obj \ + $(OBJS)\advlib_odcombo.obj \ $(OBJS)\advlib_propdlg.obj \ $(OBJS)\advlib_sashwin.obj \ $(OBJS)\advlib_splash.obj \ @@ -2918,13 +3226,17 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ !endif !if "$(WXUNIV)" == "1" ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ + $(OBJS)\advlib_datavcmn.obj \ $(OBJS)\advlib_calctrl.obj \ + $(OBJS)\advlib_datavgen.obj \ $(OBJS)\advlib_datectlg.obj \ $(OBJS)\advlib_grid.obj \ $(OBJS)\advlib_gridctrl.obj \ $(OBJS)\advlib_gridsel.obj \ $(OBJS)\advlib_helpext.obj \ + $(OBJS)\advlib_hyperlink.obj \ $(OBJS)\advlib_laywin.obj \ + $(OBJS)\advlib_odcombo.obj \ $(OBJS)\advlib_propdlg.obj \ $(OBJS)\advlib_sashwin.obj \ $(OBJS)\advlib_splash.obj \ @@ -2935,11 +3247,11 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_taskbar.obj \ $(OBJS)\advlib_joystick.obj !endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1" __mediadll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).dll !endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1" __medialib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib !endif @@ -2991,6 +3303,22 @@ __xrcdll___depname = \ __xrclib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib !endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1" +__auidll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).dll +!endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_AUI)" == "1" +__auilib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib +!endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1" +__richtextdll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG).dll +!endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RICHTEXT)" == "1" +__richtextlib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib +!endif !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" __gldll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).dll @@ -3012,10 +3340,10 @@ __gllib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib !endif !if "$(USE_THREADS)" == "0" -__THREADSFLAG_10 = +__THREADSFLAG_12 = !endif !if "$(USE_THREADS)" == "1" -__THREADSFLAG_10 = mt +__THREADSFLAG_12 = mt !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_4 = i @@ -3024,25 +3352,28 @@ __RUNTIME_LIBS_4 = i __RUNTIME_LIBS_4 = !endif !if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_49 = -d__WXUNIVERSAL__ +__WXUNIV_DEFINE_p_57 = -d__WXUNIVERSAL__ !endif !if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" -__DEBUG_DEFINE_p_49 = -d__WXDEBUG__ +__DEBUG_DEFINE_p_57 = -d__WXDEBUG__ !endif !if "$(DEBUG_FLAG)" == "1" -__DEBUG_DEFINE_p_49 = -d__WXDEBUG__ +__DEBUG_DEFINE_p_57 = -d__WXDEBUG__ !endif !if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_49 = -dwxNO_EXCEPTIONS +__EXCEPTIONS_DEFINE_p_57 = -dwxNO_EXCEPTIONS !endif !if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_49 = -dwxNO_RTTI +__RTTI_DEFINE_p_57 = -dwxNO_RTTI !endif !if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_49 = -dwxNO_THREADS +__THREAD_DEFINE_p_57 = -dwxNO_THREADS !endif !if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_50 = -d_UNICODE +__UNICODE_DEFINE_p_58 = -d_UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_57 = -dwxUSE_UNICODE_MSLU=1 !endif !if "$(USE_GUI)" == "1" __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib @@ -3107,6 +3438,9 @@ __THREAD_DEFINE_p = -DwxNO_THREADS !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -D_UNICODE !endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 +!endif !if "$(WXUNIV)" == "0" __SETUP_H_SUBDIR_FILENAMES = msw !endif @@ -3121,7 +3455,7 @@ $(OBJS): ### Targets: ### -all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__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) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -3229,6 +3563,22 @@ clean: -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)_aui_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).tds + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).ilc + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).ild + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).ilf + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).ils + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG).tds + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG).ilc + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG).ild + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG).ilf + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG).ils + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_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 @@ -3242,7 +3592,7 @@ clean: call $(OBJS)\samples.bat @del $(OBJS)\samples.bat -setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h +setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h $(SETUPHDIR)\wx\msw\rcdefs.h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(WXREGEX_OBJECTS) if exist $@ del $@ @@ -3289,7 +3639,7 @@ $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib: $(WXEXPAT_OBJECTS) !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj $(MONODLL_OBJECTS) $(OBJS)\monodll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(MONODLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\monodll_version.res + c0d32.obj $(MONODLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\monodll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) $@ !endif @@ -3305,7 +3655,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj $(BASEDLL_OBJECTS) $(OBJS)\basedll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\basedll_version.res + c0d32.obj $(BASEDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\basedll_version.res | implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) $@ !endif @@ -3321,7 +3671,7 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj $(NETDLL_OBJECTS) $(OBJS)\netdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) 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$(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 cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\netdll_version.res + c0d32.obj $(NETDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\netdll_version.res | implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net $@ !endif @@ -3337,7 +3687,7 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj $(COREDLL_OBJECTS) $(OBJS)\coredll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(COREDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\coredll_version.res + c0d32.obj $(COREDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\coredll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core $@ !endif @@ -3351,9 +3701,9 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj $(ADVDLL_OBJECTS) $(OBJS)\advdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj $(ADVDLL_OBJECTS) $(OBJS)\advdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__htmldll___depname) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(ADVDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\advdll_version.res + c0d32.obj $(ADVDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\advdll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv $@ !endif @@ -3366,15 +3716,15 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD | !endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj $(MEDIADLL_OBJECTS) $(OBJS)\mediadll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) 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 cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\mediadll_version.res + c0d32.obj $(MEDIADLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\mediadll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media $@ !endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "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 $@ @&&| @@ -3385,7 +3735,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1" $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).dll: $(OBJS)\odbcdll_dummy.obj $(ODBCDLL_OBJECTS) $(OBJS)\odbcdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) 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$(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 cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\odbcdll_version.res + c0d32.obj $(ODBCDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\odbcdll_version.res | implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc $@ !endif @@ -3401,7 +3751,7 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).dll: $(OBJS)\dbgriddll_dummy.obj $(DBGRIDDLL_OBJECTS) $(OBJS)\dbgriddll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(DBGRIDDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\dbgriddll_version.res + c0d32.obj $(DBGRIDDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\dbgriddll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid $@ !endif @@ -3417,7 +3767,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj $(HTMLDLL_OBJECTS) $(OBJS)\htmldll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(HTMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\htmldll_version.res + c0d32.obj $(HTMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\htmldll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html $@ !endif @@ -3431,9 +3781,9 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_bcc$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj $(QADLL_OBJECTS) $(OBJS)\qadll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) $(__xmldll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_bcc$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj $(QADLL_OBJECTS) $(OBJS)\qadll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(QADLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib import32.lib cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\qadll_version.res + c0d32.obj $(QADLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\qadll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa $@ !endif @@ -3449,7 +3799,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj $(XMLDLL_OBJECTS) $(OBJS)\xmldll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) 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$(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 cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\xmldll_version.res + c0d32.obj $(XMLDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\xmldll_version.res | implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml $@ !endif @@ -3465,7 +3815,7 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj $(XRCDLL_OBJECTS) $(OBJS)\xrcdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__htmldll___depname) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname) 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 cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\xrcdll_version.res + c0d32.obj $(XRCDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\xrcdll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc $@ !endif @@ -3478,10 +3828,42 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD | !endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).dll: $(OBJS)\auidll_dummy.obj $(AUIDLL_OBJECTS) $(OBJS)\auidll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + c0d32.obj $(AUIDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\auidll_version.res +| + implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui $@ +!endif + +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_AUI)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib: $(OBJS)\auilib_dummy.obj $(AUILIB_OBJECTS) + if exist $@ del $@ + tlib /a /p4096 $@ @&&| + $(AUILIB_OBJECTS) +| +!endif + +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG).dll: $(OBJS)\richtextdll_dummy.obj $(RICHTEXTDLL_OBJECTS) $(OBJS)\richtextdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__htmldll___depname) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname) + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + c0d32.obj $(RICHTEXTDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\richtextdll_version.res +| + implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext $@ +!endif + +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RICHTEXT)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib: $(OBJS)\richtextlib_dummy.obj $(RICHTEXTLIB_OBJECTS) + if exist $@ del $@ + tlib /a /p4096 $@ @&&| + $(RICHTEXTLIB_OBJECTS) +| +!endif + !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj $(GLDLL_OBJECTS) $(OBJS)\gldll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) $(__coredll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(GLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) import32.lib cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\gldll_version.res + c0d32.obj $(GLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) import32.lib cw32$(__THREADSFLAG_12)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\gldll_version.res | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl $@ !endif @@ -3515,10 +3897,16 @@ $(SETUPHDIR)\wx: $(SETUPHDIR) $(SETUPHDIR)\wx\setup.h: if not exist $(SETUPHDIR)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h +$(SETUPHDIR)\wx\msw: $(SETUPHDIR)\wx + if not exist $(SETUPHDIR)\wx\msw mkdir $(SETUPHDIR)\wx\msw + +$(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs.h + $(CPP) "..\..\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h" + build_cfg_file: $(SETUPHDIR) @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE) - @echo WXVER_MINOR=5 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=5 >>$(BUILD_CFG_FILE) + @echo WXVER_MINOR=7 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @@ -3535,6 +3923,7 @@ build_cfg_file: $(SETUPHDIR) @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE) @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE) @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE) + @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE) @echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE) @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE) @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE) @@ -3819,6 +4208,9 @@ $(OBJS)\wxtiff_tif_dumpmode.obj: ..\..\src\tiff\tif_dumpmode.c $(OBJS)\wxtiff_tif_error.obj: ..\..\src\tiff\tif_error.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** +$(OBJS)\wxtiff_tif_extension.obj: ..\..\src\tiff\tif_extension.c + $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** + $(OBJS)\wxtiff_tif_fax3.obj: ..\..\src\tiff\tif_fax3.c $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) $** @@ -3894,11 +4286,11 @@ $(OBJS)\wxexpat_xmlrole.obj: ..\..\src\expat\lib\xmlrole.c $(OBJS)\wxexpat_xmltok.obj: ..\..\src\expat\lib\xmltok.c $(CC) -q -c -P- -o$@ $(WXEXPAT_CFLAGS) $** -$(OBJS)\monodll_dummy.obj: ..\..\src\msw\dummy.cpp +$(OBJS)\monodll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) -H $** $(OBJS)\monodll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) -i..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_57) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG) $** $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -3915,6 +4307,9 @@ $(OBJS)\monodll_cmdline.obj: ..\..\src\common\cmdline.cpp $(OBJS)\monodll_config.obj: ..\..\src\common\config.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_convauto.obj: ..\..\src\common\convauto.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_datetime.obj: ..\..\src\common\datetime.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -4002,6 +4397,9 @@ $(OBJS)\monodll_mstream.obj: ..\..\src\common\mstream.cpp $(OBJS)\monodll_object.obj: ..\..\src\common\object.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_powercmn.obj: ..\..\src\common\powercmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_process.obj: ..\..\src\common\process.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -4086,6 +4484,9 @@ $(OBJS)\monodll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp $(OBJS)\monodll_mimetype.obj: ..\..\src\msw\mimetype.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_power.obj: ..\..\src\msw\power.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_regconf.obj: ..\..\src\msw\regconf.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -4170,6 +4571,9 @@ $(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_combo.obj: ..\..\src\msw\combo.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -4224,9 +4628,6 @@ $(OBJS)\monodll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp $(OBJS)\monodll_tbar95.obj: ..\..\src\msw\tbar95.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** - $(OBJS)\monodll_treectrl.obj: ..\..\src\msw\treectrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -4308,7 +4709,13 @@ $(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp $(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_mediactrl.obj: ..\..\src\msw\mediactrl.cpp +$(OBJS)\monodll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** $(OBJS)\monodll_helpbest.obj: ..\..\src\msw\helpbest.cpp @@ -4320,9 +4727,15 @@ $(OBJS)\monodll_helpctrl.obj: ..\..\src\html\helpctrl.cpp $(OBJS)\monodll_helpdata.obj: ..\..\src\html\helpdata.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_helpdlg.obj: ..\..\src\html\helpdlg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_helpfrm.obj: ..\..\src\html\helpfrm.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_helpwnd.obj: ..\..\src\html\helpwnd.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_htmlcell.obj: ..\..\src\html\htmlcell.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -4416,27 +4829,48 @@ $(OBJS)\monodll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp $(OBJS)\monodll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** $(OBJS)\monodll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** $(OBJS)\monodll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** $(OBJS)\monodll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_xh_html.obj: ..\..\src\xrc\xh_html.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -4452,6 +4886,9 @@ $(OBJS)\monodll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp $(OBJS)\monodll_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -4506,6 +4943,9 @@ $(OBJS)\monodll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp $(OBJS)\monodll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_xh_treebk.obj: ..\..\src\xrc\xh_treebk.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) $** @@ -4518,6 +4958,30 @@ $(OBJS)\monodll_xmlres.obj: ..\..\src\xrc\xmlres.cpp $(OBJS)\monodll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_framemanager.obj: ..\..\src\aui\framemanager.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_dockart.obj: ..\..\src\aui\dockart.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_floatpane.obj: ..\..\src\aui\floatpane.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_xml.obj: ..\..\src\xml\xml.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -4819,16 +5283,6 @@ $(OBJS)\monodll_checkbox.obj: ..\..\src\univ\checkbox.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" -$(OBJS)\monodll_checklst.obj: ..\..\src\msw\checklst.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\monodll_checklst.obj: ..\..\src\univ\checklst.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monodll_choice.obj: ..\..\src\msw\choice.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5009,6 +5463,26 @@ $(OBJS)\monodll_textctrl.obj: ..\..\src\univ\textctrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\monodll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\monodll_tglbtn.obj: ..\..\src\univ\tglbtn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\monodll_checklst.obj: ..\..\src\msw\checklst.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\monodll_checklst.obj: ..\..\src\univ\checklst.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) $** @@ -5059,6 +5533,21 @@ $(OBJS)\monodll_clipcmn.obj: ..\..\src\common\clipcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_colourcmn.obj: ..\..\src\common\colourcmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_combocmn.obj: ..\..\src\common\combocmn.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) $** @@ -5139,11 +5628,26 @@ $(OBJS)\monodll_effects.obj: ..\..\src\common\effects.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5154,6 +5658,11 @@ $(OBJS)\monodll_fontcmn.obj: ..\..\src\common\fontcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_fontmap.obj: ..\..\src\common\fontmap.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5289,6 +5798,11 @@ $(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_pickerbase.obj: ..\..\src\common\pickerbase.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_popupcmn.obj: ..\..\src\common\popupcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5394,6 +5908,11 @@ $(OBJS)\monodll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5404,6 +5923,16 @@ $(OBJS)\monodll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_combog.obj: ..\..\src\generic\combog.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) $** @@ -5419,6 +5948,16 @@ $(OBJS)\monodll_dragimgg.obj: ..\..\src\generic\dragimgg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_listbkg.obj: ..\..\src\generic\listbkg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5484,11 +6023,21 @@ $(OBJS)\monodll_tipwin.obj: ..\..\src\generic\tipwin.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_treectlg.obj: ..\..\src\generic\treectlg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_treebkg.obj: ..\..\src\generic\treebkg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_vlbox.obj: ..\..\src\generic\vlbox.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5499,11 +6048,21 @@ $(OBJS)\monodll_vscroll.obj: ..\..\src\generic\vscroll.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_datavgen.obj: ..\..\src\generic\datavgen.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_datectlg.obj: ..\..\src\generic\datectlg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5529,11 +6088,21 @@ $(OBJS)\monodll_helpext.obj: ..\..\src\generic\helpext.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_hyperlink.obj: ..\..\src\generic\hyperlink.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_odcombo.obj: ..\..\src\generic\odcombo.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_propdlg.obj: ..\..\src\generic\propdlg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5579,7 +6148,7 @@ $(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif -$(OBJS)\monolib_dummy.obj: ..\..\src\msw\dummy.cpp +$(OBJS)\monolib_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) -H $** $(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp @@ -5597,6 +6166,9 @@ $(OBJS)\monolib_cmdline.obj: ..\..\src\common\cmdline.cpp $(OBJS)\monolib_config.obj: ..\..\src\common\config.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_convauto.obj: ..\..\src\common\convauto.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_datetime.obj: ..\..\src\common\datetime.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -5684,6 +6256,9 @@ $(OBJS)\monolib_mstream.obj: ..\..\src\common\mstream.cpp $(OBJS)\monolib_object.obj: ..\..\src\common\object.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_powercmn.obj: ..\..\src\common\powercmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_process.obj: ..\..\src\common\process.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -5768,6 +6343,9 @@ $(OBJS)\monolib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp $(OBJS)\monolib_mimetype.obj: ..\..\src\msw\mimetype.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_power.obj: ..\..\src\msw\power.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_regconf.obj: ..\..\src\msw\regconf.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -5852,6 +6430,9 @@ $(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_combo.obj: ..\..\src\msw\combo.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -5906,9 +6487,6 @@ $(OBJS)\monolib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp $(OBJS)\monolib_tbar95.obj: ..\..\src\msw\tbar95.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** - $(OBJS)\monolib_treectrl.obj: ..\..\src\msw\treectrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -5990,7 +6568,13 @@ $(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp $(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_mediactrl.obj: ..\..\src\msw\mediactrl.cpp +$(OBJS)\monolib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** $(OBJS)\monolib_helpbest.obj: ..\..\src\msw\helpbest.cpp @@ -6002,9 +6586,15 @@ $(OBJS)\monolib_helpctrl.obj: ..\..\src\html\helpctrl.cpp $(OBJS)\monolib_helpdata.obj: ..\..\src\html\helpdata.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_helpdlg.obj: ..\..\src\html\helpdlg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_helpfrm.obj: ..\..\src\html\helpfrm.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_helpwnd.obj: ..\..\src\html\helpwnd.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_htmlcell.obj: ..\..\src\html\htmlcell.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -6098,31 +6688,52 @@ $(OBJS)\monolib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp $(OBJS)\monolib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.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_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.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 +$(OBJS)\monolib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp +$(OBJS)\monolib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_xh_html.obj: ..\..\src\xrc\xh_html.cpp +$(OBJS)\monolib_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp +$(OBJS)\monolib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp +$(OBJS)\monolib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_grid.obj: ..\..\src\xrc\xh_grid.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_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.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_listbk.obj: ..\..\src\xrc\xh_listbk.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** $(OBJS)\monolib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp @@ -6134,6 +6745,9 @@ $(OBJS)\monolib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp $(OBJS)\monolib_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.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) $** @@ -6188,6 +6802,9 @@ $(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp $(OBJS)\monolib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_xh_treebk.obj: ..\..\src\xrc\xh_treebk.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) $** @@ -6200,6 +6817,30 @@ $(OBJS)\monolib_xmlres.obj: ..\..\src\xrc\xmlres.cpp $(OBJS)\monolib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_framemanager.obj: ..\..\src\aui\framemanager.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_dockart.obj: ..\..\src\aui\dockart.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_floatpane.obj: ..\..\src\aui\floatpane.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_xml.obj: ..\..\src\xml\xml.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -6501,16 +7142,6 @@ $(OBJS)\monolib_checkbox.obj: ..\..\src\univ\checkbox.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" -$(OBJS)\monolib_checklst.obj: ..\..\src\msw\checklst.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\monolib_checklst.obj: ..\..\src\univ\checklst.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monolib_choice.obj: ..\..\src\msw\choice.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -6691,6 +7322,26 @@ $(OBJS)\monolib_textctrl.obj: ..\..\src\univ\textctrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\monolib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\monolib_tglbtn.obj: ..\..\src\univ\tglbtn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\monolib_checklst.obj: ..\..\src\msw\checklst.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\monolib_checklst.obj: ..\..\src\univ\checklst.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) $** @@ -6741,6 +7392,21 @@ $(OBJS)\monolib_clipcmn.obj: ..\..\src\common\clipcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_colourcmn.obj: ..\..\src\common\colourcmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_combocmn.obj: ..\..\src\common\combocmn.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) $** @@ -6821,11 +7487,26 @@ $(OBJS)\monolib_effects.obj: ..\..\src\common\effects.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -6836,6 +7517,11 @@ $(OBJS)\monolib_fontcmn.obj: ..\..\src\common\fontcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_fontmap.obj: ..\..\src\common\fontmap.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -6971,6 +7657,11 @@ $(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_pickerbase.obj: ..\..\src\common\pickerbase.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_popupcmn.obj: ..\..\src\common\popupcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7076,6 +7767,11 @@ $(OBJS)\monolib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7086,6 +7782,16 @@ $(OBJS)\monolib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_combog.obj: ..\..\src\generic\combog.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) $** @@ -7101,6 +7807,16 @@ $(OBJS)\monolib_dragimgg.obj: ..\..\src\generic\dragimgg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_listbkg.obj: ..\..\src\generic\listbkg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7166,11 +7882,21 @@ $(OBJS)\monolib_tipwin.obj: ..\..\src\generic\tipwin.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_treectlg.obj: ..\..\src\generic\treectlg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_treebkg.obj: ..\..\src\generic\treebkg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_vlbox.obj: ..\..\src\generic\vlbox.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7181,11 +7907,21 @@ $(OBJS)\monolib_vscroll.obj: ..\..\src\generic\vscroll.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_datavgen.obj: ..\..\src\generic\datavgen.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_datectlg.obj: ..\..\src\generic\datectlg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7211,11 +7947,21 @@ $(OBJS)\monolib_helpext.obj: ..\..\src\generic\helpext.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_hyperlink.obj: ..\..\src\generic\hyperlink.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_odcombo.obj: ..\..\src\generic\odcombo.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_propdlg.obj: ..\..\src\generic\propdlg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7261,11 +8007,11 @@ $(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif -$(OBJS)\basedll_dummy.obj: ..\..\src\msw\dummy.cpp +$(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) -H $** $(OBJS)\basedll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) -i..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_57) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG) $** $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -7282,6 +8028,9 @@ $(OBJS)\basedll_cmdline.obj: ..\..\src\common\cmdline.cpp $(OBJS)\basedll_config.obj: ..\..\src\common\config.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** +$(OBJS)\basedll_convauto.obj: ..\..\src\common\convauto.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + $(OBJS)\basedll_datetime.obj: ..\..\src\common\datetime.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -7369,6 +8118,9 @@ $(OBJS)\basedll_mstream.obj: ..\..\src\common\mstream.cpp $(OBJS)\basedll_object.obj: ..\..\src\common\object.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** +$(OBJS)\basedll_powercmn.obj: ..\..\src\common\powercmn.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + $(OBJS)\basedll_process.obj: ..\..\src\common\process.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -7453,6 +8205,9 @@ $(OBJS)\basedll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp $(OBJS)\basedll_mimetype.obj: ..\..\src\msw\mimetype.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** +$(OBJS)\basedll_power.obj: ..\..\src\msw\power.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + $(OBJS)\basedll_regconf.obj: ..\..\src\msw\regconf.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -7498,7 +8253,7 @@ $(OBJS)\basedll_mslu.obj: ..\..\src\msw\mslu.cpp $(OBJS)\basedll_volume.obj: ..\..\src\msw\volume.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\baselib_dummy.obj: ..\..\src\msw\dummy.cpp +$(OBJS)\baselib_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) -H $** $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp @@ -7516,6 +8271,9 @@ $(OBJS)\baselib_cmdline.obj: ..\..\src\common\cmdline.cpp $(OBJS)\baselib_config.obj: ..\..\src\common\config.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** +$(OBJS)\baselib_convauto.obj: ..\..\src\common\convauto.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** + $(OBJS)\baselib_datetime.obj: ..\..\src\common\datetime.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** @@ -7603,6 +8361,9 @@ $(OBJS)\baselib_mstream.obj: ..\..\src\common\mstream.cpp $(OBJS)\baselib_object.obj: ..\..\src\common\object.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** +$(OBJS)\baselib_powercmn.obj: ..\..\src\common\powercmn.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** + $(OBJS)\baselib_process.obj: ..\..\src\common\process.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** @@ -7687,6 +8448,9 @@ $(OBJS)\baselib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp $(OBJS)\baselib_mimetype.obj: ..\..\src\msw\mimetype.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** +$(OBJS)\baselib_power.obj: ..\..\src\msw\power.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** + $(OBJS)\baselib_regconf.obj: ..\..\src\msw\regconf.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** @@ -7732,11 +8496,11 @@ $(OBJS)\baselib_mslu.obj: ..\..\src\msw\mslu.cpp $(OBJS)\baselib_volume.obj: ..\..\src\msw\volume.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\netdll_dummy.obj: ..\..\src\msw\dummy.cpp +$(OBJS)\netdll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) -H $** $(OBJS)\netdll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) -i..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_57) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG) $** $(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $** @@ -7774,7 +8538,7 @@ $(OBJS)\netdll_gsocket.obj: ..\..\src\msw\gsocket.cpp $(OBJS)\netdll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $** -$(OBJS)\netlib_dummy.obj: ..\..\src\msw\dummy.cpp +$(OBJS)\netlib_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) -H $** $(OBJS)\netlib_fs_inet.obj: ..\..\src\common\fs_inet.cpp @@ -7813,11 +8577,11 @@ $(OBJS)\netlib_gsocket.obj: ..\..\src\msw\gsocket.cpp $(OBJS)\netlib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $** -$(OBJS)\coredll_dummy.obj: ..\..\src\msw\dummy.cpp +$(OBJS)\coredll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) -H $** $(OBJS)\coredll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) -i..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_57) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG) $** $(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -7843,6 +8607,9 @@ $(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_combo.obj: ..\..\src\msw\combo.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** + $(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -7897,9 +8664,6 @@ $(OBJS)\coredll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp $(OBJS)\coredll_tbar95.obj: ..\..\src\msw\tbar95.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -$(OBJS)\coredll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** - $(OBJS)\coredll_treectrl.obj: ..\..\src\msw\treectrl.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -8270,16 +9034,6 @@ $(OBJS)\coredll_checkbox.obj: ..\..\src\univ\checkbox.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" -$(OBJS)\coredll_checklst.obj: ..\..\src\msw\checklst.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\coredll_checklst.obj: ..\..\src\univ\checklst.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\coredll_choice.obj: ..\..\src\msw\choice.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -8460,6 +9214,26 @@ $(OBJS)\coredll_textctrl.obj: ..\..\src\univ\textctrl.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\coredll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\coredll_tglbtn.obj: ..\..\src\univ\tglbtn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\coredll_checklst.obj: ..\..\src\msw\checklst.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\coredll_checklst.obj: ..\..\src\univ\checklst.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) $** @@ -8510,6 +9284,21 @@ $(OBJS)\coredll_clipcmn.obj: ..\..\src\common\clipcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_colourcmn.obj: ..\..\src\common\colourcmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_combocmn.obj: ..\..\src\common\combocmn.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) $** @@ -8590,11 +9379,26 @@ $(OBJS)\coredll_effects.obj: ..\..\src\common\effects.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -8605,6 +9409,11 @@ $(OBJS)\coredll_fontcmn.obj: ..\..\src\common\fontcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_fontmap.obj: ..\..\src\common\fontmap.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -8740,6 +9549,11 @@ $(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_pickerbase.obj: ..\..\src\common\pickerbase.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_popupcmn.obj: ..\..\src\common\popupcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -8845,6 +9659,11 @@ $(OBJS)\coredll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -8855,6 +9674,16 @@ $(OBJS)\coredll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_combog.obj: ..\..\src\generic\combog.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) $** @@ -8870,6 +9699,16 @@ $(OBJS)\coredll_dragimgg.obj: ..\..\src\generic\dragimgg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_listbkg.obj: ..\..\src\generic\listbkg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -8935,11 +9774,21 @@ $(OBJS)\coredll_tipwin.obj: ..\..\src\generic\tipwin.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_treectlg.obj: ..\..\src\generic\treectlg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_treebkg.obj: ..\..\src\generic\treebkg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_vlbox.obj: ..\..\src\generic\vlbox.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -8950,7 +9799,7 @@ $(OBJS)\coredll_vscroll.obj: ..\..\src\generic\vscroll.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif -$(OBJS)\corelib_dummy.obj: ..\..\src\msw\dummy.cpp +$(OBJS)\corelib_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) -H $** $(OBJS)\corelib_event.obj: ..\..\src\common\event.cpp @@ -8977,6 +9826,9 @@ $(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_combo.obj: ..\..\src\msw\combo.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** + $(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -9031,9 +9883,6 @@ $(OBJS)\corelib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp $(OBJS)\corelib_tbar95.obj: ..\..\src\msw\tbar95.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -$(OBJS)\corelib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** - $(OBJS)\corelib_treectrl.obj: ..\..\src\msw\treectrl.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -9404,16 +10253,6 @@ $(OBJS)\corelib_checkbox.obj: ..\..\src\univ\checkbox.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" -$(OBJS)\corelib_checklst.obj: ..\..\src\msw\checklst.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\corelib_checklst.obj: ..\..\src\univ\checklst.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\corelib_choice.obj: ..\..\src\msw\choice.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -9594,6 +10433,26 @@ $(OBJS)\corelib_textctrl.obj: ..\..\src\univ\textctrl.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\corelib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\corelib_tglbtn.obj: ..\..\src\univ\tglbtn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\corelib_checklst.obj: ..\..\src\msw\checklst.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\corelib_checklst.obj: ..\..\src\univ\checklst.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) $** @@ -9644,6 +10503,21 @@ $(OBJS)\corelib_clipcmn.obj: ..\..\src\common\clipcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_colourcmn.obj: ..\..\src\common\colourcmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_combocmn.obj: ..\..\src\common\combocmn.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) $** @@ -9724,11 +10598,26 @@ $(OBJS)\corelib_effects.obj: ..\..\src\common\effects.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -9739,6 +10628,11 @@ $(OBJS)\corelib_fontcmn.obj: ..\..\src\common\fontcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_fontmap.obj: ..\..\src\common\fontmap.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -9874,6 +10768,11 @@ $(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_pickerbase.obj: ..\..\src\common\pickerbase.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_popupcmn.obj: ..\..\src\common\popupcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -9979,6 +10878,11 @@ $(OBJS)\corelib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -9989,6 +10893,16 @@ $(OBJS)\corelib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_combog.obj: ..\..\src\generic\combog.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) $** @@ -10004,6 +10918,16 @@ $(OBJS)\corelib_dragimgg.obj: ..\..\src\generic\dragimgg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_listbkg.obj: ..\..\src\generic\listbkg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -10069,11 +10993,21 @@ $(OBJS)\corelib_tipwin.obj: ..\..\src\generic\tipwin.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_treectlg.obj: ..\..\src\generic\treectlg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_treebkg.obj: ..\..\src\generic\treebkg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_vlbox.obj: ..\..\src\generic\vlbox.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -10084,18 +11018,24 @@ $(OBJS)\corelib_vscroll.obj: ..\..\src\generic\vscroll.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif -$(OBJS)\advdll_dummy.obj: ..\..\src\msw\dummy.cpp +$(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) -H $** $(OBJS)\advdll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) -i..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_57) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG) $** $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** +$(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + $(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** +$(OBJS)\advdll_datavgen.obj: ..\..\src\generic\datavgen.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + $(OBJS)\advdll_datectlg.obj: ..\..\src\generic\datectlg.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** @@ -10111,9 +11051,15 @@ $(OBJS)\advdll_gridsel.obj: ..\..\src\generic\gridsel.cpp $(OBJS)\advdll_helpext.obj: ..\..\src\generic\helpext.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** +$(OBJS)\advdll_hyperlink.obj: ..\..\src\generic\hyperlink.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + $(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** +$(OBJS)\advdll_odcombo.obj: ..\..\src\generic\odcombo.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + $(OBJS)\advdll_propdlg.obj: ..\..\src\generic\propdlg.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** @@ -10141,15 +11087,21 @@ $(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp $(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** -$(OBJS)\advlib_dummy.obj: ..\..\src\msw\dummy.cpp +$(OBJS)\advlib_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) -H $** $(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** +$(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + $(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** +$(OBJS)\advlib_datavgen.obj: ..\..\src\generic\datavgen.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + $(OBJS)\advlib_datectlg.obj: ..\..\src\generic\datectlg.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** @@ -10165,9 +11117,15 @@ $(OBJS)\advlib_gridsel.obj: ..\..\src\generic\gridsel.cpp $(OBJS)\advlib_helpext.obj: ..\..\src\generic\helpext.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** +$(OBJS)\advlib_hyperlink.obj: ..\..\src\generic\hyperlink.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + $(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** +$(OBJS)\advlib_odcombo.obj: ..\..\src\generic\odcombo.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + $(OBJS)\advlib_propdlg.obj: ..\..\src\generic\propdlg.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** @@ -10195,32 +11153,44 @@ $(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp $(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** -$(OBJS)\mediadll_dummy.obj: ..\..\src\msw\dummy.cpp +$(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) -H $** $(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) -i..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_57) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG) $** $(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp $(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) $** -$(OBJS)\mediadll_mediactrl.obj: ..\..\src\msw\mediactrl.cpp +$(OBJS)\mediadll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp + $(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) $** + +$(OBJS)\mediadll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp + $(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) $** + +$(OBJS)\mediadll_activex.obj: ..\..\src\msw\ole\activex.cpp $(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) $** -$(OBJS)\medialib_dummy.obj: ..\..\src\msw\dummy.cpp +$(OBJS)\medialib_dummy.obj: ..\..\src\common\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 +$(OBJS)\medialib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp + $(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) $** + +$(OBJS)\medialib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp + $(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) $** + +$(OBJS)\medialib_activex.obj: ..\..\src\msw\ole\activex.cpp $(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) $** -$(OBJS)\odbcdll_dummy.obj: ..\..\src\msw\dummy.cpp +$(OBJS)\odbcdll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(ODBCDLL_CXXFLAGS) -H $** $(OBJS)\odbcdll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) -i..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_57) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG) $** $(OBJS)\odbcdll_db.obj: ..\..\src\common\db.cpp $(CXX) -q -c -P -o$@ $(ODBCDLL_CXXFLAGS) $** @@ -10228,7 +11198,7 @@ $(OBJS)\odbcdll_db.obj: ..\..\src\common\db.cpp $(OBJS)\odbcdll_dbtable.obj: ..\..\src\common\dbtable.cpp $(CXX) -q -c -P -o$@ $(ODBCDLL_CXXFLAGS) $** -$(OBJS)\odbclib_dummy.obj: ..\..\src\msw\dummy.cpp +$(OBJS)\odbclib_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(ODBCLIB_CXXFLAGS) -H $** $(OBJS)\odbclib_db.obj: ..\..\src\common\db.cpp @@ -10237,26 +11207,26 @@ $(OBJS)\odbclib_db.obj: ..\..\src\common\db.cpp $(OBJS)\odbclib_dbtable.obj: ..\..\src\common\dbtable.cpp $(CXX) -q -c -P -o$@ $(ODBCLIB_CXXFLAGS) $** -$(OBJS)\dbgriddll_dummy.obj: ..\..\src\msw\dummy.cpp +$(OBJS)\dbgriddll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(DBGRIDDLL_CXXFLAGS) -H $** $(OBJS)\dbgriddll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) -i..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_57) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG) $** $(OBJS)\dbgriddll_dbgrid.obj: ..\..\src\common\dbgrid.cpp $(CXX) -q -c -P -o$@ $(DBGRIDDLL_CXXFLAGS) $** -$(OBJS)\dbgridlib_dummy.obj: ..\..\src\msw\dummy.cpp +$(OBJS)\dbgridlib_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(DBGRIDLIB_CXXFLAGS) -H $** $(OBJS)\dbgridlib_dbgrid.obj: ..\..\src\common\dbgrid.cpp $(CXX) -q -c -P -o$@ $(DBGRIDLIB_CXXFLAGS) $** -$(OBJS)\htmldll_dummy.obj: ..\..\src\msw\dummy.cpp +$(OBJS)\htmldll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) -H $** $(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) -i..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_57) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG) $** $(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) $** @@ -10267,9 +11237,15 @@ $(OBJS)\htmldll_helpctrl.obj: ..\..\src\html\helpctrl.cpp $(OBJS)\htmldll_helpdata.obj: ..\..\src\html\helpdata.cpp $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) $** +$(OBJS)\htmldll_helpdlg.obj: ..\..\src\html\helpdlg.cpp + $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) $** + $(OBJS)\htmldll_helpfrm.obj: ..\..\src\html\helpfrm.cpp $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) $** +$(OBJS)\htmldll_helpwnd.obj: ..\..\src\html\helpwnd.cpp + $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) $** + $(OBJS)\htmldll_htmlcell.obj: ..\..\src\html\htmlcell.cpp $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) $** @@ -10324,7 +11300,7 @@ $(OBJS)\htmldll_winpars.obj: ..\..\src\html\winpars.cpp $(OBJS)\htmldll_htmllbox.obj: ..\..\src\generic\htmllbox.cpp $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) $** -$(OBJS)\htmllib_dummy.obj: ..\..\src\msw\dummy.cpp +$(OBJS)\htmllib_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) -H $** $(OBJS)\htmllib_helpbest.obj: ..\..\src\msw\helpbest.cpp @@ -10336,9 +11312,15 @@ $(OBJS)\htmllib_helpctrl.obj: ..\..\src\html\helpctrl.cpp $(OBJS)\htmllib_helpdata.obj: ..\..\src\html\helpdata.cpp $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) $** +$(OBJS)\htmllib_helpdlg.obj: ..\..\src\html\helpdlg.cpp + $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) $** + $(OBJS)\htmllib_helpfrm.obj: ..\..\src\html\helpfrm.cpp $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) $** +$(OBJS)\htmllib_helpwnd.obj: ..\..\src\html\helpwnd.cpp + $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) $** + $(OBJS)\htmllib_htmlcell.obj: ..\..\src\html\htmlcell.cpp $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) $** @@ -10393,11 +11375,11 @@ $(OBJS)\htmllib_winpars.obj: ..\..\src\html\winpars.cpp $(OBJS)\htmllib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) $** -$(OBJS)\qadll_dummy.obj: ..\..\src\msw\dummy.cpp +$(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(QADLL_CXXFLAGS) -H $** $(OBJS)\qadll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) -i..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_bcc$(VENDORTAG) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_57) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_bcc$(VENDORTAG) $** $(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp $(CXX) -q -c -P -o$@ $(QADLL_CXXFLAGS) $** @@ -10405,7 +11387,7 @@ $(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp $(OBJS)\qadll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp $(CXX) -q -c -P -o$@ $(QADLL_CXXFLAGS) $** -$(OBJS)\qalib_dummy.obj: ..\..\src\msw\dummy.cpp +$(OBJS)\qalib_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(QALIB_CXXFLAGS) -H $** $(OBJS)\qalib_debugrpt.obj: ..\..\src\common\debugrpt.cpp @@ -10414,11 +11396,11 @@ $(OBJS)\qalib_debugrpt.obj: ..\..\src\common\debugrpt.cpp $(OBJS)\qalib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp $(CXX) -q -c -P -o$@ $(QALIB_CXXFLAGS) $** -$(OBJS)\xmldll_dummy.obj: ..\..\src\msw\dummy.cpp +$(OBJS)\xmldll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(XMLDLL_CXXFLAGS) -H $** $(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) -i..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_57) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG) $** $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp $(CXX) -q -c -P -o$@ $(XMLDLL_CXXFLAGS) $** @@ -10426,7 +11408,7 @@ $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp $(OBJS)\xmldll_xtixml.obj: ..\..\src\common\xtixml.cpp $(CXX) -q -c -P -o$@ $(XMLDLL_CXXFLAGS) $** -$(OBJS)\xmllib_dummy.obj: ..\..\src\msw\dummy.cpp +$(OBJS)\xmllib_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(XMLLIB_CXXFLAGS) -H $** $(OBJS)\xmllib_xml.obj: ..\..\src\xml\xml.cpp @@ -10435,11 +11417,11 @@ $(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 +$(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) -H $** $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) -i..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_57) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG) $** $(OBJS)\xrcdll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** @@ -10465,27 +11447,48 @@ $(OBJS)\xrcdll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp $(OBJS)\xrcdll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** +$(OBJS)\xrcdll_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.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_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** +$(OBJS)\xrcdll_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.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_mdi.obj: ..\..\src\xrc\xh_mdi.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.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_grid.obj: ..\..\src\xrc\xh_grid.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_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.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) $** @@ -10501,6 +11504,9 @@ $(OBJS)\xrcdll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp $(OBJS)\xrcdll_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** +$(OBJS)\xrcdll_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.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) $** @@ -10555,6 +11561,9 @@ $(OBJS)\xrcdll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp $(OBJS)\xrcdll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** +$(OBJS)\xrcdll_xh_treebk.obj: ..\..\src\xrc\xh_treebk.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) $** @@ -10567,7 +11576,7 @@ $(OBJS)\xrcdll_xmlres.obj: ..\..\src\xrc\xmlres.cpp $(OBJS)\xrcdll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** -$(OBJS)\xrclib_dummy.obj: ..\..\src\msw\dummy.cpp +$(OBJS)\xrclib_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) -H $** $(OBJS)\xrclib_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp @@ -10594,27 +11603,48 @@ $(OBJS)\xrclib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp $(OBJS)\xrclib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** +$(OBJS)\xrclib_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.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_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** +$(OBJS)\xrclib_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.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_mdi.obj: ..\..\src\xrc\xh_mdi.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.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_grid.obj: ..\..\src\xrc\xh_grid.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_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.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) $** @@ -10630,6 +11660,9 @@ $(OBJS)\xrclib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp $(OBJS)\xrclib_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** +$(OBJS)\xrclib_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.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) $** @@ -10684,6 +11717,9 @@ $(OBJS)\xrclib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp $(OBJS)\xrclib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** +$(OBJS)\xrclib_xh_treebk.obj: ..\..\src\xrc\xh_treebk.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) $** @@ -10696,16 +11732,82 @@ $(OBJS)\xrclib_xmlres.obj: ..\..\src\xrc\xmlres.cpp $(OBJS)\xrclib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** -$(OBJS)\gldll_dummy.obj: ..\..\src\msw\dummy.cpp +$(OBJS)\auidll_dummy.obj: ..\..\src\common\dummy.cpp + $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) -H $** + +$(OBJS)\auidll_version.res: ..\..\src\msw\version.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_57) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG) $** + +$(OBJS)\auidll_framemanager.obj: ..\..\src\aui\framemanager.cpp + $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) $** + +$(OBJS)\auidll_dockart.obj: ..\..\src\aui\dockart.cpp + $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) $** + +$(OBJS)\auidll_floatpane.obj: ..\..\src\aui\floatpane.cpp + $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) $** + +$(OBJS)\auilib_dummy.obj: ..\..\src\common\dummy.cpp + $(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) -H $** + +$(OBJS)\auilib_framemanager.obj: ..\..\src\aui\framemanager.cpp + $(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) $** + +$(OBJS)\auilib_dockart.obj: ..\..\src\aui\dockart.cpp + $(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) $** + +$(OBJS)\auilib_floatpane.obj: ..\..\src\aui\floatpane.cpp + $(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) $** + +$(OBJS)\richtextdll_dummy.obj: ..\..\src\common\dummy.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) -H $** + +$(OBJS)\richtextdll_version.res: ..\..\src\msw\version.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_57) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG) $** + +$(OBJS)\richtextdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) $** + +$(OBJS)\richtextdll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) $** + +$(OBJS)\richtextdll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) $** + +$(OBJS)\richtextdll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) $** + +$(OBJS)\richtextdll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) $** + +$(OBJS)\richtextlib_dummy.obj: ..\..\src\common\dummy.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) -H $** + +$(OBJS)\richtextlib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) $** + +$(OBJS)\richtextlib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) $** + +$(OBJS)\richtextlib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) $** + +$(OBJS)\richtextlib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) $** + +$(OBJS)\richtextlib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) $** + +$(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) -H $** $(OBJS)\gldll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) -i..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_57) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG) $** $(OBJS)\gldll_glcanvas.obj: ..\..\src\msw\glcanvas.cpp $(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) $** -$(OBJS)\gllib_dummy.obj: ..\..\src\msw\dummy.cpp +$(OBJS)\gllib_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(GLLIB_CXXFLAGS) -H $** $(OBJS)\gllib_glcanvas.obj: ..\..\src\msw\glcanvas.cpp