X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8329fea8ad89a4df6c2f0441facdc5ad189473ea..8f68093d2ac03613e077decf82d2043f649d0886:/build/msw/makefile.gcc diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 9212bee788..ac933e4ae3 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.4 (http://bakefile.sourceforge.net) +# Bakefile 0.1.7 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,15 +18,17 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \ MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ USE_XRC="$(USE_XRC)" USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" \ - USE_EXCEPTIONS="$(USE_EXCEPTIONS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \ + USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ + USE_THREADS="$(USE_THREADS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \ VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" \ WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" WX_RELEASE_NODOT = 25 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4 OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = ..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) WXREGEX_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ @@ -159,7 +161,7 @@ WXTIFF_OBJECTS = \ $(OBJS)\wxtiff_tif_write.o \ $(OBJS)\wxtiff_tif_zip.o WXEXPAT_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ - $(____LIBDIRNAME_FILENAMES_6_p) -DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS) + -I$(LIBDIRNAME) -DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS) WXEXPAT_OBJECTS = \ $(OBJS)\wxexpat_xmlparse.o \ $(OBJS)\wxexpat_xmlrole.o \ @@ -173,10 +175,11 @@ MONODLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_BASE=1 -DWXMAKINGDLL $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) \ - $(CPPFLAGS) $(CXXFLAGS) + -DwxUSE_BASE=1 -DWXMAKINGDLL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) MONODLL_OBJECTS = \ $(OBJS)\monodll_dummy.o \ + $(OBJS)\monodll_version_rc.o \ $(OBJS)\monodll_appbase.o \ $(OBJS)\monodll_archive.o \ $(OBJS)\monodll_clntdata.o \ @@ -184,6 +187,7 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_config.o \ $(OBJS)\monodll_datetime.o \ $(OBJS)\monodll_datstrm.o \ + $(OBJS)\monodll_debugrpt.o \ $(OBJS)\monodll_dircmn.o \ $(OBJS)\monodll_dynarray.o \ $(OBJS)\monodll_dynlib.o \ @@ -234,12 +238,15 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_zstream.o \ $(OBJS)\monodll_basemsw.o \ $(OBJS)\monodll_crashrpt.o \ + $(OBJS)\monodll_debughlp.o \ $(OBJS)\monodll_dde.o \ $(OBJS)\monodll_dir.o \ + $(OBJS)\monodll_dlmsw.o \ $(OBJS)\monodll_mimetype.o \ $(OBJS)\monodll_regconf.o \ $(OBJS)\monodll_registry.o \ $(OBJS)\monodll_snglinst.o \ + $(OBJS)\monodll_stackwalk.o \ $(OBJS)\monodll_stdpaths.o \ $(OBJS)\monodll_thread.o \ $(OBJS)\monodll_utils.o \ @@ -275,8 +282,8 @@ MONOLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_BASE=1 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) \ - $(CXXFLAGS) + -DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \ + $(CPPFLAGS) $(CXXFLAGS) MONOLIB_OBJECTS = \ $(OBJS)\monolib_dummy.o \ $(OBJS)\monolib_appbase.o \ @@ -286,6 +293,7 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_config.o \ $(OBJS)\monolib_datetime.o \ $(OBJS)\monolib_datstrm.o \ + $(OBJS)\monolib_debugrpt.o \ $(OBJS)\monolib_dircmn.o \ $(OBJS)\monolib_dynarray.o \ $(OBJS)\monolib_dynlib.o \ @@ -336,12 +344,15 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_zstream.o \ $(OBJS)\monolib_basemsw.o \ $(OBJS)\monolib_crashrpt.o \ + $(OBJS)\monolib_debughlp.o \ $(OBJS)\monolib_dde.o \ $(OBJS)\monolib_dir.o \ + $(OBJS)\monolib_dlmsw.o \ $(OBJS)\monolib_mimetype.o \ $(OBJS)\monolib_regconf.o \ $(OBJS)\monolib_registry.o \ $(OBJS)\monolib_snglinst.o \ + $(OBJS)\monolib_stackwalk.o \ $(OBJS)\monolib_stdpaths.o \ $(OBJS)\monolib_thread.o \ $(OBJS)\monolib_utils.o \ @@ -377,10 +388,11 @@ BASEDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I..\..\include -I$(SETUPHDIR) -W -Wall -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 $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) + -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) BASEDLL_OBJECTS = \ $(OBJS)\basedll_dummy.o \ + $(OBJS)\basedll_version_rc.o \ $(OBJS)\basedll_appbase.o \ $(OBJS)\basedll_archive.o \ $(OBJS)\basedll_clntdata.o \ @@ -388,6 +400,7 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_config.o \ $(OBJS)\basedll_datetime.o \ $(OBJS)\basedll_datstrm.o \ + $(OBJS)\basedll_debugrpt.o \ $(OBJS)\basedll_dircmn.o \ $(OBJS)\basedll_dynarray.o \ $(OBJS)\basedll_dynlib.o \ @@ -438,12 +451,15 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_zstream.o \ $(OBJS)\basedll_basemsw.o \ $(OBJS)\basedll_crashrpt.o \ + $(OBJS)\basedll_debughlp.o \ $(OBJS)\basedll_dde.o \ $(OBJS)\basedll_dir.o \ + $(OBJS)\basedll_dlmsw.o \ $(OBJS)\basedll_mimetype.o \ $(OBJS)\basedll_regconf.o \ $(OBJS)\basedll_registry.o \ $(OBJS)\basedll_snglinst.o \ + $(OBJS)\basedll_stackwalk.o \ $(OBJS)\basedll_stdpaths.o \ $(OBJS)\basedll_thread.o \ $(OBJS)\basedll_utils.o \ @@ -464,8 +480,8 @@ BASELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I..\..\include -I$(SETUPHDIR) -W -Wall -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 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) \ - $(CPPFLAGS) $(CXXFLAGS) + -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) BASELIB_OBJECTS = \ $(OBJS)\baselib_dummy.o \ $(OBJS)\baselib_appbase.o \ @@ -475,6 +491,7 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_config.o \ $(OBJS)\baselib_datetime.o \ $(OBJS)\baselib_datstrm.o \ + $(OBJS)\baselib_debugrpt.o \ $(OBJS)\baselib_dircmn.o \ $(OBJS)\baselib_dynarray.o \ $(OBJS)\baselib_dynlib.o \ @@ -525,12 +542,15 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_zstream.o \ $(OBJS)\baselib_basemsw.o \ $(OBJS)\baselib_crashrpt.o \ + $(OBJS)\baselib_debughlp.o \ $(OBJS)\baselib_dde.o \ $(OBJS)\baselib_dir.o \ + $(OBJS)\baselib_dlmsw.o \ $(OBJS)\baselib_mimetype.o \ $(OBJS)\baselib_regconf.o \ $(OBJS)\baselib_registry.o \ $(OBJS)\baselib_snglinst.o \ + $(OBJS)\baselib_stackwalk.o \ $(OBJS)\baselib_stdpaths.o \ $(OBJS)\baselib_thread.o \ $(OBJS)\baselib_utils.o \ @@ -546,10 +566,11 @@ NETDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I..\..\include -I$(SETUPHDIR) -W -Wall -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 $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) + -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) NETDLL_OBJECTS = \ $(OBJS)\netdll_dummy.o \ + $(OBJS)\netdll_version_rc.o \ $(OBJS)\netdll_fs_inet.o \ $(OBJS)\netdll_ftp.o \ $(OBJS)\netdll_http.o \ @@ -566,8 +587,8 @@ NETLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_GUI=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) \ - $(CXXFLAGS) + -DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \ + $(CPPFLAGS) $(CXXFLAGS) NETLIB_OBJECTS = \ $(OBJS)\netlib_dummy.o \ $(OBJS)\netlib_fs_inet.o \ @@ -586,10 +607,11 @@ COREDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I..\..\include -I$(SETUPHDIR) -W -Wall -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 $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) + -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) COREDLL_OBJECTS = \ $(OBJS)\coredll_dummy.o \ + $(OBJS)\coredll_version_rc.o \ $(OBJS)\coredll_event.o \ $(OBJS)\coredll_fs_mem.o \ $(OBJS)\coredll_msgout.o \ @@ -602,8 +624,8 @@ CORELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_BASE=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) \ - $(CXXFLAGS) + -DwxUSE_BASE=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \ + $(CPPFLAGS) $(CXXFLAGS) CORELIB_OBJECTS = \ $(OBJS)\corelib_dummy.o \ $(OBJS)\corelib_event.o \ @@ -618,61 +640,39 @@ ADVDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DWXUSINGDLL -DWXMAKINGDLL_ADV $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) \ - $(CPPFLAGS) $(CXXFLAGS) + -DWXUSINGDLL -DWXMAKINGDLL_ADV $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) ADVDLL_OBJECTS = \ $(OBJS)\advdll_dummy.o \ - $(OBJS)\advdll_calctrl.o \ - $(OBJS)\advdll_grid.o \ - $(OBJS)\advdll_gridctrl.o \ - $(OBJS)\advdll_gridsel.o \ - $(OBJS)\advdll_helpext.o \ - $(OBJS)\advdll_laywin.o \ - $(OBJS)\advdll_sashwin.o \ - $(OBJS)\advdll_splash.o \ - $(OBJS)\advdll_tipdlg.o \ - $(OBJS)\advdll_wizard.o \ - $(OBJS)\advdll_taskbarcmn.o \ - $(OBJS)\advdll_sound.o \ - $(OBJS)\advdll_taskbar.o \ - $(OBJS)\advdll_joystick.o + $(OBJS)\advdll_version_rc.o \ + $(____ADVANCED_SRC_FILENAMES_2_OBJECTS) ADVLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ + $(CXXFLAGS) ADVLIB_OBJECTS = \ $(OBJS)\advlib_dummy.o \ - $(OBJS)\advlib_calctrl.o \ - $(OBJS)\advlib_grid.o \ - $(OBJS)\advlib_gridctrl.o \ - $(OBJS)\advlib_gridsel.o \ - $(OBJS)\advlib_helpext.o \ - $(OBJS)\advlib_laywin.o \ - $(OBJS)\advlib_sashwin.o \ - $(OBJS)\advlib_splash.o \ - $(OBJS)\advlib_tipdlg.o \ - $(OBJS)\advlib_wizard.o \ - $(OBJS)\advlib_taskbarcmn.o \ - $(OBJS)\advlib_sound.o \ - $(OBJS)\advlib_taskbar.o \ - $(OBJS)\advlib_joystick.o + $(____ADVANCED_SRC_FILENAMES_3_OBJECTS) MEDIADLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W -Wall \ -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_MEDIA \ - $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ + $(CXXFLAGS) MEDIADLL_OBJECTS = \ $(OBJS)\mediadll_dummy.o \ + $(OBJS)\mediadll_version_rc.o \ $(OBJS)\mediadll_mediactrlcmn.o \ $(OBJS)\mediadll_mediactrl.o MEDIALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W -Wall \ -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ - -I..\..\src\regex -I..\..\src\expat\lib $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) + -I..\..\src\regex -I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) MEDIALIB_OBJECTS = \ $(OBJS)\medialib_dummy.o \ $(OBJS)\medialib_mediactrlcmn.o \ @@ -681,18 +681,19 @@ ODBCDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I..\..\include -I$(SETUPHDIR) -W -Wall -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 $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) + -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) ODBCDLL_OBJECTS = \ $(OBJS)\odbcdll_dummy.o \ + $(OBJS)\odbcdll_version_rc.o \ $(OBJS)\odbcdll_db.o \ $(OBJS)\odbcdll_dbtable.o ODBCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_GUI=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) \ - $(CXXFLAGS) + -DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \ + $(CPPFLAGS) $(CXXFLAGS) ODBCLIB_OBJECTS = \ $(OBJS)\odbclib_dummy.o \ $(OBJS)\odbclib_db.o \ @@ -702,16 +703,18 @@ DBGRIDDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W -Wall \ -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_DBGRID \ - $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ + $(CXXFLAGS) DBGRIDDLL_OBJECTS = \ $(OBJS)\dbgriddll_dummy.o \ + $(OBJS)\dbgriddll_version_rc.o \ $(OBJS)\dbgriddll_dbgrid.o DBGRIDLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W -Wall \ -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ - -I..\..\src\regex -I..\..\src\expat\lib $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) + -I..\..\src\regex -I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) DBGRIDLIB_OBJECTS = \ $(OBJS)\dbgridlib_dummy.o \ $(OBJS)\dbgridlib_dbgrid.o @@ -719,10 +722,11 @@ HTMLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DWXUSINGDLL -DWXMAKINGDLL_HTML $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) \ - $(CPPFLAGS) $(CXXFLAGS) + -DWXUSINGDLL -DWXMAKINGDLL_HTML $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_dummy.o \ + $(OBJS)\htmldll_version_rc.o \ $(OBJS)\htmldll_helpbest.o \ $(OBJS)\htmldll_helpctrl.o \ $(OBJS)\htmldll_helpdata.o \ @@ -749,7 +753,8 @@ HTMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ + $(CXXFLAGS) HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_dummy.o \ $(OBJS)\htmllib_helpbest.o \ @@ -778,18 +783,19 @@ XMLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I..\..\include -I$(SETUPHDIR) -W -Wall -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 $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) + -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_XML $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) XMLDLL_OBJECTS = \ $(OBJS)\xmldll_dummy.o \ + $(OBJS)\xmldll_version_rc.o \ $(OBJS)\xmldll_xml.o \ $(OBJS)\xmldll_xtixml.o XMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_GUI=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) \ - $(CXXFLAGS) + -DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \ + $(CPPFLAGS) $(CXXFLAGS) XMLLIB_OBJECTS = \ $(OBJS)\xmllib_dummy.o \ $(OBJS)\xmllib_xml.o \ @@ -798,10 +804,11 @@ XRCDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DWXUSINGDLL -DWXMAKINGDLL_XRC $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) \ - $(CPPFLAGS) $(CXXFLAGS) + -DWXUSINGDLL -DWXMAKINGDLL_XRC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_dummy.o \ + $(OBJS)\xrcdll_version_rc.o \ $(OBJS)\xrcdll_xh_bmpbt.o \ $(OBJS)\xrcdll_xh_bmp.o \ $(OBJS)\xrcdll_xh_bttn.o \ @@ -809,13 +816,16 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_chckb.o \ $(OBJS)\xrcdll_xh_chckl.o \ $(OBJS)\xrcdll_xh_choic.o \ + $(OBJS)\xrcdll_xh_choicbk.o \ $(OBJS)\xrcdll_xh_combo.o \ + $(OBJS)\xrcdll_xh_datectrl.o \ $(OBJS)\xrcdll_xh_dlg.o \ $(OBJS)\xrcdll_xh_frame.o \ $(OBJS)\xrcdll_xh_gauge.o \ $(OBJS)\xrcdll_xh_gdctl.o \ $(OBJS)\xrcdll_xh_html.o \ $(OBJS)\xrcdll_xh_listb.o \ + $(OBJS)\xrcdll_xh_listbk.o \ $(OBJS)\xrcdll_xh_listc.o \ $(OBJS)\xrcdll_xh_menu.o \ $(OBJS)\xrcdll_xh_notbk.o \ @@ -845,7 +855,8 @@ XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ + $(CXXFLAGS) XRCLIB_OBJECTS = \ $(OBJS)\xrclib_dummy.o \ $(OBJS)\xrclib_xh_bmpbt.o \ @@ -855,13 +866,16 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_chckb.o \ $(OBJS)\xrclib_xh_chckl.o \ $(OBJS)\xrclib_xh_choic.o \ + $(OBJS)\xrclib_xh_choicbk.o \ $(OBJS)\xrclib_xh_combo.o \ + $(OBJS)\xrclib_xh_datectrl.o \ $(OBJS)\xrclib_xh_dlg.o \ $(OBJS)\xrclib_xh_frame.o \ $(OBJS)\xrclib_xh_gauge.o \ $(OBJS)\xrclib_xh_gdctl.o \ $(OBJS)\xrclib_xh_html.o \ $(OBJS)\xrclib_xh_listb.o \ + $(OBJS)\xrclib_xh_listbk.o \ $(OBJS)\xrclib_xh_listc.o \ $(OBJS)\xrclib_xh_menu.o \ $(OBJS)\xrclib_xh_notbk.o \ @@ -891,16 +905,18 @@ GLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DWXUSINGDLL -DWXMAKINGDLL_GL $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) \ - $(CPPFLAGS) $(CXXFLAGS) + -DWXUSINGDLL -DWXMAKINGDLL_GL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) GLDLL_OBJECTS = \ $(OBJS)\gldll_dummy.o \ + $(OBJS)\gldll_version_rc.o \ $(OBJS)\gldll_glcanvas.o GLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ + $(CXXFLAGS) GLLIB_OBJECTS = \ $(OBJS)\gllib_dummy.o \ $(OBJS)\gllib_glcanvas.o @@ -940,6 +956,12 @@ endif ifeq ($(SHARED),1) WXDLLFLAG = dll endif +ifeq ($(SHARED),0) +LIBTYPE_SUFFIX = lib +endif +ifeq ($(SHARED),1) +LIBTYPE_SUFFIX = dll +endif ifeq ($(USE_GUI),1) __wxpng___depname = $(LIBDIRNAME)\libwxpng$(WXDEBUGFLAG).a endif @@ -949,12 +971,6 @@ endif ifeq ($(USE_GUI),1) __wxtiff___depname = $(LIBDIRNAME)\libwxtiff$(WXDEBUGFLAG).a endif -ifeq ($(SHARED),0) -____LIBDIRNAME_FILENAMES_6_p = -I..\..\lib\gcc_lib$(CFG) -endif -ifeq ($(SHARED),1) -____LIBDIRNAME_FILENAMES_6_p = -I..\..\lib\gcc_dll$(CFG) -endif ifeq ($(MONOLITHIC),0) EXTRALIBS_FOR_BASE = endif @@ -970,20 +986,7 @@ endif ifeq ($(USE_GUI),1) ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(____CORE_SRC_FILENAMES_OBJECTS) \ - $(OBJS)\monodll_calctrl.o \ - $(OBJS)\monodll_grid.o \ - $(OBJS)\monodll_gridctrl.o \ - $(OBJS)\monodll_gridsel.o \ - $(OBJS)\monodll_helpext.o \ - $(OBJS)\monodll_laywin.o \ - $(OBJS)\monodll_sashwin.o \ - $(OBJS)\monodll_splash.o \ - $(OBJS)\monodll_tipdlg.o \ - $(OBJS)\monodll_wizard.o \ - $(OBJS)\monodll_taskbarcmn.o \ - $(OBJS)\monodll_sound.o \ - $(OBJS)\monodll_taskbar.o \ - $(OBJS)\monodll_joystick.o \ + $(____ADVANCED_SRC_FILENAMES_OBJECTS) \ $(OBJS)\monodll_mediactrlcmn.o \ $(OBJS)\monodll_mediactrl.o \ $(OBJS)\monodll_helpbest.o \ @@ -1018,13 +1021,16 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_chckb.o \ $(OBJS)\monodll_xh_chckl.o \ $(OBJS)\monodll_xh_choic.o \ + $(OBJS)\monodll_xh_choicbk.o \ $(OBJS)\monodll_xh_combo.o \ + $(OBJS)\monodll_xh_datectrl.o \ $(OBJS)\monodll_xh_dlg.o \ $(OBJS)\monodll_xh_frame.o \ $(OBJS)\monodll_xh_gauge.o \ $(OBJS)\monodll_xh_gdctl.o \ $(OBJS)\monodll_xh_html.o \ $(OBJS)\monodll_xh_listb.o \ + $(OBJS)\monodll_xh_listbk.o \ $(OBJS)\monodll_xh_listc.o \ $(OBJS)\monodll_xh_menu.o \ $(OBJS)\monodll_xh_notbk.o \ @@ -1228,6 +1234,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_choicdgg.o \ $(OBJS)\monodll_choicbkg.o \ $(OBJS)\monodll_dcpsg.o \ + $(OBJS)\monodll_dbgrptg.o \ $(OBJS)\monodll_dirctrlg.o \ $(OBJS)\monodll_dragimgg.o \ $(OBJS)\monodll_listbkg.o \ @@ -1426,6 +1433,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_choicdgg.o \ $(OBJS)\monodll_choicbkg.o \ $(OBJS)\monodll_dcpsg.o \ + $(OBJS)\monodll_dbgrptg.o \ $(OBJS)\monodll_dirctrlg.o \ $(OBJS)\monodll_dragimgg.o \ $(OBJS)\monodll_listbkg.o \ @@ -1446,6 +1454,43 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_vscroll.o endif endif +ifeq ($(WXUNIV),0) +____ADVANCED_SRC_FILENAMES_OBJECTS = \ + $(OBJS)\monodll_calctrl.o \ + $(OBJS)\monodll_datectlg.o \ + $(OBJS)\monodll_grid.o \ + $(OBJS)\monodll_gridctrl.o \ + $(OBJS)\monodll_gridsel.o \ + $(OBJS)\monodll_helpext.o \ + $(OBJS)\monodll_laywin.o \ + $(OBJS)\monodll_sashwin.o \ + $(OBJS)\monodll_splash.o \ + $(OBJS)\monodll_tipdlg.o \ + $(OBJS)\monodll_wizard.o \ + $(OBJS)\monodll_taskbarcmn.o \ + $(OBJS)\monodll_sound.o \ + $(OBJS)\monodll_taskbar.o \ + $(OBJS)\monodll_joystick.o \ + $(OBJS)\monodll_datectrl.o +endif +ifeq ($(WXUNIV),1) +____ADVANCED_SRC_FILENAMES_OBJECTS = \ + $(OBJS)\monodll_calctrl.o \ + $(OBJS)\monodll_datectlg.o \ + $(OBJS)\monodll_grid.o \ + $(OBJS)\monodll_gridctrl.o \ + $(OBJS)\monodll_gridsel.o \ + $(OBJS)\monodll_helpext.o \ + $(OBJS)\monodll_laywin.o \ + $(OBJS)\monodll_sashwin.o \ + $(OBJS)\monodll_splash.o \ + $(OBJS)\monodll_tipdlg.o \ + $(OBJS)\monodll_wizard.o \ + $(OBJS)\monodll_taskbarcmn.o \ + $(OBJS)\monodll_sound.o \ + $(OBJS)\monodll_taskbar.o \ + $(OBJS)\monodll_joystick.o +endif ifeq ($(MONOLITHIC),1) ifeq ($(SHARED),0) __monolib___depname = \ @@ -1455,20 +1500,7 @@ endif ifeq ($(USE_GUI),1) ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(____CORE_SRC_FILENAMES_1_OBJECTS) \ - $(OBJS)\monolib_calctrl.o \ - $(OBJS)\monolib_grid.o \ - $(OBJS)\monolib_gridctrl.o \ - $(OBJS)\monolib_gridsel.o \ - $(OBJS)\monolib_helpext.o \ - $(OBJS)\monolib_laywin.o \ - $(OBJS)\monolib_sashwin.o \ - $(OBJS)\monolib_splash.o \ - $(OBJS)\monolib_tipdlg.o \ - $(OBJS)\monolib_wizard.o \ - $(OBJS)\monolib_taskbarcmn.o \ - $(OBJS)\monolib_sound.o \ - $(OBJS)\monolib_taskbar.o \ - $(OBJS)\monolib_joystick.o \ + $(____ADVANCED_SRC_FILENAMES_1_OBJECTS) \ $(OBJS)\monolib_mediactrlcmn.o \ $(OBJS)\monolib_mediactrl.o \ $(OBJS)\monolib_helpbest.o \ @@ -1503,13 +1535,16 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_chckb.o \ $(OBJS)\monolib_xh_chckl.o \ $(OBJS)\monolib_xh_choic.o \ + $(OBJS)\monolib_xh_choicbk.o \ $(OBJS)\monolib_xh_combo.o \ + $(OBJS)\monolib_xh_datectrl.o \ $(OBJS)\monolib_xh_dlg.o \ $(OBJS)\monolib_xh_frame.o \ $(OBJS)\monolib_xh_gauge.o \ $(OBJS)\monolib_xh_gdctl.o \ $(OBJS)\monolib_xh_html.o \ $(OBJS)\monolib_xh_listb.o \ + $(OBJS)\monolib_xh_listbk.o \ $(OBJS)\monolib_xh_listc.o \ $(OBJS)\monolib_xh_menu.o \ $(OBJS)\monolib_xh_notbk.o \ @@ -1713,6 +1748,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_choicdgg.o \ $(OBJS)\monolib_choicbkg.o \ $(OBJS)\monolib_dcpsg.o \ + $(OBJS)\monolib_dbgrptg.o \ $(OBJS)\monolib_dirctrlg.o \ $(OBJS)\monolib_dragimgg.o \ $(OBJS)\monolib_listbkg.o \ @@ -1911,6 +1947,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_choicdgg.o \ $(OBJS)\monolib_choicbkg.o \ $(OBJS)\monolib_dcpsg.o \ + $(OBJS)\monolib_dbgrptg.o \ $(OBJS)\monolib_dirctrlg.o \ $(OBJS)\monolib_dragimgg.o \ $(OBJS)\monolib_listbkg.o \ @@ -1931,6 +1968,43 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_vscroll.o endif endif +ifeq ($(WXUNIV),0) +____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ + $(OBJS)\monolib_calctrl.o \ + $(OBJS)\monolib_datectlg.o \ + $(OBJS)\monolib_grid.o \ + $(OBJS)\monolib_gridctrl.o \ + $(OBJS)\monolib_gridsel.o \ + $(OBJS)\monolib_helpext.o \ + $(OBJS)\monolib_laywin.o \ + $(OBJS)\monolib_sashwin.o \ + $(OBJS)\monolib_splash.o \ + $(OBJS)\monolib_tipdlg.o \ + $(OBJS)\monolib_wizard.o \ + $(OBJS)\monolib_taskbarcmn.o \ + $(OBJS)\monolib_sound.o \ + $(OBJS)\monolib_taskbar.o \ + $(OBJS)\monolib_joystick.o \ + $(OBJS)\monolib_datectrl.o +endif +ifeq ($(WXUNIV),1) +____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ + $(OBJS)\monolib_calctrl.o \ + $(OBJS)\monolib_datectlg.o \ + $(OBJS)\monolib_grid.o \ + $(OBJS)\monolib_gridctrl.o \ + $(OBJS)\monolib_gridsel.o \ + $(OBJS)\monolib_helpext.o \ + $(OBJS)\monolib_laywin.o \ + $(OBJS)\monolib_sashwin.o \ + $(OBJS)\monolib_splash.o \ + $(OBJS)\monolib_tipdlg.o \ + $(OBJS)\monolib_wizard.o \ + $(OBJS)\monolib_taskbarcmn.o \ + $(OBJS)\monolib_sound.o \ + $(OBJS)\monolib_taskbar.o \ + $(OBJS)\monolib_joystick.o +endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) __basedll___depname = \ @@ -2140,6 +2214,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_choicdgg.o \ $(OBJS)\coredll_choicbkg.o \ $(OBJS)\coredll_dcpsg.o \ + $(OBJS)\coredll_dbgrptg.o \ $(OBJS)\coredll_dirctrlg.o \ $(OBJS)\coredll_dragimgg.o \ $(OBJS)\coredll_listbkg.o \ @@ -2338,6 +2413,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_choicdgg.o \ $(OBJS)\coredll_choicbkg.o \ $(OBJS)\coredll_dcpsg.o \ + $(OBJS)\coredll_dbgrptg.o \ $(OBJS)\coredll_dirctrlg.o \ $(OBJS)\coredll_dragimgg.o \ $(OBJS)\coredll_listbkg.o \ @@ -2543,6 +2619,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_choicdgg.o \ $(OBJS)\corelib_choicbkg.o \ $(OBJS)\corelib_dcpsg.o \ + $(OBJS)\corelib_dbgrptg.o \ $(OBJS)\corelib_dirctrlg.o \ $(OBJS)\corelib_dragimgg.o \ $(OBJS)\corelib_listbkg.o \ @@ -2741,6 +2818,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_choicdgg.o \ $(OBJS)\corelib_choicbkg.o \ $(OBJS)\corelib_dcpsg.o \ + $(OBJS)\corelib_dbgrptg.o \ $(OBJS)\corelib_dirctrlg.o \ $(OBJS)\corelib_dragimgg.o \ $(OBJS)\corelib_listbkg.o \ @@ -2769,6 +2847,43 @@ __advdll___depname = \ endif endif endif +ifeq ($(WXUNIV),0) +____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ + $(OBJS)\advdll_calctrl.o \ + $(OBJS)\advdll_datectlg.o \ + $(OBJS)\advdll_grid.o \ + $(OBJS)\advdll_gridctrl.o \ + $(OBJS)\advdll_gridsel.o \ + $(OBJS)\advdll_helpext.o \ + $(OBJS)\advdll_laywin.o \ + $(OBJS)\advdll_sashwin.o \ + $(OBJS)\advdll_splash.o \ + $(OBJS)\advdll_tipdlg.o \ + $(OBJS)\advdll_wizard.o \ + $(OBJS)\advdll_taskbarcmn.o \ + $(OBJS)\advdll_sound.o \ + $(OBJS)\advdll_taskbar.o \ + $(OBJS)\advdll_joystick.o \ + $(OBJS)\advdll_datectrl.o +endif +ifeq ($(WXUNIV),1) +____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ + $(OBJS)\advdll_calctrl.o \ + $(OBJS)\advdll_datectlg.o \ + $(OBJS)\advdll_grid.o \ + $(OBJS)\advdll_gridctrl.o \ + $(OBJS)\advdll_gridsel.o \ + $(OBJS)\advdll_helpext.o \ + $(OBJS)\advdll_laywin.o \ + $(OBJS)\advdll_sashwin.o \ + $(OBJS)\advdll_splash.o \ + $(OBJS)\advdll_tipdlg.o \ + $(OBJS)\advdll_wizard.o \ + $(OBJS)\advdll_taskbarcmn.o \ + $(OBJS)\advdll_sound.o \ + $(OBJS)\advdll_taskbar.o \ + $(OBJS)\advdll_joystick.o +endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) ifeq ($(USE_GUI),1) @@ -2777,6 +2892,43 @@ __advlib___depname = \ endif endif endif +ifeq ($(WXUNIV),0) +____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ + $(OBJS)\advlib_calctrl.o \ + $(OBJS)\advlib_datectlg.o \ + $(OBJS)\advlib_grid.o \ + $(OBJS)\advlib_gridctrl.o \ + $(OBJS)\advlib_gridsel.o \ + $(OBJS)\advlib_helpext.o \ + $(OBJS)\advlib_laywin.o \ + $(OBJS)\advlib_sashwin.o \ + $(OBJS)\advlib_splash.o \ + $(OBJS)\advlib_tipdlg.o \ + $(OBJS)\advlib_wizard.o \ + $(OBJS)\advlib_taskbarcmn.o \ + $(OBJS)\advlib_sound.o \ + $(OBJS)\advlib_taskbar.o \ + $(OBJS)\advlib_joystick.o \ + $(OBJS)\advlib_datectrl.o +endif +ifeq ($(WXUNIV),1) +____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ + $(OBJS)\advlib_calctrl.o \ + $(OBJS)\advlib_datectlg.o \ + $(OBJS)\advlib_grid.o \ + $(OBJS)\advlib_gridctrl.o \ + $(OBJS)\advlib_gridsel.o \ + $(OBJS)\advlib_helpext.o \ + $(OBJS)\advlib_laywin.o \ + $(OBJS)\advlib_sashwin.o \ + $(OBJS)\advlib_splash.o \ + $(OBJS)\advlib_tipdlg.o \ + $(OBJS)\advlib_wizard.o \ + $(OBJS)\advlib_taskbarcmn.o \ + $(OBJS)\advlib_sound.o \ + $(OBJS)\advlib_taskbar.o \ + $(OBJS)\advlib_joystick.o +endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) @@ -2905,6 +3057,26 @@ __gllib___depname = \ endif endif endif +ifeq ($(USE_THREADS),0) +__THREADSFLAG = +endif +ifeq ($(USE_THREADS),1) +__THREADSFLAG = -mthreads +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p_45 = --define __WXUNIVERSAL__ +endif +ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +__DEBUG_DEFINE_p_45 = --define __WXDEBUG__ +endif +endif +ifeq ($(DEBUG_FLAG),1) +__DEBUG_DEFINE_p_45 = --define __WXDEBUG__ +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p_46 = --define _UNICODE +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif @@ -2939,17 +3111,17 @@ endif ifeq ($(BUILD),release) __OPTIMIZEFLAG = -O2 endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONSFLAG = -fno-rtti +ifeq ($(USE_RTTI),0) +__RTTIFLAG = -fno-rtti endif -ifeq ($(USE_EXCEPTIONS),1) -__EXCEPTIONSFLAG = +ifeq ($(USE_RTTI),1) +__RTTIFLAG = endif ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONSFLAG_14 = -fno-exceptions +__EXCEPTIONSFLAG = -fno-exceptions endif ifeq ($(USE_EXCEPTIONS),1) -__EXCEPTIONSFLAG_14 = +__EXCEPTIONSFLAG = endif ifeq ($(WXUNIV),1) __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -2965,12 +3137,6 @@ endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -D_UNICODE endif -ifeq ($(SHARED),0) -LIBDIRNAME = ..\..\lib\gcc_lib$(CFG) -endif -ifeq ($(SHARED),1) -LIBDIRNAME = ..\..\lib\gcc_dll$(CFG) -endif ifeq ($(WXUNIV),0) __SETUP_H_SUBDIR_FILENAMES = msw endif @@ -3073,8 +3239,8 @@ $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a: $(WXEXPAT_OBJECTS) ifeq ($(MONOLITHIC),1) ifeq ($(SHARED),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a - $(CXX) -shared -fPIC -o $@ $(MONODLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(OBJS)\monodll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a + $(CXX) -shared -fPIC -o $@ $(MONODLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif @@ -3089,8 +3255,8 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) -$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a - $(CXX) -shared -fPIC -o $@ $(BASEDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 +$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(OBJS)\basedll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a + $(CXX) -shared -fPIC -o $@ $(BASEDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif @@ -3105,8 +3271,8 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) -$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_gcc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) - $(CXX) -shared -fPIC -o $@ $(NETDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a +$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_gcc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(OBJS)\netdll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(NETDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif @@ -3122,8 +3288,8 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_gcc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) - $(CXX) -shared -fPIC -o $@ $(COREDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_gcc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(OBJS)\coredll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(COREDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -3142,8 +3308,8 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_gcc$(VENDORTAG).dll: $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname) - $(CXX) -shared -fPIC -o $@ $(ADVDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_gcc$(VENDORTAG).dll: $(ADVDLL_OBJECTS) $(OBJS)\advdll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(ADVDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -3162,8 +3328,8 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG).dll: $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname) - $(CXX) -shared -fPIC -o $@ $(MEDIADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG).dll: $(MEDIADLL_OBJECTS) $(OBJS)\mediadll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(MEDIADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -3182,8 +3348,8 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_ODBC),1) -$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_gcc$(VENDORTAG).dll: $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) - $(CXX) -shared -fPIC -o $@ $(ODBCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a +$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_gcc$(VENDORTAG).dll: $(ODBCDLL_OBJECTS) $(OBJS)\odbcdll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(ODBCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -3203,8 +3369,8 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_ODBC),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_gcc$(VENDORTAG).dll: $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname) - $(CXX) -shared -fPIC -o $@ $(DBGRIDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_gcc$(VENDORTAG).dll: $(DBGRIDDLL_OBJECTS) $(OBJS)\dbgriddll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(DBGRIDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -3227,8 +3393,8 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_HTML),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_gcc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname) - $(CXX) -shared -fPIC -o $@ $(HTMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_gcc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(OBJS)\htmldll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(HTMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -3249,8 +3415,8 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) -$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_gcc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) - $(CXX) -shared -fPIC -o $@ $(XMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a +$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_gcc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(OBJS)\xmldll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(XMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif @@ -3266,8 +3432,8 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_XRC),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_gcc$(VENDORTAG).dll: $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__htmldll___depname) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname) - $(CXX) -shared -fPIC -o $@ $(XRCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_gcc$(VENDORTAG).dll: $(XRCDLL_OBJECTS) $(OBJS)\xrcdll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__htmldll___depname) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(XRCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -3286,8 +3452,8 @@ endif ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_OPENGL),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) $(__coredll___depname) - $(CXX) -shared -fPIC -o $@ $(GLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) -lopengl32 -lglu32 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(OBJS)\gldll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) $(__coredll___depname) + $(CXX) -shared -fPIC -o $@ $(GLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) -lopengl32 -lglu32 endif endif endif @@ -3324,7 +3490,7 @@ $(SETUPHDIR)\wx\setup.h: build_cfg_file: $(SETUPHDIR) @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=5 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=4 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @@ -3338,6 +3504,7 @@ build_cfg_file: $(SETUPHDIR) @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE) @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE) @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE) + @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE) @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE) @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE) @echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE) @@ -3701,6 +3868,9 @@ $(OBJS)\wxexpat_xmltok.o: ../../src/expat/lib/xmltok.c $(OBJS)\monodll_dummy.o: ../../src/msw/dummy.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_version_rc.o: ../../src/msw/version.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_45) $(__DEBUG_DEFINE_p_45) $(__UNICODE_DEFINE_p_46) --include-dir ..\../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG) + $(OBJS)\monodll_appbase.o: ../../src/common/appbase.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -3722,6 +3892,9 @@ $(OBJS)\monodll_datetime.o: ../../src/common/datetime.cpp $(OBJS)\monodll_datstrm.o: ../../src/common/datstrm.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_debugrpt.o: ../../src/common/debugrpt.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_dircmn.o: ../../src/common/dircmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -3872,12 +4045,18 @@ $(OBJS)\monodll_basemsw.o: ../../src/msw/basemsw.cpp $(OBJS)\monodll_crashrpt.o: ../../src/msw/crashrpt.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_debughlp.o: ../../src/msw/debughlp.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_dde.o: ../../src/msw/dde.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_dir.o: ../../src/msw/dir.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_dlmsw.o: ../../src/msw/dlmsw.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_mimetype.o: ../../src/msw/mimetype.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -3890,6 +4069,9 @@ $(OBJS)\monodll_registry.o: ../../src/msw/registry.cpp $(OBJS)\monodll_snglinst.o: ../../src/msw/snglinst.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_stackwalk.o: ../../src/msw/stackwalk.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_stdpaths.o: ../../src/msw/stdpaths.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -4094,46 +4276,7 @@ $(OBJS)\monodll_metal.o: ../../src/univ/themes/metal.cpp $(OBJS)\monodll_win32.o: ../../src/univ/themes/win32.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_calctrl.o: ../../src/generic/calctrl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_grid.o: ../../src/generic/grid.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_gridctrl.o: ../../src/generic/gridctrl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_gridsel.o: ../../src/generic/gridsel.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_helpext.o: ../../src/generic/helpext.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_laywin.o: ../../src/generic/laywin.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_sashwin.o: ../../src/generic/sashwin.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_splash.o: ../../src/generic/splash.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_tipdlg.o: ../../src/generic/tipdlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_wizard.o: ../../src/generic/wizard.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_taskbarcmn.o: ../../src/common/taskbarcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_sound.o: ../../src/msw/sound.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_taskbar.o: ../../src/msw/taskbar.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_joystick.o: ../../src/msw/joystick.cpp +$(OBJS)\monodll_datectrl.o: ../../src/msw/datectrl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp @@ -4238,9 +4381,15 @@ $(OBJS)\monodll_xh_chckl.o: ../../src/xrc/xh_chckl.cpp $(OBJS)\monodll_xh_choic.o: ../../src/xrc/xh_choic.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_xh_choicbk.o: ../../src/xrc/xh_choicbk.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_xh_combo.o: ../../src/xrc/xh_combo.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_xh_dlg.o: ../../src/xrc/xh_dlg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -4259,6 +4408,9 @@ $(OBJS)\monodll_xh_html.o: ../../src/xrc/xh_html.cpp $(OBJS)\monodll_xh_listb.o: ../../src/xrc/xh_listb.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_xh_listbk.o: ../../src/xrc/xh_listbk.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_xh_listc.o: ../../src/xrc/xh_listc.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -5241,177 +5393,257 @@ $(OBJS)\monodll_settcmn.o: ../../src/common/settcmn.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_sizer.o: ../../src/common/sizer.cpp +$(OBJS)\monodll_sizer.o: ../../src/common/sizer.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_statbar.o: ../../src/common/statbar.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_stockitem.o: ../../src/common/stockitem.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_tbarbase.o: ../../src/common/tbarbase.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_textcmn.o: ../../src/common/textcmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_timercmn.o: ../../src/common/timercmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_toplvcmn.o: ../../src/common/toplvcmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_treebase.o: ../../src/common/treebase.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_valgen.o: ../../src/common/valgen.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_validate.o: ../../src/common/validate.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_valtext.o: ../../src/common/valtext.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_wincmn.o: ../../src/common/wincmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_xpmdecod.o: ../../src/common/xpmdecod.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_busyinfo.o: ../../src/generic/busyinfo.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_choicdgg.o: ../../src/generic/choicdgg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_choicbkg.o: ../../src/generic/choicbkg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_dcpsg.o: ../../src/generic/dcpsg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_statbar.o: ../../src/common/statbar.cpp +$(OBJS)\monodll_dbgrptg.o: ../../src/generic/dbgrptg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_stockitem.o: ../../src/common/stockitem.cpp +$(OBJS)\monodll_dirctrlg.o: ../../src/generic/dirctrlg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_tbarbase.o: ../../src/common/tbarbase.cpp +$(OBJS)\monodll_dragimgg.o: ../../src/generic/dragimgg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_textcmn.o: ../../src/common/textcmn.cpp +$(OBJS)\monodll_listbkg.o: ../../src/generic/listbkg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_timercmn.o: ../../src/common/timercmn.cpp +$(OBJS)\monodll_logg.o: ../../src/generic/logg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_toplvcmn.o: ../../src/common/toplvcmn.cpp +$(OBJS)\monodll_numdlgg.o: ../../src/generic/numdlgg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_treebase.o: ../../src/common/treebase.cpp +$(OBJS)\monodll_panelg.o: ../../src/generic/panelg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_valgen.o: ../../src/common/valgen.cpp +$(OBJS)\monodll_progdlgg.o: ../../src/generic/progdlgg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_validate.o: ../../src/common/validate.cpp +$(OBJS)\monodll_printps.o: ../../src/generic/printps.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_valtext.o: ../../src/common/valtext.cpp +$(OBJS)\monodll_renderg.o: ../../src/generic/renderg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_wincmn.o: ../../src/common/wincmn.cpp +$(OBJS)\monodll_scrlwing.o: ../../src/generic/scrlwing.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_xpmdecod.o: ../../src/common/xpmdecod.cpp +$(OBJS)\monodll_selstore.o: ../../src/generic/selstore.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_busyinfo.o: ../../src/generic/busyinfo.cpp +$(OBJS)\monodll_spinctlg.o: ../../src/generic/spinctlg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_choicdgg.o: ../../src/generic/choicdgg.cpp +$(OBJS)\monodll_splitter.o: ../../src/generic/splitter.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_choicbkg.o: ../../src/generic/choicbkg.cpp +$(OBJS)\monodll_textdlgg.o: ../../src/generic/textdlgg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dcpsg.o: ../../src/generic/dcpsg.cpp +$(OBJS)\monodll_tipwin.o: ../../src/generic/tipwin.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dirctrlg.o: ../../src/generic/dirctrlg.cpp +$(OBJS)\monodll_treectlg.o: ../../src/generic/treectlg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dragimgg.o: ../../src/generic/dragimgg.cpp +$(OBJS)\monodll_vlbox.o: ../../src/generic/vlbox.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_listbkg.o: ../../src/generic/listbkg.cpp +$(OBJS)\monodll_vscroll.o: ../../src/generic/vscroll.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_logg.o: ../../src/generic/logg.cpp +$(OBJS)\monodll_calctrl.o: ../../src/generic/calctrl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_numdlgg.o: ../../src/generic/numdlgg.cpp +$(OBJS)\monodll_datectlg.o: ../../src/generic/datectlg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_panelg.o: ../../src/generic/panelg.cpp +$(OBJS)\monodll_grid.o: ../../src/generic/grid.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_progdlgg.o: ../../src/generic/progdlgg.cpp +$(OBJS)\monodll_gridctrl.o: ../../src/generic/gridctrl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_printps.o: ../../src/generic/printps.cpp +$(OBJS)\monodll_gridsel.o: ../../src/generic/gridsel.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_renderg.o: ../../src/generic/renderg.cpp +$(OBJS)\monodll_helpext.o: ../../src/generic/helpext.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_scrlwing.o: ../../src/generic/scrlwing.cpp +$(OBJS)\monodll_laywin.o: ../../src/generic/laywin.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_selstore.o: ../../src/generic/selstore.cpp +$(OBJS)\monodll_sashwin.o: ../../src/generic/sashwin.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_spinctlg.o: ../../src/generic/spinctlg.cpp +$(OBJS)\monodll_splash.o: ../../src/generic/splash.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_splitter.o: ../../src/generic/splitter.cpp +$(OBJS)\monodll_tipdlg.o: ../../src/generic/tipdlg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_textdlgg.o: ../../src/generic/textdlgg.cpp +$(OBJS)\monodll_wizard.o: ../../src/generic/wizard.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_tipwin.o: ../../src/generic/tipwin.cpp +$(OBJS)\monodll_taskbarcmn.o: ../../src/common/taskbarcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_treectlg.o: ../../src/generic/treectlg.cpp +$(OBJS)\monodll_sound.o: ../../src/msw/sound.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_vlbox.o: ../../src/generic/vlbox.cpp +$(OBJS)\monodll_taskbar.o: ../../src/msw/taskbar.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_vscroll.o: ../../src/generic/vscroll.cpp +$(OBJS)\monodll_joystick.o: ../../src/msw/joystick.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif @@ -5439,6 +5671,9 @@ $(OBJS)\monolib_datetime.o: ../../src/common/datetime.cpp $(OBJS)\monolib_datstrm.o: ../../src/common/datstrm.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_debugrpt.o: ../../src/common/debugrpt.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_dircmn.o: ../../src/common/dircmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -5589,12 +5824,18 @@ $(OBJS)\monolib_basemsw.o: ../../src/msw/basemsw.cpp $(OBJS)\monolib_crashrpt.o: ../../src/msw/crashrpt.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_debughlp.o: ../../src/msw/debughlp.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_dde.o: ../../src/msw/dde.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_dir.o: ../../src/msw/dir.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_dlmsw.o: ../../src/msw/dlmsw.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_mimetype.o: ../../src/msw/mimetype.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -5607,6 +5848,9 @@ $(OBJS)\monolib_registry.o: ../../src/msw/registry.cpp $(OBJS)\monolib_snglinst.o: ../../src/msw/snglinst.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_stackwalk.o: ../../src/msw/stackwalk.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_stdpaths.o: ../../src/msw/stdpaths.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -5811,46 +6055,7 @@ $(OBJS)\monolib_metal.o: ../../src/univ/themes/metal.cpp $(OBJS)\monolib_win32.o: ../../src/univ/themes/win32.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_calctrl.o: ../../src/generic/calctrl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_grid.o: ../../src/generic/grid.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_gridctrl.o: ../../src/generic/gridctrl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_gridsel.o: ../../src/generic/gridsel.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_helpext.o: ../../src/generic/helpext.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_laywin.o: ../../src/generic/laywin.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_sashwin.o: ../../src/generic/sashwin.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_splash.o: ../../src/generic/splash.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_tipdlg.o: ../../src/generic/tipdlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_wizard.o: ../../src/generic/wizard.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_taskbarcmn.o: ../../src/common/taskbarcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_sound.o: ../../src/msw/sound.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_taskbar.o: ../../src/msw/taskbar.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_joystick.o: ../../src/msw/joystick.cpp +$(OBJS)\monolib_datectrl.o: ../../src/msw/datectrl.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp @@ -5955,9 +6160,15 @@ $(OBJS)\monolib_xh_chckl.o: ../../src/xrc/xh_chckl.cpp $(OBJS)\monolib_xh_choic.o: ../../src/xrc/xh_choic.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_xh_choicbk.o: ../../src/xrc/xh_choicbk.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_xh_combo.o: ../../src/xrc/xh_combo.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_xh_dlg.o: ../../src/xrc/xh_dlg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -5976,6 +6187,9 @@ $(OBJS)\monolib_xh_html.o: ../../src/xrc/xh_html.cpp $(OBJS)\monolib_xh_listb.o: ../../src/xrc/xh_listb.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_xh_listbk.o: ../../src/xrc/xh_listbk.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_xh_listc.o: ../../src/xrc/xh_listc.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -7042,6 +7256,11 @@ $(OBJS)\monolib_dcpsg.o: ../../src/generic/dcpsg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_dbgrptg.o: ../../src/generic/dbgrptg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_dirctrlg.o: ../../src/generic/dirctrlg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -7132,9 +7351,87 @@ $(OBJS)\monolib_vscroll.o: ../../src/generic/vscroll.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_calctrl.o: ../../src/generic/calctrl.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_datectlg.o: ../../src/generic/datectlg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_grid.o: ../../src/generic/grid.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_gridctrl.o: ../../src/generic/gridctrl.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_gridsel.o: ../../src/generic/gridsel.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_helpext.o: ../../src/generic/helpext.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_laywin.o: ../../src/generic/laywin.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_sashwin.o: ../../src/generic/sashwin.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_splash.o: ../../src/generic/splash.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_tipdlg.o: ../../src/generic/tipdlg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_wizard.o: ../../src/generic/wizard.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_taskbarcmn.o: ../../src/common/taskbarcmn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_sound.o: ../../src/msw/sound.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_taskbar.o: ../../src/msw/taskbar.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_joystick.o: ../../src/msw/joystick.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + $(OBJS)\basedll_dummy.o: ../../src/msw/dummy.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_version_rc.o: ../../src/msw/version.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_45) $(__DEBUG_DEFINE_p_45) $(__UNICODE_DEFINE_p_46) --include-dir ..\../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG) + $(OBJS)\basedll_appbase.o: ../../src/common/appbase.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -7156,6 +7453,9 @@ $(OBJS)\basedll_datetime.o: ../../src/common/datetime.cpp $(OBJS)\basedll_datstrm.o: ../../src/common/datstrm.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_debugrpt.o: ../../src/common/debugrpt.cpp + $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_dircmn.o: ../../src/common/dircmn.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -7306,12 +7606,18 @@ $(OBJS)\basedll_basemsw.o: ../../src/msw/basemsw.cpp $(OBJS)\basedll_crashrpt.o: ../../src/msw/crashrpt.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_debughlp.o: ../../src/msw/debughlp.cpp + $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_dde.o: ../../src/msw/dde.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< $(OBJS)\basedll_dir.o: ../../src/msw/dir.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_dlmsw.o: ../../src/msw/dlmsw.cpp + $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_mimetype.o: ../../src/msw/mimetype.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -7324,6 +7630,9 @@ $(OBJS)\basedll_registry.o: ../../src/msw/registry.cpp $(OBJS)\basedll_snglinst.o: ../../src/msw/snglinst.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_stackwalk.o: ../../src/msw/stackwalk.cpp + $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_stdpaths.o: ../../src/msw/stdpaths.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -7381,6 +7690,9 @@ $(OBJS)\baselib_datetime.o: ../../src/common/datetime.cpp $(OBJS)\baselib_datstrm.o: ../../src/common/datstrm.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_debugrpt.o: ../../src/common/debugrpt.cpp + $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_dircmn.o: ../../src/common/dircmn.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -7531,12 +7843,18 @@ $(OBJS)\baselib_basemsw.o: ../../src/msw/basemsw.cpp $(OBJS)\baselib_crashrpt.o: ../../src/msw/crashrpt.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_debughlp.o: ../../src/msw/debughlp.cpp + $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_dde.o: ../../src/msw/dde.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< $(OBJS)\baselib_dir.o: ../../src/msw/dir.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_dlmsw.o: ../../src/msw/dlmsw.cpp + $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_mimetype.o: ../../src/msw/mimetype.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -7549,6 +7867,9 @@ $(OBJS)\baselib_registry.o: ../../src/msw/registry.cpp $(OBJS)\baselib_snglinst.o: ../../src/msw/snglinst.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_stackwalk.o: ../../src/msw/stackwalk.cpp + $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_stdpaths.o: ../../src/msw/stdpaths.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -7585,6 +7906,9 @@ $(OBJS)\baselib_volume.o: ../../src/msw/volume.cpp $(OBJS)\netdll_dummy.o: ../../src/msw/dummy.cpp $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $< +$(OBJS)\netdll_version_rc.o: ../../src/msw/version.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_45) $(__DEBUG_DEFINE_p_45) $(__UNICODE_DEFINE_p_46) --include-dir ..\../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_gcc$(VENDORTAG) + $(OBJS)\netdll_fs_inet.o: ../../src/common/fs_inet.cpp $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $< @@ -7663,6 +7987,9 @@ $(OBJS)\netlib_urlmsw.o: ../../src/msw/urlmsw.cpp $(OBJS)\coredll_dummy.o: ../../src/msw/dummy.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_version_rc.o: ../../src/msw/version.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_45) $(__DEBUG_DEFINE_p_45) $(__UNICODE_DEFINE_p_46) --include-dir ..\../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_gcc$(VENDORTAG) + $(OBJS)\coredll_event.o: ../../src/common/event.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8804,6 +9131,11 @@ $(OBJS)\coredll_dcpsg.o: ../../src/generic/dcpsg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_dbgrptg.o: ../../src/generic/dbgrptg.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_dirctrlg.o: ../../src/generic/dirctrlg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -10038,6 +10370,11 @@ $(OBJS)\corelib_dcpsg.o: ../../src/generic/dcpsg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_dbgrptg.o: ../../src/generic/dbgrptg.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_dirctrlg.o: ../../src/generic/dirctrlg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10131,9 +10468,18 @@ endif $(OBJS)\advdll_dummy.o: ../../src/msw/dummy.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< +$(OBJS)\advdll_version_rc.o: ../../src/msw/version.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_45) $(__DEBUG_DEFINE_p_45) $(__UNICODE_DEFINE_p_46) --include-dir ..\../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_gcc$(VENDORTAG) + +$(OBJS)\advdll_datectrl.o: ../../src/msw/datectrl.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< + $(OBJS)\advdll_calctrl.o: ../../src/generic/calctrl.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< +$(OBJS)\advdll_datectlg.o: ../../src/generic/datectlg.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< + $(OBJS)\advdll_grid.o: ../../src/generic/grid.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< @@ -10176,9 +10522,15 @@ $(OBJS)\advdll_joystick.o: ../../src/msw/joystick.cpp $(OBJS)\advlib_dummy.o: ../../src/msw/dummy.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< +$(OBJS)\advlib_datectrl.o: ../../src/msw/datectrl.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< + $(OBJS)\advlib_calctrl.o: ../../src/generic/calctrl.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< +$(OBJS)\advlib_datectlg.o: ../../src/generic/datectlg.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< + $(OBJS)\advlib_grid.o: ../../src/generic/grid.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< @@ -10221,6 +10573,9 @@ $(OBJS)\advlib_joystick.o: ../../src/msw/joystick.cpp $(OBJS)\mediadll_dummy.o: ../../src/msw/dummy.cpp $(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $< +$(OBJS)\mediadll_version_rc.o: ../../src/msw/version.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_45) $(__DEBUG_DEFINE_p_45) $(__UNICODE_DEFINE_p_46) --include-dir ..\../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG) + $(OBJS)\mediadll_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp $(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $< @@ -10239,6 +10594,9 @@ $(OBJS)\medialib_mediactrl.o: ../../src/msw/mediactrl.cpp $(OBJS)\odbcdll_dummy.o: ../../src/msw/dummy.cpp $(CXX) -c -o $@ $(ODBCDLL_CXXFLAGS) $< +$(OBJS)\odbcdll_version_rc.o: ../../src/msw/version.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_45) $(__DEBUG_DEFINE_p_45) $(__UNICODE_DEFINE_p_46) --include-dir ..\../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_gcc$(VENDORTAG) + $(OBJS)\odbcdll_db.o: ../../src/common/db.cpp $(CXX) -c -o $@ $(ODBCDLL_CXXFLAGS) $< @@ -10257,6 +10615,9 @@ $(OBJS)\odbclib_dbtable.o: ../../src/common/dbtable.cpp $(OBJS)\dbgriddll_dummy.o: ../../src/msw/dummy.cpp $(CXX) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $< +$(OBJS)\dbgriddll_version_rc.o: ../../src/msw/version.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_45) $(__DEBUG_DEFINE_p_45) $(__UNICODE_DEFINE_p_46) --include-dir ..\../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_gcc$(VENDORTAG) + $(OBJS)\dbgriddll_dbgrid.o: ../../src/common/dbgrid.cpp $(CXX) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $< @@ -10269,6 +10630,9 @@ $(OBJS)\dbgridlib_dbgrid.o: ../../src/common/dbgrid.cpp $(OBJS)\htmldll_dummy.o: ../../src/msw/dummy.cpp $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $< +$(OBJS)\htmldll_version_rc.o: ../../src/msw/version.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_45) $(__DEBUG_DEFINE_p_45) $(__UNICODE_DEFINE_p_46) --include-dir ..\../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_gcc$(VENDORTAG) + $(OBJS)\htmldll_helpbest.o: ../../src/msw/helpbest.cpp $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $< @@ -10407,6 +10771,9 @@ $(OBJS)\htmllib_htmllbox.o: ../../src/generic/htmllbox.cpp $(OBJS)\xmldll_dummy.o: ../../src/msw/dummy.cpp $(CXX) -c -o $@ $(XMLDLL_CXXFLAGS) $< +$(OBJS)\xmldll_version_rc.o: ../../src/msw/version.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_45) $(__DEBUG_DEFINE_p_45) $(__UNICODE_DEFINE_p_46) --include-dir ..\../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_gcc$(VENDORTAG) + $(OBJS)\xmldll_xml.o: ../../src/xml/xml.cpp $(CXX) -c -o $@ $(XMLDLL_CXXFLAGS) $< @@ -10425,6 +10792,9 @@ $(OBJS)\xmllib_xtixml.o: ../../src/common/xtixml.cpp $(OBJS)\xrcdll_dummy.o: ../../src/msw/dummy.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< +$(OBJS)\xrcdll_version_rc.o: ../../src/msw/version.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_45) $(__DEBUG_DEFINE_p_45) $(__UNICODE_DEFINE_p_46) --include-dir ..\../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_gcc$(VENDORTAG) + $(OBJS)\xrcdll_xh_bmpbt.o: ../../src/xrc/xh_bmpbt.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< @@ -10446,9 +10816,15 @@ $(OBJS)\xrcdll_xh_chckl.o: ../../src/xrc/xh_chckl.cpp $(OBJS)\xrcdll_xh_choic.o: ../../src/xrc/xh_choic.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< +$(OBJS)\xrcdll_xh_choicbk.o: ../../src/xrc/xh_choicbk.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(OBJS)\xrcdll_xh_combo.o: ../../src/xrc/xh_combo.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< +$(OBJS)\xrcdll_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(OBJS)\xrcdll_xh_dlg.o: ../../src/xrc/xh_dlg.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< @@ -10467,6 +10843,9 @@ $(OBJS)\xrcdll_xh_html.o: ../../src/xrc/xh_html.cpp $(OBJS)\xrcdll_xh_listb.o: ../../src/xrc/xh_listb.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< +$(OBJS)\xrcdll_xh_listbk.o: ../../src/xrc/xh_listbk.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + $(OBJS)\xrcdll_xh_listc.o: ../../src/xrc/xh_listc.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< @@ -10566,9 +10945,15 @@ $(OBJS)\xrclib_xh_chckl.o: ../../src/xrc/xh_chckl.cpp $(OBJS)\xrclib_xh_choic.o: ../../src/xrc/xh_choic.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< +$(OBJS)\xrclib_xh_choicbk.o: ../../src/xrc/xh_choicbk.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(OBJS)\xrclib_xh_combo.o: ../../src/xrc/xh_combo.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< +$(OBJS)\xrclib_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(OBJS)\xrclib_xh_dlg.o: ../../src/xrc/xh_dlg.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< @@ -10587,6 +10972,9 @@ $(OBJS)\xrclib_xh_html.o: ../../src/xrc/xh_html.cpp $(OBJS)\xrclib_xh_listb.o: ../../src/xrc/xh_listb.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< +$(OBJS)\xrclib_xh_listbk.o: ../../src/xrc/xh_listbk.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(OBJS)\xrclib_xh_listc.o: ../../src/xrc/xh_listc.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< @@ -10665,6 +11053,9 @@ $(OBJS)\xrclib_xmlrsall.o: ../../src/xrc/xmlrsall.cpp $(OBJS)\gldll_dummy.o: ../../src/msw/dummy.cpp $(CXX) -c -o $@ $(GLDLL_CXXFLAGS) $< +$(OBJS)\gldll_version_rc.o: ../../src/msw/version.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_45) $(__DEBUG_DEFINE_p_45) $(__UNICODE_DEFINE_p_46) --include-dir ..\../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG) + $(OBJS)\gldll_glcanvas.o: ../../src/msw/glcanvas.cpp $(CXX) -c -o $@ $(GLDLL_CXXFLAGS) $< @@ -10676,3 +11067,4 @@ $(OBJS)\gllib_glcanvas.o: ../../src/msw/glcanvas.cpp .PHONY: all clean setup_h samples build_cfg_file +