X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4996f26121bacb8ce4dc4a0f00c638f6b6b802bb..adb8a71bbc0ba11aad0b417db24f7267a250b6c3:/build/msw/makefile.vc diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 665359e80f..b029fa5e07 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.3 (http://bakefile.sourceforge.net) +# Bakefile 0.1.4 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -20,6 +20,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" USE_OPENGL="$(USE_OPENGL)" \ USE_ODBC="$(USE_ODBC)" USE_EXCEPTIONS="$(USE_EXCEPTIONS)" \ OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" CFG="$(CFG)" \ + CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ RUNTIME_LIBS="$(RUNTIME_LIBS)" OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @@ -34,8 +35,8 @@ WXREGEX_OBJECTS = \ $(OBJS)\wxregex_regexec.obj \ $(OBJS)\wxregex_regerror.obj \ $(OBJS)\wxregex_regfree.obj -WXZLIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_13) /DWIN32 $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME_12_p) \ +WXZLIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 $(__DEBUGINFO) \ + /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME_14_p) \ $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) $(CPPFLAGS) $(CFLAGS) WXZLIB_OBJECTS = \ $(OBJS)\wxzlib_adler32.obj \ @@ -47,13 +48,11 @@ WXZLIB_OBJECTS = \ $(OBJS)\wxzlib_trees.obj \ $(OBJS)\wxzlib_zutil.obj \ $(OBJS)\wxzlib_inflate.obj \ - $(OBJS)\wxzlib_infblock.obj \ + $(OBJS)\wxzlib_infback.obj \ $(OBJS)\wxzlib_inftrees.obj \ - $(OBJS)\wxzlib_infcodes.obj \ - $(OBJS)\wxzlib_infutil.obj \ $(OBJS)\wxzlib_inffast.obj -WXPNG_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_23) /DWIN32 $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME_22_p) \ +WXPNG_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_27) /DWIN32 $(__DEBUGINFO) \ + /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME_26_p) \ $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I..\..\src\zlib $(CPPFLAGS) $(CFLAGS) WXPNG_OBJECTS = \ $(OBJS)\wxpng_png.obj \ @@ -73,8 +72,8 @@ WXPNG_OBJECTS = \ $(OBJS)\wxpng_pngwrite.obj \ $(OBJS)\wxpng_pngwtran.obj \ $(OBJS)\wxpng_pngwutil.obj -WXJPEG_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_33) /DWIN32 $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME_32_p) \ +WXJPEG_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_39) /DWIN32 $(__DEBUGINFO) \ + /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME_38_p) \ $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I$(SETUPHDIR) $(CPPFLAGS) $(CFLAGS) WXJPEG_OBJECTS = \ $(OBJS)\wxjpeg_jcomapi.obj \ @@ -123,8 +122,8 @@ WXJPEG_OBJECTS = \ $(OBJS)\wxjpeg_jquant1.obj \ $(OBJS)\wxjpeg_jquant2.obj \ $(OBJS)\wxjpeg_jdmerge.obj -WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_43) /DWIN32 $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME_42_p) \ +WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_51) /DWIN32 $(__DEBUGINFO) \ + /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME_50_p) \ $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I..\..\src\zlib /I..\..\src\jpeg \ $(CPPFLAGS) $(CFLAGS) WXTIFF_OBJECTS = \ @@ -161,30 +160,30 @@ WXTIFF_OBJECTS = \ $(OBJS)\wxtiff_tif_warning.obj \ $(OBJS)\wxtiff_tif_write.obj \ $(OBJS)\wxtiff_tif_zip.obj -WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_53) /DWIN32 \ +WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_63) /DWIN32 \ $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \ - $(____DEBUGRUNTIME_52_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \ + $(____DEBUGRUNTIME_62_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \ $(____LIBDIRNAME_FILENAMES_6_p) /DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS) WXEXPAT_OBJECTS = \ $(OBJS)\wxexpat_xmlparse.obj \ $(OBJS)\wxexpat_xmlrole.obj \ $(OBJS)\wxexpat_xmltok.obj -MONODLL_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_63) /DWIN32 \ +MONODLL_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_76) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME_62_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_75_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \ /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ /DwxUSE_BASE=1 /DWXMAKINGDLL $(CPPFLAGS) $(CFLAGS) -MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_63) /DWIN32 \ +MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_76) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME_62_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_75_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /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_2) \ + /DwxUSE_BASE=1 /DWXMAKINGDLL $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) \ /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_monodll.pch" $(CPPFLAGS) $(CXXFLAGS) MONODLL_OBJECTS = \ $(OBJS)\monodll_dummy.obj \ @@ -207,7 +206,6 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_filesys.obj \ $(OBJS)\monodll_fmapbase.obj \ $(OBJS)\monodll_fs_zip.obj \ - $(OBJS)\monodll_gzstream.obj \ $(OBJS)\monodll_hash.obj \ $(OBJS)\monodll_hashmap.obj \ $(OBJS)\monodll_init.obj \ @@ -273,22 +271,22 @@ MONODLL_OBJECTS = \ $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \ $(OBJS)\monodll_xml.obj \ $(OBJS)\monodll_xtixml.obj -MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_75) /DWIN32 \ +MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_88) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \ - $(____DEBUGRUNTIME_74_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_87_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \ /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) -MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_75) /DWIN32 \ +MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_88) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \ - $(____DEBUGRUNTIME_74_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_87_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \ /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ - /DwxUSE_BASE=1 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) /Yu"wx/wxprec.h" \ + /DwxUSE_BASE=1 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \ /Fp"$(OBJS)\wxprec_monolib.pch" $(CPPFLAGS) $(CXXFLAGS) MONOLIB_OBJECTS = \ $(OBJS)\monolib_dummy.obj \ @@ -311,7 +309,6 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_filesys.obj \ $(OBJS)\monolib_fmapbase.obj \ $(OBJS)\monolib_fs_zip.obj \ - $(OBJS)\monolib_gzstream.obj \ $(OBJS)\monolib_hash.obj \ $(OBJS)\monolib_hashmap.obj \ $(OBJS)\monolib_init.obj \ @@ -377,23 +374,23 @@ MONOLIB_OBJECTS = \ $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \ $(OBJS)\monolib_xml.obj \ $(OBJS)\monolib_xtixml.obj -BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_87) /DWIN32 \ +BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_101) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME_86_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_100_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \ /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ /DwxUSE_GUI=0 /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) -BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_87) /DWIN32 \ +BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_101) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME_86_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_100_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /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_2) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_basedll.pch" \ + $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_basedll.pch" \ $(CPPFLAGS) $(CXXFLAGS) BASEDLL_OBJECTS = \ $(OBJS)\basedll_dummy.obj \ @@ -416,7 +413,6 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_filesys.obj \ $(OBJS)\basedll_fmapbase.obj \ $(OBJS)\basedll_fs_zip.obj \ - $(OBJS)\basedll_gzstream.obj \ $(OBJS)\basedll_hash.obj \ $(OBJS)\basedll_hashmap.obj \ $(OBJS)\basedll_init.obj \ @@ -467,22 +463,22 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_main.obj \ $(OBJS)\basedll_mslu.obj \ $(OBJS)\basedll_volume.obj -BASELIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_99) /DWIN32 \ +BASELIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_113) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \ - $(____DEBUGRUNTIME_98_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_112_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \ /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ /DwxUSE_GUI=0 /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) -BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_99) /DWIN32 \ +BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_113) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \ - $(____DEBUGRUNTIME_98_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_112_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /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_2) \ + /DwxUSE_GUI=0 /DwxUSE_BASE=1 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) \ /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_baselib.pch" $(CPPFLAGS) $(CXXFLAGS) BASELIB_OBJECTS = \ $(OBJS)\baselib_dummy.obj \ @@ -505,7 +501,6 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_filesys.obj \ $(OBJS)\baselib_fmapbase.obj \ $(OBJS)\baselib_fs_zip.obj \ - $(OBJS)\baselib_gzstream.obj \ $(OBJS)\baselib_hash.obj \ $(OBJS)\baselib_hashmap.obj \ $(OBJS)\baselib_init.obj \ @@ -556,23 +551,23 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_main.obj \ $(OBJS)\baselib_mslu.obj \ $(OBJS)\baselib_volume.obj -NETDLL_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_111) /DWIN32 \ +NETDLL_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_126) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME_110_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_125_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \ /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_NET $(CPPFLAGS) $(CFLAGS) -NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_111) /DWIN32 \ +NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_126) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME_110_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_125_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /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_2) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netdll.pch" \ + $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netdll.pch" \ $(CPPFLAGS) $(CXXFLAGS) NETDLL_OBJECTS = \ $(OBJS)\netdll_dummy.obj \ @@ -588,22 +583,22 @@ NETDLL_OBJECTS = \ $(OBJS)\netdll_url.obj \ $(OBJS)\netdll_gsocket.obj \ $(OBJS)\netdll_urlmsw.obj -NETLIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_123) /DWIN32 \ +NETLIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_138) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.pdb \ - $(____DEBUGRUNTIME_122_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_137_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \ /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ /DwxUSE_GUI=0 $(CPPFLAGS) $(CFLAGS) -NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_123) /DWIN32 \ +NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_138) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.pdb \ - $(____DEBUGRUNTIME_122_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_137_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \ /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ - /DwxUSE_GUI=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) /Yu"wx/wxprec.h" \ + /DwxUSE_GUI=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \ /Fp"$(OBJS)\wxprec_netlib.pch" $(CPPFLAGS) $(CXXFLAGS) NETLIB_OBJECTS = \ $(OBJS)\netlib_dummy.obj \ @@ -619,23 +614,23 @@ NETLIB_OBJECTS = \ $(OBJS)\netlib_url.obj \ $(OBJS)\netlib_gsocket.obj \ $(OBJS)\netlib_urlmsw.obj -COREDLL_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_135) /DWIN32 \ +COREDLL_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_151) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME_134_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_150_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \ /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ /DWXUSINGDLL /DWXMAKINGDLL_CORE /DwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS) -COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_135) /DWIN32 \ +COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_151) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME_134_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_150_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /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_2) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_coredll.pch" \ + $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_coredll.pch" \ $(CPPFLAGS) $(CXXFLAGS) COREDLL_OBJECTS = \ $(OBJS)\coredll_dummy.obj \ @@ -647,22 +642,22 @@ COREDLL_OBJECTS = \ $(OBJS)\coredll_mslu.obj \ $(OBJS)\coredll_volume.obj \ $(____CORE_SRC_FILENAMES_2_OBJECTS) -CORELIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_147) /DWIN32 \ +CORELIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_163) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.pdb \ - $(____DEBUGRUNTIME_146_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_162_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \ /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ /DwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS) -CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_147) /DWIN32 \ +CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_163) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.pdb \ - $(____DEBUGRUNTIME_146_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_162_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \ /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ - /DwxUSE_BASE=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) /Yu"wx/wxprec.h" \ + /DwxUSE_BASE=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \ /Fp"$(OBJS)\wxprec_corelib.pch" $(CPPFLAGS) $(CXXFLAGS) CORELIB_OBJECTS = \ $(OBJS)\corelib_dummy.obj \ @@ -674,14 +669,14 @@ CORELIB_OBJECTS = \ $(OBJS)\corelib_mslu.obj \ $(OBJS)\corelib_volume.obj \ $(____CORE_SRC_FILENAMES_3_OBJECTS) -ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_159) /DWIN32 \ +ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_176) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME_158_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_175_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \ /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ - /DWXUSINGDLL /DWXMAKINGDLL_ADV $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) \ + /DWXUSINGDLL /DWXMAKINGDLL_ADV $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) \ /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_advdll.pch" $(CPPFLAGS) $(CXXFLAGS) ADVDLL_OBJECTS = \ $(OBJS)\advdll_dummy.obj \ @@ -696,17 +691,17 @@ ADVDLL_OBJECTS = \ $(OBJS)\advdll_tipdlg.obj \ $(OBJS)\advdll_wizard.obj \ $(OBJS)\advdll_taskbarcmn.obj \ - $(OBJS)\advdll_joystick.obj \ $(OBJS)\advdll_sound.obj \ - $(OBJS)\advdll_taskbar.obj -ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_171) /DWIN32 \ + $(OBJS)\advdll_taskbar.obj \ + $(OBJS)\advdll_joystick.obj +ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_188) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.pdb \ - $(____DEBUGRUNTIME_170_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_187_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \ /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ - $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) /Yu"wx/wxprec.h" \ + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \ /Fp"$(OBJS)\wxprec_advlib.pch" $(CPPFLAGS) $(CXXFLAGS) ADVLIB_OBJECTS = \ $(OBJS)\advlib_dummy.obj \ @@ -721,68 +716,68 @@ ADVLIB_OBJECTS = \ $(OBJS)\advlib_tipdlg.obj \ $(OBJS)\advlib_wizard.obj \ $(OBJS)\advlib_taskbarcmn.obj \ - $(OBJS)\advlib_joystick.obj \ $(OBJS)\advlib_sound.obj \ - $(OBJS)\advlib_taskbar.obj -ODBCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_183) /DWIN32 \ + $(OBJS)\advlib_taskbar.obj \ + $(OBJS)\advlib_joystick.obj +ODBCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_201) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME_182_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_200_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /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_2) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_odbcdll.pch" \ + $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_odbcdll.pch" \ $(CPPFLAGS) $(CXXFLAGS) ODBCDLL_OBJECTS = \ $(OBJS)\odbcdll_dummy.obj \ $(OBJS)\odbcdll_db.obj \ $(OBJS)\odbcdll_dbtable.obj -ODBCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_195) /DWIN32 \ +ODBCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_213) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.pdb \ - $(____DEBUGRUNTIME_194_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_212_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \ /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ - /DwxUSE_GUI=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) /Yu"wx/wxprec.h" \ + /DwxUSE_GUI=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \ /Fp"$(OBJS)\wxprec_odbclib.pch" $(CPPFLAGS) $(CXXFLAGS) ODBCLIB_OBJECTS = \ $(OBJS)\odbclib_dummy.obj \ $(OBJS)\odbclib_db.obj \ $(OBJS)\odbclib_dbtable.obj -DBGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_207) /DWIN32 \ +DBGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_226) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME_206_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_225_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \ /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ - /DWXUSINGDLL /DWXMAKINGDLL_DBGRID $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) \ + /DWXUSINGDLL /DWXMAKINGDLL_DBGRID $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) \ /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_dbgriddll.pch" $(CPPFLAGS) $(CXXFLAGS) DBGRIDDLL_OBJECTS = \ $(OBJS)\dbgriddll_dummy.obj \ $(OBJS)\dbgriddll_dbgrid.obj -DBGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_219) /DWIN32 \ +DBGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_238) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.pdb \ - $(____DEBUGRUNTIME_218_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_237_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \ /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ - $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) /Yu"wx/wxprec.h" \ + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \ /Fp"$(OBJS)\wxprec_dbgridlib.pch" $(CPPFLAGS) $(CXXFLAGS) DBGRIDLIB_OBJECTS = \ $(OBJS)\dbgridlib_dummy.obj \ $(OBJS)\dbgridlib_dbgrid.obj -HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_231) /DWIN32 \ +HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_251) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME_230_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_250_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \ /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ - /DWXUSINGDLL /DWXMAKINGDLL_HTML $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) \ + /DWXUSINGDLL /DWXMAKINGDLL_HTML $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) \ /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_htmldll.pch" $(CPPFLAGS) $(CXXFLAGS) HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_dummy.obj \ @@ -808,14 +803,14 @@ HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_m_tables.obj \ $(OBJS)\htmldll_winpars.obj \ $(OBJS)\htmldll_htmllbox.obj -HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_243) /DWIN32 \ +HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_263) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.pdb \ - $(____DEBUGRUNTIME_242_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_262_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \ /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ - $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) /Yu"wx/wxprec.h" \ + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \ /Fp"$(OBJS)\wxprec_htmllib.pch" $(CPPFLAGS) $(CXXFLAGS) HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_dummy.obj \ @@ -841,53 +836,53 @@ HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_m_tables.obj \ $(OBJS)\htmllib_winpars.obj \ $(OBJS)\htmllib_htmllbox.obj -XMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_255) /DWIN32 \ +XMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_276) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME_254_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_275_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /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_2) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmldll.pch" \ + $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmldll.pch" \ $(CPPFLAGS) $(CXXFLAGS) XMLDLL_OBJECTS = \ $(OBJS)\xmldll_dummy.obj \ $(OBJS)\xmldll_xml.obj \ $(OBJS)\xmldll_xtixml.obj -XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_267) /DWIN32 \ +XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_288) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.pdb \ - $(____DEBUGRUNTIME_266_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_287_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \ /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ - /DwxUSE_GUI=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) /Yu"wx/wxprec.h" \ + /DwxUSE_GUI=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \ /Fp"$(OBJS)\wxprec_xmllib.pch" $(CPPFLAGS) $(CXXFLAGS) XMLLIB_OBJECTS = \ $(OBJS)\xmllib_dummy.obj \ $(OBJS)\xmllib_xml.obj \ $(OBJS)\xmllib_xtixml.obj -GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_279) /DWIN32 \ +GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_301) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME_278_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_300_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \ /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ - /DWXUSINGDLL /DWXMAKINGDLL_GL $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) \ + /DWXUSINGDLL /DWXMAKINGDLL_GL $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) \ /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gldll.pch" $(CPPFLAGS) $(CXXFLAGS) GLDLL_OBJECTS = \ $(OBJS)\gldll_dummy.obj \ $(OBJS)\gldll_glcanvas.obj -GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_291) /DWIN32 \ +GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_313) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.pdb \ - $(____DEBUGRUNTIME_290_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(____DEBUGRUNTIME_312_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \ /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ - $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_2) /Yu"wx/wxprec.h" \ + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) /Yu"wx/wxprec.h" \ /Fp"$(OBJS)\wxprec_gllib.pch" $(CPPFLAGS) $(CXXFLAGS) GLLIB_OBJECTS = \ $(OBJS)\gllib_dummy.obj \ @@ -939,106 +934,106 @@ __DEBUGRUNTIME_3 = __DEBUGRUNTIME_3 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = $(__DEBUGINFO_2_3) +__DEBUGRUNTIME_3 = $(__DEBUGINFO_23) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_12_p = +____DEBUGRUNTIME_14_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_12_p = /D_DEBUG +____DEBUGRUNTIME_14_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_12_p = $(____DEBUGINFO) +____DEBUGRUNTIME_14_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_13 = +__DEBUGRUNTIME_15 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_13 = d +__DEBUGRUNTIME_15 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_13 = $(__DEBUGINFO_2_3) +__DEBUGRUNTIME_15 = $(__DEBUGINFO_23) !endif !if "$(USE_GUI)" == "1" __wxpng___depname = $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_22_p = +____DEBUGRUNTIME_26_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_22_p = /D_DEBUG +____DEBUGRUNTIME_26_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_22_p = $(____DEBUGINFO) +____DEBUGRUNTIME_26_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_23 = +__DEBUGRUNTIME_27 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_23 = d +__DEBUGRUNTIME_27 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_23 = $(__DEBUGINFO_2_3) +__DEBUGRUNTIME_27 = $(__DEBUGINFO_23) !endif !if "$(USE_GUI)" == "1" __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_32_p = +____DEBUGRUNTIME_38_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_32_p = /D_DEBUG +____DEBUGRUNTIME_38_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_32_p = $(____DEBUGINFO) +____DEBUGRUNTIME_38_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_33 = +__DEBUGRUNTIME_39 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_33 = d +__DEBUGRUNTIME_39 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_33 = $(__DEBUGINFO_2_3) +__DEBUGRUNTIME_39 = $(__DEBUGINFO_23) !endif !if "$(USE_GUI)" == "1" __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_42_p = +____DEBUGRUNTIME_50_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_42_p = /D_DEBUG +____DEBUGRUNTIME_50_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_42_p = $(____DEBUGINFO) +____DEBUGRUNTIME_50_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_43 = +__DEBUGRUNTIME_51 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_43 = d +__DEBUGRUNTIME_51 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_43 = $(__DEBUGINFO_2_3) +__DEBUGRUNTIME_51 = $(__DEBUGINFO_23) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_52_p = +____DEBUGRUNTIME_62_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_52_p = /D_DEBUG +____DEBUGRUNTIME_62_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_52_p = $(____DEBUGINFO) +____DEBUGRUNTIME_62_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_53 = +__DEBUGRUNTIME_63 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_53 = d +__DEBUGRUNTIME_63 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_53 = $(__DEBUGINFO_2_3) +__DEBUGRUNTIME_63 = $(__DEBUGINFO_23) !endif !if "$(SHARED)" == "0" ____LIBDIRNAME_FILENAMES_6_p = /I..\..\lib\vc_lib$(CFG) @@ -1051,22 +1046,22 @@ __monodll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_62_p = +____DEBUGRUNTIME_75_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_62_p = /D_DEBUG +____DEBUGRUNTIME_75_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_62_p = $(____DEBUGINFO) +____DEBUGRUNTIME_75_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_63 = +__DEBUGRUNTIME_76 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_63 = d +__DEBUGRUNTIME_76 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_63 = $(__DEBUGINFO_2_3) +__DEBUGRUNTIME_76 = $(__DEBUGINFO_23) !endif !if "$(USE_GUI)" == "1" ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ @@ -1082,9 +1077,9 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_tipdlg.obj \ $(OBJS)\monodll_wizard.obj \ $(OBJS)\monodll_taskbarcmn.obj \ - $(OBJS)\monodll_joystick.obj \ $(OBJS)\monodll_sound.obj \ $(OBJS)\monodll_taskbar.obj \ + $(OBJS)\monodll_joystick.obj \ $(OBJS)\monodll_helpbest.obj \ $(OBJS)\monodll_helpctrl.obj \ $(OBJS)\monodll_helpdata.obj \ @@ -1128,7 +1123,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dcscreen.obj \ $(OBJS)\monodll_dialup.obj \ $(OBJS)\monodll_dib.obj \ - $(OBJS)\monodll_dirdlg.obj \ $(OBJS)\monodll_display.obj \ $(OBJS)\monodll_enhmeta.obj \ $(OBJS)\monodll_evtloop.obj \ @@ -1138,16 +1132,12 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gdiimage.obj \ $(OBJS)\monodll_gdiobj.obj \ $(OBJS)\monodll_gsockmsw.obj \ - $(OBJS)\monodll_helpchm.obj \ - $(OBJS)\monodll_helpwin.obj \ $(OBJS)\monodll_icon.obj \ $(OBJS)\monodll_minifram.obj \ - $(OBJS)\monodll_automtn.obj \ $(OBJS)\monodll_dataobj.obj \ $(OBJS)\monodll_dropsrc.obj \ $(OBJS)\monodll_droptgt.obj \ $(OBJS)\monodll_oleutils.obj \ - $(OBJS)\monodll_uuid.obj \ $(OBJS)\monodll_palette.obj \ $(OBJS)\monodll_pen.obj \ $(OBJS)\monodll_popupwin.obj \ @@ -1162,6 +1152,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_utilsgui.obj \ $(OBJS)\monodll_uxtheme.obj \ $(OBJS)\monodll_window.obj \ + $(OBJS)\monodll_automtn.obj \ + $(OBJS)\monodll_dirdlg.obj \ $(OBJS)\monodll_statusbr.obj \ $(OBJS)\monodll_prntdlgg.obj \ $(OBJS)\monodll_accel.obj \ @@ -1175,9 +1167,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_control.obj \ $(OBJS)\monodll_dialog.obj \ $(OBJS)\monodll_dragimag.obj \ - $(OBJS)\monodll_fdrepdlg.obj \ $(OBJS)\monodll_filedlg.obj \ - $(OBJS)\monodll_fontdlg.obj \ $(OBJS)\monodll_frame.obj \ $(OBJS)\monodll_gauge95.obj \ $(OBJS)\monodll_imaglist.obj \ @@ -1209,6 +1199,11 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_textctrl.obj \ $(OBJS)\monodll_tglbtn.obj \ $(OBJS)\monodll_treectrl.obj \ + $(OBJS)\monodll_fdrepdlg.obj \ + $(OBJS)\monodll_fontdlg.obj \ + $(OBJS)\monodll_helpchm.obj \ + $(OBJS)\monodll_helpwin.obj \ + $(OBJS)\monodll_uuid.obj \ $(OBJS)\monodll_accesscmn.obj \ $(OBJS)\monodll_appcmn.obj \ $(OBJS)\monodll_artprov.obj \ @@ -1322,7 +1317,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dcscreen.obj \ $(OBJS)\monodll_dialup.obj \ $(OBJS)\monodll_dib.obj \ - $(OBJS)\monodll_dirdlg.obj \ $(OBJS)\monodll_display.obj \ $(OBJS)\monodll_enhmeta.obj \ $(OBJS)\monodll_evtloop.obj \ @@ -1332,16 +1326,12 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gdiimage.obj \ $(OBJS)\monodll_gdiobj.obj \ $(OBJS)\monodll_gsockmsw.obj \ - $(OBJS)\monodll_helpchm.obj \ - $(OBJS)\monodll_helpwin.obj \ $(OBJS)\monodll_icon.obj \ $(OBJS)\monodll_minifram.obj \ - $(OBJS)\monodll_automtn.obj \ $(OBJS)\monodll_dataobj.obj \ $(OBJS)\monodll_dropsrc.obj \ $(OBJS)\monodll_droptgt.obj \ $(OBJS)\monodll_oleutils.obj \ - $(OBJS)\monodll_uuid.obj \ $(OBJS)\monodll_palette.obj \ $(OBJS)\monodll_pen.obj \ $(OBJS)\monodll_popupwin.obj \ @@ -1356,6 +1346,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_utilsgui.obj \ $(OBJS)\monodll_uxtheme.obj \ $(OBJS)\monodll_window.obj \ + $(OBJS)\monodll_automtn.obj \ + $(OBJS)\monodll_dirdlg.obj \ $(OBJS)\monodll_accel.obj \ $(OBJS)\monodll_colrdlgg.obj \ $(OBJS)\monodll_dirdlgg.obj \ @@ -1506,22 +1498,22 @@ __monolib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_74_p = +____DEBUGRUNTIME_87_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_74_p = /D_DEBUG +____DEBUGRUNTIME_87_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_74_p = $(____DEBUGINFO) +____DEBUGRUNTIME_87_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_75 = +__DEBUGRUNTIME_88 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_75 = d +__DEBUGRUNTIME_88 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_75 = $(__DEBUGINFO_2_3) +__DEBUGRUNTIME_88 = $(__DEBUGINFO_23) !endif !if "$(USE_GUI)" == "1" ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ @@ -1537,9 +1529,9 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_tipdlg.obj \ $(OBJS)\monolib_wizard.obj \ $(OBJS)\monolib_taskbarcmn.obj \ - $(OBJS)\monolib_joystick.obj \ $(OBJS)\monolib_sound.obj \ $(OBJS)\monolib_taskbar.obj \ + $(OBJS)\monolib_joystick.obj \ $(OBJS)\monolib_helpbest.obj \ $(OBJS)\monolib_helpctrl.obj \ $(OBJS)\monolib_helpdata.obj \ @@ -1583,7 +1575,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dcscreen.obj \ $(OBJS)\monolib_dialup.obj \ $(OBJS)\monolib_dib.obj \ - $(OBJS)\monolib_dirdlg.obj \ $(OBJS)\monolib_display.obj \ $(OBJS)\monolib_enhmeta.obj \ $(OBJS)\monolib_evtloop.obj \ @@ -1593,16 +1584,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gdiimage.obj \ $(OBJS)\monolib_gdiobj.obj \ $(OBJS)\monolib_gsockmsw.obj \ - $(OBJS)\monolib_helpchm.obj \ - $(OBJS)\monolib_helpwin.obj \ $(OBJS)\monolib_icon.obj \ $(OBJS)\monolib_minifram.obj \ - $(OBJS)\monolib_automtn.obj \ $(OBJS)\monolib_dataobj.obj \ $(OBJS)\monolib_dropsrc.obj \ $(OBJS)\monolib_droptgt.obj \ $(OBJS)\monolib_oleutils.obj \ - $(OBJS)\monolib_uuid.obj \ $(OBJS)\monolib_palette.obj \ $(OBJS)\monolib_pen.obj \ $(OBJS)\monolib_popupwin.obj \ @@ -1617,6 +1604,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_utilsgui.obj \ $(OBJS)\monolib_uxtheme.obj \ $(OBJS)\monolib_window.obj \ + $(OBJS)\monolib_automtn.obj \ + $(OBJS)\monolib_dirdlg.obj \ $(OBJS)\monolib_statusbr.obj \ $(OBJS)\monolib_prntdlgg.obj \ $(OBJS)\monolib_accel.obj \ @@ -1630,9 +1619,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_control.obj \ $(OBJS)\monolib_dialog.obj \ $(OBJS)\monolib_dragimag.obj \ - $(OBJS)\monolib_fdrepdlg.obj \ $(OBJS)\monolib_filedlg.obj \ - $(OBJS)\monolib_fontdlg.obj \ $(OBJS)\monolib_frame.obj \ $(OBJS)\monolib_gauge95.obj \ $(OBJS)\monolib_imaglist.obj \ @@ -1664,6 +1651,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_textctrl.obj \ $(OBJS)\monolib_tglbtn.obj \ $(OBJS)\monolib_treectrl.obj \ + $(OBJS)\monolib_fdrepdlg.obj \ + $(OBJS)\monolib_fontdlg.obj \ + $(OBJS)\monolib_helpchm.obj \ + $(OBJS)\monolib_helpwin.obj \ + $(OBJS)\monolib_uuid.obj \ $(OBJS)\monolib_accesscmn.obj \ $(OBJS)\monolib_appcmn.obj \ $(OBJS)\monolib_artprov.obj \ @@ -1777,7 +1769,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dcscreen.obj \ $(OBJS)\monolib_dialup.obj \ $(OBJS)\monolib_dib.obj \ - $(OBJS)\monolib_dirdlg.obj \ $(OBJS)\monolib_display.obj \ $(OBJS)\monolib_enhmeta.obj \ $(OBJS)\monolib_evtloop.obj \ @@ -1787,16 +1778,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gdiimage.obj \ $(OBJS)\monolib_gdiobj.obj \ $(OBJS)\monolib_gsockmsw.obj \ - $(OBJS)\monolib_helpchm.obj \ - $(OBJS)\monolib_helpwin.obj \ $(OBJS)\monolib_icon.obj \ $(OBJS)\monolib_minifram.obj \ - $(OBJS)\monolib_automtn.obj \ $(OBJS)\monolib_dataobj.obj \ $(OBJS)\monolib_dropsrc.obj \ $(OBJS)\monolib_droptgt.obj \ $(OBJS)\monolib_oleutils.obj \ - $(OBJS)\monolib_uuid.obj \ $(OBJS)\monolib_palette.obj \ $(OBJS)\monolib_pen.obj \ $(OBJS)\monolib_popupwin.obj \ @@ -1811,6 +1798,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_utilsgui.obj \ $(OBJS)\monolib_uxtheme.obj \ $(OBJS)\monolib_window.obj \ + $(OBJS)\monolib_automtn.obj \ + $(OBJS)\monolib_dirdlg.obj \ $(OBJS)\monolib_accel.obj \ $(OBJS)\monolib_colrdlgg.obj \ $(OBJS)\monolib_dirdlgg.obj \ @@ -1961,110 +1950,110 @@ __basedll___depname = \ $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_86_p = +____DEBUGRUNTIME_100_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_86_p = /D_DEBUG +____DEBUGRUNTIME_100_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_86_p = $(____DEBUGINFO) +____DEBUGRUNTIME_100_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_87 = +__DEBUGRUNTIME_101 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_87 = d +__DEBUGRUNTIME_101 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_87 = $(__DEBUGINFO_2_3) +__DEBUGRUNTIME_101 = $(__DEBUGINFO_23) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" __baselib___depname = \ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_98_p = +____DEBUGRUNTIME_112_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_98_p = /D_DEBUG +____DEBUGRUNTIME_112_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_98_p = $(____DEBUGINFO) +____DEBUGRUNTIME_112_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_99 = +__DEBUGRUNTIME_113 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_99 = d +__DEBUGRUNTIME_113 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_99 = $(__DEBUGINFO_2_3) +__DEBUGRUNTIME_113 = $(__DEBUGINFO_23) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" __netdll___depname = \ $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_110_p = +____DEBUGRUNTIME_125_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_110_p = /D_DEBUG +____DEBUGRUNTIME_125_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_110_p = $(____DEBUGINFO) +____DEBUGRUNTIME_125_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_111 = +__DEBUGRUNTIME_126 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_111 = d +__DEBUGRUNTIME_126 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_111 = $(__DEBUGINFO_2_3) +__DEBUGRUNTIME_126 = $(__DEBUGINFO_23) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" __netlib___depname = \ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_122_p = +____DEBUGRUNTIME_137_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_122_p = /D_DEBUG +____DEBUGRUNTIME_137_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_122_p = $(____DEBUGINFO) +____DEBUGRUNTIME_137_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_123 = +__DEBUGRUNTIME_138 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_123 = d +__DEBUGRUNTIME_138 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_123 = $(__DEBUGINFO_2_3) +__DEBUGRUNTIME_138 = $(__DEBUGINFO_23) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" __coredll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).dll !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_134_p = +____DEBUGRUNTIME_150_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_134_p = /D_DEBUG +____DEBUGRUNTIME_150_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_134_p = $(____DEBUGINFO) +____DEBUGRUNTIME_150_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_135 = +__DEBUGRUNTIME_151 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_135 = d +__DEBUGRUNTIME_151 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_135 = $(__DEBUGINFO_2_3) +__DEBUGRUNTIME_151 = $(__DEBUGINFO_23) !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_2_OBJECTS = \ @@ -2083,7 +2072,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dcscreen.obj \ $(OBJS)\coredll_dialup.obj \ $(OBJS)\coredll_dib.obj \ - $(OBJS)\coredll_dirdlg.obj \ $(OBJS)\coredll_display.obj \ $(OBJS)\coredll_enhmeta.obj \ $(OBJS)\coredll_evtloop.obj \ @@ -2093,16 +2081,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_gdiimage.obj \ $(OBJS)\coredll_gdiobj.obj \ $(OBJS)\coredll_gsockmsw.obj \ - $(OBJS)\coredll_helpchm.obj \ - $(OBJS)\coredll_helpwin.obj \ $(OBJS)\coredll_icon.obj \ $(OBJS)\coredll_minifram.obj \ - $(OBJS)\coredll_automtn.obj \ $(OBJS)\coredll_dataobj.obj \ $(OBJS)\coredll_dropsrc.obj \ $(OBJS)\coredll_droptgt.obj \ $(OBJS)\coredll_oleutils.obj \ - $(OBJS)\coredll_uuid.obj \ $(OBJS)\coredll_palette.obj \ $(OBJS)\coredll_pen.obj \ $(OBJS)\coredll_popupwin.obj \ @@ -2117,6 +2101,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_utilsgui.obj \ $(OBJS)\coredll_uxtheme.obj \ $(OBJS)\coredll_window.obj \ + $(OBJS)\coredll_automtn.obj \ + $(OBJS)\coredll_dirdlg.obj \ $(OBJS)\coredll_statusbr.obj \ $(OBJS)\coredll_prntdlgg.obj \ $(OBJS)\coredll_accel.obj \ @@ -2130,9 +2116,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_control.obj \ $(OBJS)\coredll_dialog.obj \ $(OBJS)\coredll_dragimag.obj \ - $(OBJS)\coredll_fdrepdlg.obj \ $(OBJS)\coredll_filedlg.obj \ - $(OBJS)\coredll_fontdlg.obj \ $(OBJS)\coredll_frame.obj \ $(OBJS)\coredll_gauge95.obj \ $(OBJS)\coredll_imaglist.obj \ @@ -2164,6 +2148,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_textctrl.obj \ $(OBJS)\coredll_tglbtn.obj \ $(OBJS)\coredll_treectrl.obj \ + $(OBJS)\coredll_fdrepdlg.obj \ + $(OBJS)\coredll_fontdlg.obj \ + $(OBJS)\coredll_helpchm.obj \ + $(OBJS)\coredll_helpwin.obj \ + $(OBJS)\coredll_uuid.obj \ $(OBJS)\coredll_accesscmn.obj \ $(OBJS)\coredll_appcmn.obj \ $(OBJS)\coredll_artprov.obj \ @@ -2277,7 +2266,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dcscreen.obj \ $(OBJS)\coredll_dialup.obj \ $(OBJS)\coredll_dib.obj \ - $(OBJS)\coredll_dirdlg.obj \ $(OBJS)\coredll_display.obj \ $(OBJS)\coredll_enhmeta.obj \ $(OBJS)\coredll_evtloop.obj \ @@ -2287,16 +2275,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_gdiimage.obj \ $(OBJS)\coredll_gdiobj.obj \ $(OBJS)\coredll_gsockmsw.obj \ - $(OBJS)\coredll_helpchm.obj \ - $(OBJS)\coredll_helpwin.obj \ $(OBJS)\coredll_icon.obj \ $(OBJS)\coredll_minifram.obj \ - $(OBJS)\coredll_automtn.obj \ $(OBJS)\coredll_dataobj.obj \ $(OBJS)\coredll_dropsrc.obj \ $(OBJS)\coredll_droptgt.obj \ $(OBJS)\coredll_oleutils.obj \ - $(OBJS)\coredll_uuid.obj \ $(OBJS)\coredll_palette.obj \ $(OBJS)\coredll_pen.obj \ $(OBJS)\coredll_popupwin.obj \ @@ -2311,6 +2295,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_utilsgui.obj \ $(OBJS)\coredll_uxtheme.obj \ $(OBJS)\coredll_window.obj \ + $(OBJS)\coredll_automtn.obj \ + $(OBJS)\coredll_dirdlg.obj \ $(OBJS)\coredll_accel.obj \ $(OBJS)\coredll_colrdlgg.obj \ $(OBJS)\coredll_dirdlgg.obj \ @@ -2461,22 +2447,22 @@ __corelib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_146_p = +____DEBUGRUNTIME_162_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_146_p = /D_DEBUG +____DEBUGRUNTIME_162_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_146_p = $(____DEBUGINFO) +____DEBUGRUNTIME_162_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_147 = +__DEBUGRUNTIME_163 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_147 = d +__DEBUGRUNTIME_163 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_147 = $(__DEBUGINFO_2_3) +__DEBUGRUNTIME_163 = $(__DEBUGINFO_23) !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_3_OBJECTS = \ @@ -2495,7 +2481,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dcscreen.obj \ $(OBJS)\corelib_dialup.obj \ $(OBJS)\corelib_dib.obj \ - $(OBJS)\corelib_dirdlg.obj \ $(OBJS)\corelib_display.obj \ $(OBJS)\corelib_enhmeta.obj \ $(OBJS)\corelib_evtloop.obj \ @@ -2505,16 +2490,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_gdiimage.obj \ $(OBJS)\corelib_gdiobj.obj \ $(OBJS)\corelib_gsockmsw.obj \ - $(OBJS)\corelib_helpchm.obj \ - $(OBJS)\corelib_helpwin.obj \ $(OBJS)\corelib_icon.obj \ $(OBJS)\corelib_minifram.obj \ - $(OBJS)\corelib_automtn.obj \ $(OBJS)\corelib_dataobj.obj \ $(OBJS)\corelib_dropsrc.obj \ $(OBJS)\corelib_droptgt.obj \ $(OBJS)\corelib_oleutils.obj \ - $(OBJS)\corelib_uuid.obj \ $(OBJS)\corelib_palette.obj \ $(OBJS)\corelib_pen.obj \ $(OBJS)\corelib_popupwin.obj \ @@ -2529,6 +2510,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_utilsgui.obj \ $(OBJS)\corelib_uxtheme.obj \ $(OBJS)\corelib_window.obj \ + $(OBJS)\corelib_automtn.obj \ + $(OBJS)\corelib_dirdlg.obj \ $(OBJS)\corelib_statusbr.obj \ $(OBJS)\corelib_prntdlgg.obj \ $(OBJS)\corelib_accel.obj \ @@ -2542,9 +2525,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_control.obj \ $(OBJS)\corelib_dialog.obj \ $(OBJS)\corelib_dragimag.obj \ - $(OBJS)\corelib_fdrepdlg.obj \ $(OBJS)\corelib_filedlg.obj \ - $(OBJS)\corelib_fontdlg.obj \ $(OBJS)\corelib_frame.obj \ $(OBJS)\corelib_gauge95.obj \ $(OBJS)\corelib_imaglist.obj \ @@ -2576,6 +2557,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_textctrl.obj \ $(OBJS)\corelib_tglbtn.obj \ $(OBJS)\corelib_treectrl.obj \ + $(OBJS)\corelib_fdrepdlg.obj \ + $(OBJS)\corelib_fontdlg.obj \ + $(OBJS)\corelib_helpchm.obj \ + $(OBJS)\corelib_helpwin.obj \ + $(OBJS)\corelib_uuid.obj \ $(OBJS)\corelib_accesscmn.obj \ $(OBJS)\corelib_appcmn.obj \ $(OBJS)\corelib_artprov.obj \ @@ -2689,7 +2675,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dcscreen.obj \ $(OBJS)\corelib_dialup.obj \ $(OBJS)\corelib_dib.obj \ - $(OBJS)\corelib_dirdlg.obj \ $(OBJS)\corelib_display.obj \ $(OBJS)\corelib_enhmeta.obj \ $(OBJS)\corelib_evtloop.obj \ @@ -2699,16 +2684,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_gdiimage.obj \ $(OBJS)\corelib_gdiobj.obj \ $(OBJS)\corelib_gsockmsw.obj \ - $(OBJS)\corelib_helpchm.obj \ - $(OBJS)\corelib_helpwin.obj \ $(OBJS)\corelib_icon.obj \ $(OBJS)\corelib_minifram.obj \ - $(OBJS)\corelib_automtn.obj \ $(OBJS)\corelib_dataobj.obj \ $(OBJS)\corelib_dropsrc.obj \ $(OBJS)\corelib_droptgt.obj \ $(OBJS)\corelib_oleutils.obj \ - $(OBJS)\corelib_uuid.obj \ $(OBJS)\corelib_palette.obj \ $(OBJS)\corelib_pen.obj \ $(OBJS)\corelib_popupwin.obj \ @@ -2723,6 +2704,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_utilsgui.obj \ $(OBJS)\corelib_uxtheme.obj \ $(OBJS)\corelib_window.obj \ + $(OBJS)\corelib_automtn.obj \ + $(OBJS)\corelib_dirdlg.obj \ $(OBJS)\corelib_accel.obj \ $(OBJS)\corelib_colrdlgg.obj \ $(OBJS)\corelib_dirdlgg.obj \ @@ -2873,242 +2856,242 @@ __advdll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).dll !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_158_p = +____DEBUGRUNTIME_175_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_158_p = /D_DEBUG +____DEBUGRUNTIME_175_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_158_p = $(____DEBUGINFO) +____DEBUGRUNTIME_175_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_159 = +__DEBUGRUNTIME_176 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_159 = d +__DEBUGRUNTIME_176 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_159 = $(__DEBUGINFO_2_3) +__DEBUGRUNTIME_176 = $(__DEBUGINFO_23) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" __advlib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_170_p = +____DEBUGRUNTIME_187_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_170_p = /D_DEBUG +____DEBUGRUNTIME_187_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_170_p = $(____DEBUGINFO) +____DEBUGRUNTIME_187_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_171 = +__DEBUGRUNTIME_188 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_171 = d +__DEBUGRUNTIME_188 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_171 = $(__DEBUGINFO_2_3) +__DEBUGRUNTIME_188 = $(__DEBUGINFO_23) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1" __odbcdll___depname = \ $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_182_p = +____DEBUGRUNTIME_200_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_182_p = /D_DEBUG +____DEBUGRUNTIME_200_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_182_p = $(____DEBUGINFO) +____DEBUGRUNTIME_200_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_183 = +__DEBUGRUNTIME_201 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_183 = d +__DEBUGRUNTIME_201 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_183 = $(__DEBUGINFO_2_3) +__DEBUGRUNTIME_201 = $(__DEBUGINFO_23) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1" __odbclib___depname = \ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_194_p = +____DEBUGRUNTIME_212_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_194_p = /D_DEBUG +____DEBUGRUNTIME_212_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_194_p = $(____DEBUGINFO) +____DEBUGRUNTIME_212_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_195 = +__DEBUGRUNTIME_213 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_195 = d +__DEBUGRUNTIME_213 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_195 = $(__DEBUGINFO_2_3) +__DEBUGRUNTIME_213 = $(__DEBUGINFO_23) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" __dbgriddll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).dll !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_206_p = +____DEBUGRUNTIME_225_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_206_p = /D_DEBUG +____DEBUGRUNTIME_225_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_206_p = $(____DEBUGINFO) +____DEBUGRUNTIME_225_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_207 = +__DEBUGRUNTIME_226 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_207 = d +__DEBUGRUNTIME_226 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_207 = $(__DEBUGINFO_2_3) +__DEBUGRUNTIME_226 = $(__DEBUGINFO_23) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" __dbgridlib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_218_p = +____DEBUGRUNTIME_237_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_218_p = /D_DEBUG +____DEBUGRUNTIME_237_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_218_p = $(____DEBUGINFO) +____DEBUGRUNTIME_237_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_219 = +__DEBUGRUNTIME_238 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_219 = d +__DEBUGRUNTIME_238 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_219 = $(__DEBUGINFO_2_3) +__DEBUGRUNTIME_238 = $(__DEBUGINFO_23) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1" __htmldll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).dll !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_230_p = +____DEBUGRUNTIME_250_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_230_p = /D_DEBUG +____DEBUGRUNTIME_250_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_230_p = $(____DEBUGINFO) +____DEBUGRUNTIME_250_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_231 = +__DEBUGRUNTIME_251 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_231 = d +__DEBUGRUNTIME_251 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_231 = $(__DEBUGINFO_2_3) +__DEBUGRUNTIME_251 = $(__DEBUGINFO_23) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_HTML)" == "1" __htmllib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_242_p = +____DEBUGRUNTIME_262_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_242_p = /D_DEBUG +____DEBUGRUNTIME_262_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_242_p = $(____DEBUGINFO) +____DEBUGRUNTIME_262_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_243 = +__DEBUGRUNTIME_263 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_243 = d +__DEBUGRUNTIME_263 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_243 = $(__DEBUGINFO_2_3) +__DEBUGRUNTIME_263 = $(__DEBUGINFO_23) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" __xmldll___depname = \ $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).dll !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_254_p = +____DEBUGRUNTIME_275_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_254_p = /D_DEBUG +____DEBUGRUNTIME_275_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_254_p = $(____DEBUGINFO) +____DEBUGRUNTIME_275_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_255 = +__DEBUGRUNTIME_276 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_255 = d +__DEBUGRUNTIME_276 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_255 = $(__DEBUGINFO_2_3) +__DEBUGRUNTIME_276 = $(__DEBUGINFO_23) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" __xmllib___depname = \ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_266_p = +____DEBUGRUNTIME_287_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_266_p = /D_DEBUG +____DEBUGRUNTIME_287_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_266_p = $(____DEBUGINFO) +____DEBUGRUNTIME_287_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_267 = +__DEBUGRUNTIME_288 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_267 = d +__DEBUGRUNTIME_288 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_267 = $(__DEBUGINFO_2_3) +__DEBUGRUNTIME_288 = $(__DEBUGINFO_23) !endif !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" __gldll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).dll !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_278_p = +____DEBUGRUNTIME_300_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_278_p = /D_DEBUG +____DEBUGRUNTIME_300_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_278_p = $(____DEBUGINFO) +____DEBUGRUNTIME_300_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_279 = +__DEBUGRUNTIME_301 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_279 = d +__DEBUGRUNTIME_301 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_279 = $(__DEBUGINFO_2_3) +__DEBUGRUNTIME_301 = $(__DEBUGINFO_23) !endif !if "$(MONOLITHIC)" == "0" __WXLIBGLDEP_CORE_p = \ @@ -3126,34 +3109,34 @@ __gllib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_290_p = +____DEBUGRUNTIME_312_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_290_p = /D_DEBUG +____DEBUGRUNTIME_312_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_290_p = $(____DEBUGINFO) +____DEBUGRUNTIME_312_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_291 = +__DEBUGRUNTIME_313 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_291 = d +__DEBUGRUNTIME_313 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_291 = $(__DEBUGINFO_2_3) +__DEBUGRUNTIME_313 = $(__DEBUGINFO_23) !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_22 = /DEBUG +__DEBUGINFO_2_2 = /DEBUG !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_22 = +__DEBUGINFO_2_2 = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_22 = +__DEBUGINFO_2_2 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_22 = /DEBUG +__DEBUGINFO_2_2 = /DEBUG !endif !if "$(USE_GUI)" == "1" __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib @@ -3192,16 +3175,16 @@ ____DEBUGINFO = ____DEBUGINFO = /D_DEBUG !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_2_3 = d +__DEBUGINFO_23 = d !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_2_3 = +__DEBUGINFO_23 = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_2_3 = +__DEBUGINFO_23 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_2_3 = d +__DEBUGINFO_23 = d !endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG = /Od @@ -3222,10 +3205,10 @@ __EXCEPTIONSFLAG = __EXCEPTIONSFLAG = /GR !endif !if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_2 = +__EXCEPTIONSFLAG_3 = !endif !if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_2 = /GX +__EXCEPTIONSFLAG_3 = /GX !endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" __NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ @@ -3376,7 +3359,7 @@ $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib: $(WXEXPAT_OBJECTS) !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_22) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2_2) /LIBPATH:$(LIBDIRNAME) @<< $(MONODLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib << !endif @@ -3391,7 +3374,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $( !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_22) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2_2) /LIBPATH:$(LIBDIRNAME) @<< $(BASEDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib << !endif @@ -3406,7 +3389,7 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(OBJS)\baselib_dummy. !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_22) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2_2) /LIBPATH:$(LIBDIRNAME) @<< $(NETDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib << !endif @@ -3421,7 +3404,7 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(OBJS)\netlib_dum !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_22) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2_2) /LIBPATH:$(LIBDIRNAME) @<< $(COREDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib << !endif @@ -3436,7 +3419,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.li !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_22) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2_2) /LIBPATH:$(LIBDIRNAME) @<< $(ADVDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib << !endif @@ -3451,7 +3434,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1" $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll: $(OBJS)\odbcdll_dummy.obj $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_22) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2_2) /LIBPATH:$(LIBDIRNAME) @<< $(ODBCDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib << !endif @@ -3466,7 +3449,7 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(OBJS)\odbclib_d !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).dll: $(OBJS)\dbgriddll_dummy.obj $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_22) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2_2) /LIBPATH:$(LIBDIRNAME) @<< $(DBGRIDDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib << !endif @@ -3481,7 +3464,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid. !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_22) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2_2) /LIBPATH:$(LIBDIRNAME) @<< $(HTMLDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib << !endif @@ -3496,7 +3479,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.li !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_22) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2_2) /LIBPATH:$(LIBDIRNAME) @<< $(XMLDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib << !endif @@ -3511,7 +3494,7 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib: $(OBJS)\xmllib_dum !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) $(__coredll___depname) - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_22) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2_2) /LIBPATH:$(LIBDIRNAME) @<< $(GLDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib << !endif @@ -3612,18 +3595,12 @@ $(OBJS)\wxzlib_zutil.obj: ..\..\src\zlib\zutil.c $(OBJS)\wxzlib_inflate.obj: ..\..\src\zlib\inflate.c $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) $** -$(OBJS)\wxzlib_infblock.obj: ..\..\src\zlib\infblock.c +$(OBJS)\wxzlib_infback.obj: ..\..\src\zlib\infback.c $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) $** $(OBJS)\wxzlib_inftrees.obj: ..\..\src\zlib\inftrees.c $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) $** -$(OBJS)\wxzlib_infcodes.obj: ..\..\src\zlib\infcodes.c - $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) $** - -$(OBJS)\wxzlib_infutil.obj: ..\..\src\zlib\infutil.c - $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) $** - $(OBJS)\wxzlib_inffast.obj: ..\..\src\zlib\inffast.c $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) $** @@ -3984,9 +3961,6 @@ $(OBJS)\monodll_fmapbase.obj: ..\..\src\common\fmapbase.cpp $(OBJS)\monodll_fs_zip.obj: ..\..\src\common\fs_zip.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_gzstream.obj: ..\..\src\common\gzstream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** - $(OBJS)\monodll_hash.obj: ..\..\src\common\hash.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -4182,9 +4156,6 @@ $(OBJS)\monodll_dragimag.obj: ..\..\src\msw\dragimag.cpp $(OBJS)\monodll_filedlg.obj: ..\..\src\msw\filedlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** - $(OBJS)\monodll_frame.obj: ..\..\src\msw\frame.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -4236,6 +4207,18 @@ $(OBJS)\monodll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp $(OBJS)\monodll_treectrl.obj: ..\..\src\msw\treectrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_helpchm.obj: ..\..\src\msw\helpchm.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_helpwin.obj: ..\..\src\msw\helpwin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -4338,15 +4321,15 @@ $(OBJS)\monodll_wizard.obj: ..\..\src\generic\wizard.cpp $(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.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 + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_helpbest.obj: ..\..\src\msw\helpbest.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -4503,11 +4486,6 @@ $(OBJS)\monodll_dib.obj: ..\..\src\msw\dib.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_display.obj: ..\..\src\msw\display.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -4553,16 +4531,6 @@ $(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.c $(CC) /c /nologo /TC /Fo$@ $(MONODLL_CFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_helpchm.obj: ..\..\src\msw\helpchm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_helpwin.obj: ..\..\src\msw\helpwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_icon.obj: ..\..\src\msw\icon.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -4573,11 +4541,6 @@ $(OBJS)\monodll_minifram.obj: ..\..\src\msw\minifram.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_automtn.obj: ..\..\src\msw\ole\automtn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -4598,11 +4561,6 @@ $(OBJS)\monodll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_palette.obj: ..\..\src\msw\palette.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -4673,6 +4631,16 @@ $(OBJS)\monodll_window.obj: ..\..\src\msw\window.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_automtn.obj: ..\..\src\msw\ole\automtn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monodll_statusbr.obj: ..\..\src\generic\statusbr.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -4778,16 +4746,6 @@ $(OBJS)\monodll_dialog.obj: ..\..\src\univ\dialog.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" -$(OBJS)\monodll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\monodll_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monodll_imaglist.obj: ..\..\src\msw\imaglist.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -4928,6 +4886,16 @@ $(OBJS)\monodll_textctrl.obj: ..\..\src\univ\textctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\monodll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\monodll_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_accesscmn.obj: ..\..\src\common\accesscmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -5463,9 +5431,6 @@ $(OBJS)\monolib_fmapbase.obj: ..\..\src\common\fmapbase.cpp $(OBJS)\monolib_fs_zip.obj: ..\..\src\common\fs_zip.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_gzstream.obj: ..\..\src\common\gzstream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** - $(OBJS)\monolib_hash.obj: ..\..\src\common\hash.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -5661,9 +5626,6 @@ $(OBJS)\monolib_dragimag.obj: ..\..\src\msw\dragimag.cpp $(OBJS)\monolib_filedlg.obj: ..\..\src\msw\filedlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** - $(OBJS)\monolib_frame.obj: ..\..\src\msw\frame.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -5715,6 +5677,18 @@ $(OBJS)\monolib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp $(OBJS)\monolib_treectrl.obj: ..\..\src\msw\treectrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_helpchm.obj: ..\..\src\msw\helpchm.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_helpwin.obj: ..\..\src\msw\helpwin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -5817,15 +5791,15 @@ $(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp $(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.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 + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_helpbest.obj: ..\..\src\msw\helpbest.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -5982,11 +5956,6 @@ $(OBJS)\monolib_dib.obj: ..\..\src\msw\dib.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_display.obj: ..\..\src\msw\display.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -6032,16 +6001,6 @@ $(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.c $(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_helpchm.obj: ..\..\src\msw\helpchm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_helpwin.obj: ..\..\src\msw\helpwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_icon.obj: ..\..\src\msw\icon.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -6052,11 +6011,6 @@ $(OBJS)\monolib_minifram.obj: ..\..\src\msw\minifram.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_automtn.obj: ..\..\src\msw\ole\automtn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -6077,11 +6031,6 @@ $(OBJS)\monolib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_palette.obj: ..\..\src\msw\palette.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -6152,6 +6101,16 @@ $(OBJS)\monolib_window.obj: ..\..\src\msw\window.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_automtn.obj: ..\..\src\msw\ole\automtn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monolib_statusbr.obj: ..\..\src\generic\statusbr.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -6257,16 +6216,6 @@ $(OBJS)\monolib_dialog.obj: ..\..\src\univ\dialog.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" -$(OBJS)\monolib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\monolib_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\monolib_imaglist.obj: ..\..\src\msw\imaglist.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -6407,6 +6356,16 @@ $(OBJS)\monolib_textctrl.obj: ..\..\src\univ\textctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\monolib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\monolib_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_accesscmn.obj: ..\..\src\common\accesscmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -6942,9 +6901,6 @@ $(OBJS)\basedll_fmapbase.obj: ..\..\src\common\fmapbase.cpp $(OBJS)\basedll_fs_zip.obj: ..\..\src\common\fs_zip.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_gzstream.obj: ..\..\src\common\gzstream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** - $(OBJS)\basedll_hash.obj: ..\..\src\common\hash.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** @@ -7155,9 +7111,6 @@ $(OBJS)\baselib_fmapbase.obj: ..\..\src\common\fmapbase.cpp $(OBJS)\baselib_fs_zip.obj: ..\..\src\common\fs_zip.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_gzstream.obj: ..\..\src\common\gzstream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** - $(OBJS)\baselib_hash.obj: ..\..\src\common\hash.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** @@ -7419,9 +7372,6 @@ $(OBJS)\coredll_dragimag.obj: ..\..\src\msw\dragimag.cpp $(OBJS)\coredll_filedlg.obj: ..\..\src\msw\filedlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -$(OBJS)\coredll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** - $(OBJS)\coredll_frame.obj: ..\..\src\msw\frame.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -7473,6 +7423,18 @@ $(OBJS)\coredll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp $(OBJS)\coredll_treectrl.obj: ..\..\src\msw\treectrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** +$(OBJS)\coredll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** + +$(OBJS)\coredll_helpchm.obj: ..\..\src\msw\helpchm.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** + +$(OBJS)\coredll_helpwin.obj: ..\..\src\msw\helpwin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** + +$(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** + $(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -7617,11 +7579,6 @@ $(OBJS)\coredll_dib.obj: ..\..\src\msw\dib.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_display.obj: ..\..\src\msw\display.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -7667,16 +7624,6 @@ $(OBJS)\coredll_gsockmsw.obj: ..\..\src\msw\gsockmsw.c $(CC) /c /nologo /TC /Fo$@ $(COREDLL_CFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_helpchm.obj: ..\..\src\msw\helpchm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_helpwin.obj: ..\..\src\msw\helpwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_icon.obj: ..\..\src\msw\icon.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -7687,11 +7634,6 @@ $(OBJS)\coredll_minifram.obj: ..\..\src\msw\minifram.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_automtn.obj: ..\..\src\msw\ole\automtn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -7712,11 +7654,6 @@ $(OBJS)\coredll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_palette.obj: ..\..\src\msw\palette.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -7787,6 +7724,16 @@ $(OBJS)\coredll_window.obj: ..\..\src\msw\window.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_automtn.obj: ..\..\src\msw\ole\automtn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\coredll_statusbr.obj: ..\..\src\generic\statusbr.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -7892,16 +7839,6 @@ $(OBJS)\coredll_dialog.obj: ..\..\src\univ\dialog.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" -$(OBJS)\coredll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\coredll_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\coredll_imaglist.obj: ..\..\src\msw\imaglist.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -8042,6 +7979,16 @@ $(OBJS)\coredll_textctrl.obj: ..\..\src\univ\textctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\coredll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\coredll_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_accesscmn.obj: ..\..\src\common\accesscmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -8550,9 +8497,6 @@ $(OBJS)\corelib_dragimag.obj: ..\..\src\msw\dragimag.cpp $(OBJS)\corelib_filedlg.obj: ..\..\src\msw\filedlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -$(OBJS)\corelib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** - $(OBJS)\corelib_frame.obj: ..\..\src\msw\frame.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -8604,6 +8548,18 @@ $(OBJS)\corelib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp $(OBJS)\corelib_treectrl.obj: ..\..\src\msw\treectrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** +$(OBJS)\corelib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** + +$(OBJS)\corelib_helpchm.obj: ..\..\src\msw\helpchm.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** + +$(OBJS)\corelib_helpwin.obj: ..\..\src\msw\helpwin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** + +$(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** + $(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -8748,11 +8704,6 @@ $(OBJS)\corelib_dib.obj: ..\..\src\msw\dib.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_display.obj: ..\..\src\msw\display.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -8798,16 +8749,6 @@ $(OBJS)\corelib_gsockmsw.obj: ..\..\src\msw\gsockmsw.c $(CC) /c /nologo /TC /Fo$@ $(CORELIB_CFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_helpchm.obj: ..\..\src\msw\helpchm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_helpwin.obj: ..\..\src\msw\helpwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_icon.obj: ..\..\src\msw\icon.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -8818,11 +8759,6 @@ $(OBJS)\corelib_minifram.obj: ..\..\src\msw\minifram.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_automtn.obj: ..\..\src\msw\ole\automtn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -8843,11 +8779,6 @@ $(OBJS)\corelib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_palette.obj: ..\..\src\msw\palette.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -8918,6 +8849,16 @@ $(OBJS)\corelib_window.obj: ..\..\src\msw\window.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_automtn.obj: ..\..\src\msw\ole\automtn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\corelib_statusbr.obj: ..\..\src\generic\statusbr.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -9023,16 +8964,6 @@ $(OBJS)\corelib_dialog.obj: ..\..\src\univ\dialog.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" -$(OBJS)\corelib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -$(OBJS)\corelib_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" $(OBJS)\corelib_imaglist.obj: ..\..\src\msw\imaglist.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -9173,6 +9104,16 @@ $(OBJS)\corelib_textctrl.obj: ..\..\src\univ\textctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" +$(OBJS)\corelib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** +!endif + +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\corelib_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_accesscmn.obj: ..\..\src\common\accesscmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -9684,15 +9625,15 @@ $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** -$(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** - $(OBJS)\advdll_sound.obj: ..\..\src\msw\sound.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** $(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** +$(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + $(OBJS)\advlib_dummy.obj: ..\..\src\msw\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) /Ycwx/wxprec.h $** @@ -9729,15 +9670,15 @@ $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** -$(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** - $(OBJS)\advlib_sound.obj: ..\..\src\msw\sound.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** $(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** +$(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + $(OBJS)\odbcdll_dummy.obj: ..\..\src\msw\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) /Ycwx/wxprec.h $**