X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8329fea8ad89a4df6c2f0441facdc5ad189473ea..be7c2a2033f57f92c23f0db8220cb53ad47eabde:/build/msw/makefile.vc diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index f50ea4cd4a..aec0f5523f 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.4 (http://bakefile.sourceforge.net) +# Bakefile 0.1.6 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -25,9 +25,10 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ RUNTIME_LIBS="$(RUNTIME_LIBS)" WX_RELEASE_NODOT = 25 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4 OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = ..\..\lib\vc_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 $(__DEBUGINFO) \ @@ -169,7 +170,7 @@ WXTIFF_OBJECTS = \ WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_63) /DWIN32 \ $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \ $(____DEBUGRUNTIME_62_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \ - $(____LIBDIRNAME_FILENAMES_6_p) /DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS) + /I$(LIBDIRNAME) /DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS) WXEXPAT_OBJECTS = \ $(OBJS)\wxexpat_xmlparse.obj \ $(OBJS)\wxexpat_xmlrole.obj \ @@ -250,12 +251,15 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_zstream.obj \ $(OBJS)\monodll_basemsw.obj \ $(OBJS)\monodll_crashrpt.obj \ + $(OBJS)\monodll_debughlp.obj \ $(OBJS)\monodll_dde.obj \ $(OBJS)\monodll_dir.obj \ + $(OBJS)\monodll_dlmsw.obj \ $(OBJS)\monodll_mimetype.obj \ $(OBJS)\monodll_regconf.obj \ $(OBJS)\monodll_registry.obj \ $(OBJS)\monodll_snglinst.obj \ + $(OBJS)\monodll_stackwalk.obj \ $(OBJS)\monodll_stdpaths.obj \ $(OBJS)\monodll_thread.obj \ $(OBJS)\monodll_utils.obj \ @@ -358,12 +362,15 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_zstream.obj \ $(OBJS)\monolib_basemsw.obj \ $(OBJS)\monolib_crashrpt.obj \ + $(OBJS)\monolib_debughlp.obj \ $(OBJS)\monolib_dde.obj \ $(OBJS)\monolib_dir.obj \ + $(OBJS)\monolib_dlmsw.obj \ $(OBJS)\monolib_mimetype.obj \ $(OBJS)\monolib_regconf.obj \ $(OBJS)\monolib_registry.obj \ $(OBJS)\monolib_snglinst.obj \ + $(OBJS)\monolib_stackwalk.obj \ $(OBJS)\monolib_stdpaths.obj \ $(OBJS)\monolib_thread.obj \ $(OBJS)\monolib_utils.obj \ @@ -467,12 +474,15 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_zstream.obj \ $(OBJS)\basedll_basemsw.obj \ $(OBJS)\basedll_crashrpt.obj \ + $(OBJS)\basedll_debughlp.obj \ $(OBJS)\basedll_dde.obj \ $(OBJS)\basedll_dir.obj \ + $(OBJS)\basedll_dlmsw.obj \ $(OBJS)\basedll_mimetype.obj \ $(OBJS)\basedll_regconf.obj \ $(OBJS)\basedll_registry.obj \ $(OBJS)\basedll_snglinst.obj \ + $(OBJS)\basedll_stackwalk.obj \ $(OBJS)\basedll_stdpaths.obj \ $(OBJS)\basedll_thread.obj \ $(OBJS)\basedll_utils.obj \ @@ -560,12 +570,15 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_zstream.obj \ $(OBJS)\baselib_basemsw.obj \ $(OBJS)\baselib_crashrpt.obj \ + $(OBJS)\baselib_debughlp.obj \ $(OBJS)\baselib_dde.obj \ $(OBJS)\baselib_dir.obj \ + $(OBJS)\baselib_dlmsw.obj \ $(OBJS)\baselib_mimetype.obj \ $(OBJS)\baselib_regconf.obj \ $(OBJS)\baselib_registry.obj \ $(OBJS)\baselib_snglinst.obj \ + $(OBJS)\baselib_stackwalk.obj \ $(OBJS)\baselib_stdpaths.obj \ $(OBJS)\baselib_thread.obj \ $(OBJS)\baselib_utils.obj \ @@ -674,20 +687,7 @@ ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_176) /DWIN32 \ /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_advdll.pch" $(CPPFLAGS) $(CXXFLAGS) ADVDLL_OBJECTS = \ $(OBJS)\advdll_dummy.obj \ - $(OBJS)\advdll_calctrl.obj \ - $(OBJS)\advdll_grid.obj \ - $(OBJS)\advdll_gridctrl.obj \ - $(OBJS)\advdll_gridsel.obj \ - $(OBJS)\advdll_helpext.obj \ - $(OBJS)\advdll_laywin.obj \ - $(OBJS)\advdll_sashwin.obj \ - $(OBJS)\advdll_splash.obj \ - $(OBJS)\advdll_tipdlg.obj \ - $(OBJS)\advdll_wizard.obj \ - $(OBJS)\advdll_taskbarcmn.obj \ - $(OBJS)\advdll_sound.obj \ - $(OBJS)\advdll_taskbar.obj \ - $(OBJS)\advdll_joystick.obj + $(____ADVANCED_SRC_FILENAMES_2_OBJECTS) ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_188) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.pdb \ @@ -699,20 +699,7 @@ ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_188) /DWIN32 \ /Fp"$(OBJS)\wxprec_advlib.pch" $(CPPFLAGS) $(CXXFLAGS) ADVLIB_OBJECTS = \ $(OBJS)\advlib_dummy.obj \ - $(OBJS)\advlib_calctrl.obj \ - $(OBJS)\advlib_grid.obj \ - $(OBJS)\advlib_gridctrl.obj \ - $(OBJS)\advlib_gridsel.obj \ - $(OBJS)\advlib_helpext.obj \ - $(OBJS)\advlib_laywin.obj \ - $(OBJS)\advlib_sashwin.obj \ - $(OBJS)\advlib_splash.obj \ - $(OBJS)\advlib_tipdlg.obj \ - $(OBJS)\advlib_wizard.obj \ - $(OBJS)\advlib_taskbarcmn.obj \ - $(OBJS)\advlib_sound.obj \ - $(OBJS)\advlib_taskbar.obj \ - $(OBJS)\advlib_joystick.obj + $(____ADVANCED_SRC_FILENAMES_3_OBJECTS) MEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_201) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb \ @@ -902,6 +889,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_chckl.obj \ $(OBJS)\xrcdll_xh_choic.obj \ $(OBJS)\xrcdll_xh_combo.obj \ + $(OBJS)\xrcdll_xh_datectrl.obj \ $(OBJS)\xrcdll_xh_dlg.obj \ $(OBJS)\xrcdll_xh_frame.obj \ $(OBJS)\xrcdll_xh_gauge.obj \ @@ -952,6 +940,7 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_chckl.obj \ $(OBJS)\xrclib_xh_choic.obj \ $(OBJS)\xrclib_xh_combo.obj \ + $(OBJS)\xrclib_xh_datectrl.obj \ $(OBJS)\xrclib_xh_dlg.obj \ $(OBJS)\xrclib_xh_frame.obj \ $(OBJS)\xrclib_xh_gauge.obj \ @@ -1038,6 +1027,12 @@ WXUNIVNAME = univ !if "$(SHARED)" == "1" WXDLLFLAG = dll !endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_2_p = !endif @@ -1155,12 +1150,6 @@ __DEBUGRUNTIME_63 = d !if "$(DEBUG_RUNTIME_LIBS)" == "default" __DEBUGRUNTIME_63 = $(__DEBUGINFO_3_0) !endif -!if "$(SHARED)" == "0" -____LIBDIRNAME_FILENAMES_6_p = /I..\..\lib\vc_lib$(CFG) -!endif -!if "$(SHARED)" == "1" -____LIBDIRNAME_FILENAMES_6_p = /I..\..\lib\vc_dll$(CFG) -!endif !if "$(MONOLITHIC)" == "0" EXTRALIBS_FOR_BASE = !endif @@ -1192,20 +1181,7 @@ __DEBUGRUNTIME_76 = $(__DEBUGINFO_3_0) !if "$(USE_GUI)" == "1" ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(____CORE_SRC_FILENAMES_OBJECTS) \ - $(OBJS)\monodll_calctrl.obj \ - $(OBJS)\monodll_grid.obj \ - $(OBJS)\monodll_gridctrl.obj \ - $(OBJS)\monodll_gridsel.obj \ - $(OBJS)\monodll_helpext.obj \ - $(OBJS)\monodll_laywin.obj \ - $(OBJS)\monodll_sashwin.obj \ - $(OBJS)\monodll_splash.obj \ - $(OBJS)\monodll_tipdlg.obj \ - $(OBJS)\monodll_wizard.obj \ - $(OBJS)\monodll_taskbarcmn.obj \ - $(OBJS)\monodll_sound.obj \ - $(OBJS)\monodll_taskbar.obj \ - $(OBJS)\monodll_joystick.obj \ + $(____ADVANCED_SRC_FILENAMES_OBJECTS) \ $(OBJS)\monodll_mediactrlcmn.obj \ $(OBJS)\monodll_mediactrl.obj \ $(OBJS)\monodll_helpbest.obj \ @@ -1241,6 +1217,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_chckl.obj \ $(OBJS)\monodll_xh_choic.obj \ $(OBJS)\monodll_xh_combo.obj \ + $(OBJS)\monodll_xh_datectrl.obj \ $(OBJS)\monodll_xh_dlg.obj \ $(OBJS)\monodll_xh_frame.obj \ $(OBJS)\monodll_xh_gauge.obj \ @@ -1664,6 +1641,43 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_vlbox.obj \ $(OBJS)\monodll_vscroll.obj !endif +!if "$(WXUNIV)" == "0" +____ADVANCED_SRC_FILENAMES_OBJECTS = \ + $(OBJS)\monodll_calctrl.obj \ + $(OBJS)\monodll_datectlg.obj \ + $(OBJS)\monodll_grid.obj \ + $(OBJS)\monodll_gridctrl.obj \ + $(OBJS)\monodll_gridsel.obj \ + $(OBJS)\monodll_helpext.obj \ + $(OBJS)\monodll_laywin.obj \ + $(OBJS)\monodll_sashwin.obj \ + $(OBJS)\monodll_splash.obj \ + $(OBJS)\monodll_tipdlg.obj \ + $(OBJS)\monodll_wizard.obj \ + $(OBJS)\monodll_taskbarcmn.obj \ + $(OBJS)\monodll_sound.obj \ + $(OBJS)\monodll_taskbar.obj \ + $(OBJS)\monodll_joystick.obj \ + $(OBJS)\monodll_datectrl.obj +!endif +!if "$(WXUNIV)" == "1" +____ADVANCED_SRC_FILENAMES_OBJECTS = \ + $(OBJS)\monodll_calctrl.obj \ + $(OBJS)\monodll_datectlg.obj \ + $(OBJS)\monodll_grid.obj \ + $(OBJS)\monodll_gridctrl.obj \ + $(OBJS)\monodll_gridsel.obj \ + $(OBJS)\monodll_helpext.obj \ + $(OBJS)\monodll_laywin.obj \ + $(OBJS)\monodll_sashwin.obj \ + $(OBJS)\monodll_splash.obj \ + $(OBJS)\monodll_tipdlg.obj \ + $(OBJS)\monodll_wizard.obj \ + $(OBJS)\monodll_taskbarcmn.obj \ + $(OBJS)\monodll_sound.obj \ + $(OBJS)\monodll_taskbar.obj \ + $(OBJS)\monodll_joystick.obj +!endif !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0" __monolib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib @@ -1689,20 +1703,7 @@ __DEBUGRUNTIME_88 = $(__DEBUGINFO_3_0) !if "$(USE_GUI)" == "1" ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(____CORE_SRC_FILENAMES_1_OBJECTS) \ - $(OBJS)\monolib_calctrl.obj \ - $(OBJS)\monolib_grid.obj \ - $(OBJS)\monolib_gridctrl.obj \ - $(OBJS)\monolib_gridsel.obj \ - $(OBJS)\monolib_helpext.obj \ - $(OBJS)\monolib_laywin.obj \ - $(OBJS)\monolib_sashwin.obj \ - $(OBJS)\monolib_splash.obj \ - $(OBJS)\monolib_tipdlg.obj \ - $(OBJS)\monolib_wizard.obj \ - $(OBJS)\monolib_taskbarcmn.obj \ - $(OBJS)\monolib_sound.obj \ - $(OBJS)\monolib_taskbar.obj \ - $(OBJS)\monolib_joystick.obj \ + $(____ADVANCED_SRC_FILENAMES_1_OBJECTS) \ $(OBJS)\monolib_mediactrlcmn.obj \ $(OBJS)\monolib_mediactrl.obj \ $(OBJS)\monolib_helpbest.obj \ @@ -1738,6 +1739,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_chckl.obj \ $(OBJS)\monolib_xh_choic.obj \ $(OBJS)\monolib_xh_combo.obj \ + $(OBJS)\monolib_xh_datectrl.obj \ $(OBJS)\monolib_xh_dlg.obj \ $(OBJS)\monolib_xh_frame.obj \ $(OBJS)\monolib_xh_gauge.obj \ @@ -2161,6 +2163,43 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_vlbox.obj \ $(OBJS)\monolib_vscroll.obj !endif +!if "$(WXUNIV)" == "0" +____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ + $(OBJS)\monolib_calctrl.obj \ + $(OBJS)\monolib_datectlg.obj \ + $(OBJS)\monolib_grid.obj \ + $(OBJS)\monolib_gridctrl.obj \ + $(OBJS)\monolib_gridsel.obj \ + $(OBJS)\monolib_helpext.obj \ + $(OBJS)\monolib_laywin.obj \ + $(OBJS)\monolib_sashwin.obj \ + $(OBJS)\monolib_splash.obj \ + $(OBJS)\monolib_tipdlg.obj \ + $(OBJS)\monolib_wizard.obj \ + $(OBJS)\monolib_taskbarcmn.obj \ + $(OBJS)\monolib_sound.obj \ + $(OBJS)\monolib_taskbar.obj \ + $(OBJS)\monolib_joystick.obj \ + $(OBJS)\monolib_datectrl.obj +!endif +!if "$(WXUNIV)" == "1" +____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ + $(OBJS)\monolib_calctrl.obj \ + $(OBJS)\monolib_datectlg.obj \ + $(OBJS)\monolib_grid.obj \ + $(OBJS)\monolib_gridctrl.obj \ + $(OBJS)\monolib_gridsel.obj \ + $(OBJS)\monolib_helpext.obj \ + $(OBJS)\monolib_laywin.obj \ + $(OBJS)\monolib_sashwin.obj \ + $(OBJS)\monolib_splash.obj \ + $(OBJS)\monolib_tipdlg.obj \ + $(OBJS)\monolib_wizard.obj \ + $(OBJS)\monolib_taskbarcmn.obj \ + $(OBJS)\monolib_sound.obj \ + $(OBJS)\monolib_taskbar.obj \ + $(OBJS)\monolib_joystick.obj +!endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" __basedll___depname = \ $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll @@ -3097,6 +3136,43 @@ __DEBUGRUNTIME_176 = d !if "$(DEBUG_RUNTIME_LIBS)" == "default" __DEBUGRUNTIME_176 = $(__DEBUGINFO_3_0) !endif +!if "$(WXUNIV)" == "0" +____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ + $(OBJS)\advdll_calctrl.obj \ + $(OBJS)\advdll_datectlg.obj \ + $(OBJS)\advdll_grid.obj \ + $(OBJS)\advdll_gridctrl.obj \ + $(OBJS)\advdll_gridsel.obj \ + $(OBJS)\advdll_helpext.obj \ + $(OBJS)\advdll_laywin.obj \ + $(OBJS)\advdll_sashwin.obj \ + $(OBJS)\advdll_splash.obj \ + $(OBJS)\advdll_tipdlg.obj \ + $(OBJS)\advdll_wizard.obj \ + $(OBJS)\advdll_taskbarcmn.obj \ + $(OBJS)\advdll_sound.obj \ + $(OBJS)\advdll_taskbar.obj \ + $(OBJS)\advdll_joystick.obj \ + $(OBJS)\advdll_datectrl.obj +!endif +!if "$(WXUNIV)" == "1" +____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ + $(OBJS)\advdll_calctrl.obj \ + $(OBJS)\advdll_datectlg.obj \ + $(OBJS)\advdll_grid.obj \ + $(OBJS)\advdll_gridctrl.obj \ + $(OBJS)\advdll_gridsel.obj \ + $(OBJS)\advdll_helpext.obj \ + $(OBJS)\advdll_laywin.obj \ + $(OBJS)\advdll_sashwin.obj \ + $(OBJS)\advdll_splash.obj \ + $(OBJS)\advdll_tipdlg.obj \ + $(OBJS)\advdll_wizard.obj \ + $(OBJS)\advdll_taskbarcmn.obj \ + $(OBJS)\advdll_sound.obj \ + $(OBJS)\advdll_taskbar.obj \ + $(OBJS)\advdll_joystick.obj +!endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" __advlib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib @@ -3119,6 +3195,43 @@ __DEBUGRUNTIME_188 = d !if "$(DEBUG_RUNTIME_LIBS)" == "default" __DEBUGRUNTIME_188 = $(__DEBUGINFO_3_0) !endif +!if "$(WXUNIV)" == "0" +____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ + $(OBJS)\advlib_calctrl.obj \ + $(OBJS)\advlib_datectlg.obj \ + $(OBJS)\advlib_grid.obj \ + $(OBJS)\advlib_gridctrl.obj \ + $(OBJS)\advlib_gridsel.obj \ + $(OBJS)\advlib_helpext.obj \ + $(OBJS)\advlib_laywin.obj \ + $(OBJS)\advlib_sashwin.obj \ + $(OBJS)\advlib_splash.obj \ + $(OBJS)\advlib_tipdlg.obj \ + $(OBJS)\advlib_wizard.obj \ + $(OBJS)\advlib_taskbarcmn.obj \ + $(OBJS)\advlib_sound.obj \ + $(OBJS)\advlib_taskbar.obj \ + $(OBJS)\advlib_joystick.obj \ + $(OBJS)\advlib_datectrl.obj +!endif +!if "$(WXUNIV)" == "1" +____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ + $(OBJS)\advlib_calctrl.obj \ + $(OBJS)\advlib_datectlg.obj \ + $(OBJS)\advlib_grid.obj \ + $(OBJS)\advlib_gridctrl.obj \ + $(OBJS)\advlib_gridsel.obj \ + $(OBJS)\advlib_helpext.obj \ + $(OBJS)\advlib_laywin.obj \ + $(OBJS)\advlib_sashwin.obj \ + $(OBJS)\advlib_splash.obj \ + $(OBJS)\advlib_tipdlg.obj \ + $(OBJS)\advlib_wizard.obj \ + $(OBJS)\advlib_taskbarcmn.obj \ + $(OBJS)\advlib_sound.obj \ + $(OBJS)\advlib_taskbar.obj \ + $(OBJS)\advlib_joystick.obj +!endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" __mediadll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll @@ -3541,12 +3654,6 @@ __DEBUG_DEFINE_p = /D__WXDEBUG__ !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /D_UNICODE !endif -!if "$(SHARED)" == "0" -LIBDIRNAME = ..\..\lib\vc_lib$(CFG) -!endif -!if "$(SHARED)" == "1" -LIBDIRNAME = ..\..\lib\vc_dll$(CFG) -!endif !if "$(WXUNIV)" == "0" __SETUP_H_SUBDIR_FILENAMES = msw !endif @@ -3566,6 +3673,7 @@ all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAM clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib -if exist $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib -if exist $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib @@ -3883,7 +3991,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) @@ -4431,12 +4539,18 @@ $(OBJS)\monodll_basemsw.obj: ..\..\src\msw\basemsw.cpp $(OBJS)\monodll_crashrpt.obj: ..\..\src\msw\crashrpt.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_debughlp.obj: ..\..\src\msw\debughlp.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_dde.obj: ..\..\src\msw\dde.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** $(OBJS)\monodll_dir.obj: ..\..\src\msw\dir.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_mimetype.obj: ..\..\src\msw\mimetype.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -4449,6 +4563,9 @@ $(OBJS)\monodll_registry.obj: ..\..\src\msw\registry.cpp $(OBJS)\monodll_snglinst.obj: ..\..\src\msw\snglinst.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_stackwalk.obj: ..\..\src\msw\stackwalk.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -4653,46 +4770,7 @@ $(OBJS)\monodll_metal.obj: ..\..\src\univ\themes\metal.cpp $(OBJS)\monodll_win32.obj: ..\..\src\univ\themes\win32.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** - -$(OBJS)\monodll_grid.obj: ..\..\src\generic\grid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** - -$(OBJS)\monodll_gridctrl.obj: ..\..\src\generic\gridctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** - -$(OBJS)\monodll_gridsel.obj: ..\..\src\generic\gridsel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** - -$(OBJS)\monodll_helpext.obj: ..\..\src\generic\helpext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** - -$(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** - -$(OBJS)\monodll_sashwin.obj: ..\..\src\generic\sashwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** - -$(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** - -$(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** - -$(OBJS)\monodll_wizard.obj: ..\..\src\generic\wizard.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** - -$(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** - -$(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** - -$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** - -$(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp +$(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** $(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp @@ -4800,6 +4878,9 @@ $(OBJS)\monodll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp $(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -5874,6 +5955,81 @@ $(OBJS)\monodll_vscroll.obj: ..\..\src\generic\vscroll.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_datectlg.obj: ..\..\src\generic\datectlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_grid.obj: ..\..\src\generic\grid.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_gridctrl.obj: ..\..\src\generic\gridctrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_gridsel.obj: ..\..\src\generic\gridsel.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_helpext.obj: ..\..\src\generic\helpext.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_sashwin.obj: ..\..\src\generic\sashwin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_wizard.obj: ..\..\src\generic\wizard.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + $(OBJS)\monolib_dummy.obj: ..\..\src\msw\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) /Ycwx/wxprec.h $** @@ -6048,12 +6204,18 @@ $(OBJS)\monolib_basemsw.obj: ..\..\src\msw\basemsw.cpp $(OBJS)\monolib_crashrpt.obj: ..\..\src\msw\crashrpt.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_debughlp.obj: ..\..\src\msw\debughlp.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_dde.obj: ..\..\src\msw\dde.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** $(OBJS)\monolib_dir.obj: ..\..\src\msw\dir.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_mimetype.obj: ..\..\src\msw\mimetype.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -6066,6 +6228,9 @@ $(OBJS)\monolib_registry.obj: ..\..\src\msw\registry.cpp $(OBJS)\monolib_snglinst.obj: ..\..\src\msw\snglinst.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_stackwalk.obj: ..\..\src\msw\stackwalk.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -6270,46 +6435,7 @@ $(OBJS)\monolib_metal.obj: ..\..\src\univ\themes\metal.cpp $(OBJS)\monolib_win32.obj: ..\..\src\univ\themes\win32.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** - -$(OBJS)\monolib_grid.obj: ..\..\src\generic\grid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** - -$(OBJS)\monolib_gridctrl.obj: ..\..\src\generic\gridctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** - -$(OBJS)\monolib_gridsel.obj: ..\..\src\generic\gridsel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** - -$(OBJS)\monolib_helpext.obj: ..\..\src\generic\helpext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** - -$(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** - -$(OBJS)\monolib_sashwin.obj: ..\..\src\generic\sashwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** - -$(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** - -$(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** - -$(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** - -$(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** - -$(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** - -$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** - -$(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp +$(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** $(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp @@ -6417,6 +6543,9 @@ $(OBJS)\monolib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp $(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -7491,6 +7620,81 @@ $(OBJS)\monolib_vscroll.obj: ..\..\src\generic\vscroll.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_datectlg.obj: ..\..\src\generic\datectlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_grid.obj: ..\..\src\generic\grid.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_gridctrl.obj: ..\..\src\generic\gridctrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_gridsel.obj: ..\..\src\generic\gridsel.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_helpext.obj: ..\..\src\generic\helpext.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_sashwin.obj: ..\..\src\generic\sashwin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + $(OBJS)\basedll_dummy.obj: ..\..\src\msw\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h $** @@ -7665,12 +7869,18 @@ $(OBJS)\basedll_basemsw.obj: ..\..\src\msw\basemsw.cpp $(OBJS)\basedll_crashrpt.obj: ..\..\src\msw\crashrpt.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** +$(OBJS)\basedll_debughlp.obj: ..\..\src\msw\debughlp.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** + $(OBJS)\basedll_dde.obj: ..\..\src\msw\dde.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** $(OBJS)\basedll_dir.obj: ..\..\src\msw\dir.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** +$(OBJS)\basedll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** + $(OBJS)\basedll_mimetype.obj: ..\..\src\msw\mimetype.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** @@ -7683,6 +7893,9 @@ $(OBJS)\basedll_registry.obj: ..\..\src\msw\registry.cpp $(OBJS)\basedll_snglinst.obj: ..\..\src\msw\snglinst.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** +$(OBJS)\basedll_stackwalk.obj: ..\..\src\msw\stackwalk.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** + $(OBJS)\basedll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** @@ -7890,12 +8103,18 @@ $(OBJS)\baselib_basemsw.obj: ..\..\src\msw\basemsw.cpp $(OBJS)\baselib_crashrpt.obj: ..\..\src\msw\crashrpt.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** +$(OBJS)\baselib_debughlp.obj: ..\..\src\msw\debughlp.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** + $(OBJS)\baselib_dde.obj: ..\..\src\msw\dde.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** $(OBJS)\baselib_dir.obj: ..\..\src\msw\dir.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** +$(OBJS)\baselib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** + $(OBJS)\baselib_mimetype.obj: ..\..\src\msw\mimetype.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** @@ -7908,6 +8127,9 @@ $(OBJS)\baselib_registry.obj: ..\..\src\msw\registry.cpp $(OBJS)\baselib_snglinst.obj: ..\..\src\msw\snglinst.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** +$(OBJS)\baselib_stackwalk.obj: ..\..\src\msw\stackwalk.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** + $(OBJS)\baselib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** @@ -10290,9 +10512,15 @@ $(OBJS)\corelib_vscroll.obj: ..\..\src\generic\vscroll.cpp $(OBJS)\advdll_dummy.obj: ..\..\src\msw\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h $** +$(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + $(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** +$(OBJS)\advdll_datectlg.obj: ..\..\src\generic\datectlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + $(OBJS)\advdll_grid.obj: ..\..\src\generic\grid.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** @@ -10335,9 +10563,15 @@ $(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp $(OBJS)\advlib_dummy.obj: ..\..\src\msw\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) /Ycwx/wxprec.h $** +$(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + $(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** +$(OBJS)\advlib_datectlg.obj: ..\..\src\generic\datectlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + $(OBJS)\advlib_grid.obj: ..\..\src\generic\grid.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** @@ -10608,6 +10842,9 @@ $(OBJS)\xrcdll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp $(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** +$(OBJS)\xrcdll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + $(OBJS)\xrcdll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** @@ -10728,6 +10965,9 @@ $(OBJS)\xrclib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp $(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** +$(OBJS)\xrclib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + $(OBJS)\xrclib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**