X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/401e3b6e5f50f15571b86297b5d1e3f55c473f6f..f31424dbe95971e8ac8ccf9f11cd79afe19485ea:/build/msw/makefile.vc diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 0dfef1ce58..13231329fe 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -17,11 +17,15 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \ DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \ DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" MONOLITHIC="$(MONOLITHIC)" \ - 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)" \ + USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" USE_XRC="$(USE_XRC)" \ + USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" \ + USE_EXCEPTIONS="$(USE_EXCEPTIONS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \ + VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" \ + WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ RUNTIME_LIBS="$(RUNTIME_LIBS)" +WX_RELEASE_NODOT = 25 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ @@ -171,7 +175,7 @@ WXEXPAT_OBJECTS = \ $(OBJS)\wxexpat_xmltok.obj MONODLL_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_76) /DWIN32 \ $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \ $(____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 \ @@ -179,7 +183,7 @@ MONODLL_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_76) /DWIN32 \ /DwxUSE_BASE=1 /DWXMAKINGDLL $(CPPFLAGS) $(CFLAGS) MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_76) /DWIN32 \ $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \ $(____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 \ @@ -223,6 +227,7 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_object.obj \ $(OBJS)\monodll_process.obj \ $(OBJS)\monodll_regex.obj \ + $(OBJS)\monodll_sstream.obj \ $(OBJS)\monodll_stopwatch.obj \ $(OBJS)\monodll_strconv.obj \ $(OBJS)\monodll_stream.obj \ @@ -275,7 +280,7 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_xtixml.obj MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_88) /DWIN32 \ $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \ $(____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 \ @@ -283,7 +288,7 @@ MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_88) /DWIN32 \ /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_88) /DWIN32 \ $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \ $(____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 \ @@ -327,6 +332,7 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_object.obj \ $(OBJS)\monolib_process.obj \ $(OBJS)\monolib_regex.obj \ + $(OBJS)\monolib_sstream.obj \ $(OBJS)\monolib_stopwatch.obj \ $(OBJS)\monolib_strconv.obj \ $(OBJS)\monolib_stream.obj \ @@ -379,7 +385,7 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_xtixml.obj BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_101) /DWIN32 \ $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \ + /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \ $(____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 \ @@ -387,7 +393,7 @@ BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_101) /DWIN32 \ /DwxUSE_GUI=0 /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_101) /DWIN32 \ $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \ + /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \ $(____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 \ @@ -432,6 +438,7 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_object.obj \ $(OBJS)\basedll_process.obj \ $(OBJS)\basedll_regex.obj \ + $(OBJS)\basedll_sstream.obj \ $(OBJS)\basedll_stopwatch.obj \ $(OBJS)\basedll_strconv.obj \ $(OBJS)\basedll_stream.obj \ @@ -469,7 +476,7 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_volume.obj BASELIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_113) /DWIN32 \ $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \ + /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \ $(____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 \ @@ -477,7 +484,7 @@ BASELIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_113) /DWIN32 \ /DwxUSE_GUI=0 /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_113) /DWIN32 \ $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \ + /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \ $(____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 \ @@ -521,6 +528,7 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_object.obj \ $(OBJS)\baselib_process.obj \ $(OBJS)\baselib_regex.obj \ + $(OBJS)\baselib_sstream.obj \ $(OBJS)\baselib_stopwatch.obj \ $(OBJS)\baselib_strconv.obj \ $(OBJS)\baselib_stream.obj \ @@ -558,7 +566,7 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_volume.obj NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_126) /DWIN32 \ $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb \ + /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb \ $(____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 \ @@ -582,7 +590,7 @@ NETDLL_OBJECTS = \ $(OBJS)\netdll_urlmsw.obj NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_138) /DWIN32 \ $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.pdb \ + /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.pdb \ $(____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 \ @@ -605,7 +613,7 @@ NETLIB_OBJECTS = \ $(OBJS)\netlib_urlmsw.obj COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_151) /DWIN32 \ $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).pdb \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb \ $(____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 \ @@ -625,7 +633,7 @@ COREDLL_OBJECTS = \ $(____CORE_SRC_FILENAMES_2_OBJECTS) CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_163) /DWIN32 \ $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.pdb \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.pdb \ $(____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 \ @@ -644,7 +652,7 @@ CORELIB_OBJECTS = \ $(____CORE_SRC_FILENAMES_3_OBJECTS) ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_176) /DWIN32 \ $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).pdb \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb \ $(____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 \ @@ -669,7 +677,7 @@ ADVDLL_OBJECTS = \ $(OBJS)\advdll_joystick.obj ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_188) /DWIN32 \ $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.pdb \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.pdb \ $(____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 \ @@ -694,7 +702,7 @@ ADVLIB_OBJECTS = \ $(OBJS)\advlib_joystick.obj ODBCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_201) /DWIN32 \ $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).pdb \ + /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).pdb \ $(____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 \ @@ -708,7 +716,7 @@ ODBCDLL_OBJECTS = \ $(OBJS)\odbcdll_dbtable.obj ODBCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_213) /DWIN32 \ $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.pdb \ + /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.pdb \ $(____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 \ @@ -721,7 +729,7 @@ ODBCLIB_OBJECTS = \ $(OBJS)\odbclib_dbtable.obj DBGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_226) /DWIN32 \ $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).pdb \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).pdb \ $(____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 \ @@ -733,7 +741,7 @@ DBGRIDDLL_OBJECTS = \ $(OBJS)\dbgriddll_dbgrid.obj DBGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_238) /DWIN32 \ $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.pdb \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.pdb \ $(____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 \ @@ -745,7 +753,7 @@ DBGRIDLIB_OBJECTS = \ $(OBJS)\dbgridlib_dbgrid.obj HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_251) /DWIN32 \ $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).pdb \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb \ $(____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 \ @@ -778,7 +786,7 @@ HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_htmllbox.obj HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_263) /DWIN32 \ $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.pdb \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.pdb \ $(____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 \ @@ -811,7 +819,7 @@ HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_htmllbox.obj XMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_276) /DWIN32 \ $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).pdb \ + /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb \ $(____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 \ @@ -825,7 +833,7 @@ XMLDLL_OBJECTS = \ $(OBJS)\xmldll_xtixml.obj XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_288) /DWIN32 \ $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.pdb \ + /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.pdb \ $(____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 \ @@ -836,22 +844,122 @@ XMLLIB_OBJECTS = \ $(OBJS)\xmllib_dummy.obj \ $(OBJS)\xmllib_xml.obj \ $(OBJS)\xmllib_xtixml.obj -GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_301) /DWIN32 \ +XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_301) /DWIN32 \ $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).pdb \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb \ $(____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_XRC $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_3) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xrcdll.pch" $(CPPFLAGS) $(CXXFLAGS) +XRCDLL_OBJECTS = \ + $(OBJS)\xrcdll_dummy.obj \ + $(OBJS)\xrcdll_xh_bmpbt.obj \ + $(OBJS)\xrcdll_xh_bmp.obj \ + $(OBJS)\xrcdll_xh_bttn.obj \ + $(OBJS)\xrcdll_xh_cald.obj \ + $(OBJS)\xrcdll_xh_chckb.obj \ + $(OBJS)\xrcdll_xh_chckl.obj \ + $(OBJS)\xrcdll_xh_choic.obj \ + $(OBJS)\xrcdll_xh_combo.obj \ + $(OBJS)\xrcdll_xh_dlg.obj \ + $(OBJS)\xrcdll_xh_frame.obj \ + $(OBJS)\xrcdll_xh_gauge.obj \ + $(OBJS)\xrcdll_xh_gdctl.obj \ + $(OBJS)\xrcdll_xh_html.obj \ + $(OBJS)\xrcdll_xh_listb.obj \ + $(OBJS)\xrcdll_xh_listc.obj \ + $(OBJS)\xrcdll_xh_menu.obj \ + $(OBJS)\xrcdll_xh_notbk.obj \ + $(OBJS)\xrcdll_xh_panel.obj \ + $(OBJS)\xrcdll_xh_radbt.obj \ + $(OBJS)\xrcdll_xh_radbx.obj \ + $(OBJS)\xrcdll_xh_scrol.obj \ + $(OBJS)\xrcdll_xh_scwin.obj \ + $(OBJS)\xrcdll_xh_sizer.obj \ + $(OBJS)\xrcdll_xh_slidr.obj \ + $(OBJS)\xrcdll_xh_spin.obj \ + $(OBJS)\xrcdll_xh_split.obj \ + $(OBJS)\xrcdll_xh_statbar.obj \ + $(OBJS)\xrcdll_xh_stbmp.obj \ + $(OBJS)\xrcdll_xh_stbox.obj \ + $(OBJS)\xrcdll_xh_stlin.obj \ + $(OBJS)\xrcdll_xh_sttxt.obj \ + $(OBJS)\xrcdll_xh_text.obj \ + $(OBJS)\xrcdll_xh_tglbtn.obj \ + $(OBJS)\xrcdll_xh_toolb.obj \ + $(OBJS)\xrcdll_xh_tree.obj \ + $(OBJS)\xrcdll_xh_unkwn.obj \ + $(OBJS)\xrcdll_xh_wizrd.obj \ + $(OBJS)\xrcdll_xmlres.obj \ + $(OBJS)\xrcdll_xmlrsall.obj +XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_313) /DWIN32 \ + $(__DEBUGINFO) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.pdb \ + $(____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_3) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_xrclib.pch" $(CPPFLAGS) $(CXXFLAGS) +XRCLIB_OBJECTS = \ + $(OBJS)\xrclib_dummy.obj \ + $(OBJS)\xrclib_xh_bmpbt.obj \ + $(OBJS)\xrclib_xh_bmp.obj \ + $(OBJS)\xrclib_xh_bttn.obj \ + $(OBJS)\xrclib_xh_cald.obj \ + $(OBJS)\xrclib_xh_chckb.obj \ + $(OBJS)\xrclib_xh_chckl.obj \ + $(OBJS)\xrclib_xh_choic.obj \ + $(OBJS)\xrclib_xh_combo.obj \ + $(OBJS)\xrclib_xh_dlg.obj \ + $(OBJS)\xrclib_xh_frame.obj \ + $(OBJS)\xrclib_xh_gauge.obj \ + $(OBJS)\xrclib_xh_gdctl.obj \ + $(OBJS)\xrclib_xh_html.obj \ + $(OBJS)\xrclib_xh_listb.obj \ + $(OBJS)\xrclib_xh_listc.obj \ + $(OBJS)\xrclib_xh_menu.obj \ + $(OBJS)\xrclib_xh_notbk.obj \ + $(OBJS)\xrclib_xh_panel.obj \ + $(OBJS)\xrclib_xh_radbt.obj \ + $(OBJS)\xrclib_xh_radbx.obj \ + $(OBJS)\xrclib_xh_scrol.obj \ + $(OBJS)\xrclib_xh_scwin.obj \ + $(OBJS)\xrclib_xh_sizer.obj \ + $(OBJS)\xrclib_xh_slidr.obj \ + $(OBJS)\xrclib_xh_spin.obj \ + $(OBJS)\xrclib_xh_split.obj \ + $(OBJS)\xrclib_xh_statbar.obj \ + $(OBJS)\xrclib_xh_stbmp.obj \ + $(OBJS)\xrclib_xh_stbox.obj \ + $(OBJS)\xrclib_xh_stlin.obj \ + $(OBJS)\xrclib_xh_sttxt.obj \ + $(OBJS)\xrclib_xh_text.obj \ + $(OBJS)\xrclib_xh_tglbtn.obj \ + $(OBJS)\xrclib_xh_toolb.obj \ + $(OBJS)\xrclib_xh_tree.obj \ + $(OBJS)\xrclib_xh_unkwn.obj \ + $(OBJS)\xrclib_xh_wizrd.obj \ + $(OBJS)\xrclib_xmlres.obj \ + $(OBJS)\xrclib_xmlrsall.obj +GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_326) /DWIN32 \ + $(__DEBUGINFO) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb \ + $(____DEBUGRUNTIME_325_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_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_313) /DWIN32 \ +GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_338) /DWIN32 \ $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.pdb \ - $(____DEBUGRUNTIME_312_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.pdb \ + $(____DEBUGRUNTIME_337_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 \ @@ -907,7 +1015,7 @@ __DEBUGRUNTIME_3 = __DEBUGRUNTIME_3 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = $(__DEBUGINFO_23) +__DEBUGRUNTIME_3 = $(__DEBUGINFO_28) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_14_p = @@ -925,7 +1033,7 @@ __DEBUGRUNTIME_15 = __DEBUGRUNTIME_15 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_15 = $(__DEBUGINFO_23) +__DEBUGRUNTIME_15 = $(__DEBUGINFO_28) !endif !if "$(USE_GUI)" == "1" __wxpng___depname = $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib @@ -946,7 +1054,7 @@ __DEBUGRUNTIME_27 = __DEBUGRUNTIME_27 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_27 = $(__DEBUGINFO_23) +__DEBUGRUNTIME_27 = $(__DEBUGINFO_28) !endif !if "$(USE_GUI)" == "1" __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib @@ -967,7 +1075,7 @@ __DEBUGRUNTIME_39 = __DEBUGRUNTIME_39 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_39 = $(__DEBUGINFO_23) +__DEBUGRUNTIME_39 = $(__DEBUGINFO_28) !endif !if "$(USE_GUI)" == "1" __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib @@ -988,7 +1096,7 @@ __DEBUGRUNTIME_51 = __DEBUGRUNTIME_51 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_51 = $(__DEBUGINFO_23) +__DEBUGRUNTIME_51 = $(__DEBUGINFO_28) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_62_p = @@ -1006,7 +1114,7 @@ __DEBUGRUNTIME_63 = __DEBUGRUNTIME_63 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_63 = $(__DEBUGINFO_23) +__DEBUGRUNTIME_63 = $(__DEBUGINFO_28) !endif !if "$(SHARED)" == "0" ____LIBDIRNAME_FILENAMES_6_p = /I..\..\lib\vc_lib$(CFG) @@ -1016,7 +1124,7 @@ ____LIBDIRNAME_FILENAMES_6_p = /I..\..\lib\vc_dll$(CFG) !endif !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" __monodll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_75_p = @@ -1034,7 +1142,7 @@ __DEBUGRUNTIME_76 = __DEBUGRUNTIME_76 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_76 = $(__DEBUGINFO_23) +__DEBUGRUNTIME_76 = $(__DEBUGINFO_28) !endif !if "$(USE_GUI)" == "1" ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ @@ -1077,7 +1185,46 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_htmllbox.obj \ $(OBJS)\monodll_db.obj \ $(OBJS)\monodll_dbtable.obj \ - $(OBJS)\monodll_dbgrid.obj + $(OBJS)\monodll_dbgrid.obj \ + $(OBJS)\monodll_xh_bmpbt.obj \ + $(OBJS)\monodll_xh_bmp.obj \ + $(OBJS)\monodll_xh_bttn.obj \ + $(OBJS)\monodll_xh_cald.obj \ + $(OBJS)\monodll_xh_chckb.obj \ + $(OBJS)\monodll_xh_chckl.obj \ + $(OBJS)\monodll_xh_choic.obj \ + $(OBJS)\monodll_xh_combo.obj \ + $(OBJS)\monodll_xh_dlg.obj \ + $(OBJS)\monodll_xh_frame.obj \ + $(OBJS)\monodll_xh_gauge.obj \ + $(OBJS)\monodll_xh_gdctl.obj \ + $(OBJS)\monodll_xh_html.obj \ + $(OBJS)\monodll_xh_listb.obj \ + $(OBJS)\monodll_xh_listc.obj \ + $(OBJS)\monodll_xh_menu.obj \ + $(OBJS)\monodll_xh_notbk.obj \ + $(OBJS)\monodll_xh_panel.obj \ + $(OBJS)\monodll_xh_radbt.obj \ + $(OBJS)\monodll_xh_radbx.obj \ + $(OBJS)\monodll_xh_scrol.obj \ + $(OBJS)\monodll_xh_scwin.obj \ + $(OBJS)\monodll_xh_sizer.obj \ + $(OBJS)\monodll_xh_slidr.obj \ + $(OBJS)\monodll_xh_spin.obj \ + $(OBJS)\monodll_xh_split.obj \ + $(OBJS)\monodll_xh_statbar.obj \ + $(OBJS)\monodll_xh_stbmp.obj \ + $(OBJS)\monodll_xh_stbox.obj \ + $(OBJS)\monodll_xh_stlin.obj \ + $(OBJS)\monodll_xh_sttxt.obj \ + $(OBJS)\monodll_xh_text.obj \ + $(OBJS)\monodll_xh_tglbtn.obj \ + $(OBJS)\monodll_xh_toolb.obj \ + $(OBJS)\monodll_xh_tree.obj \ + $(OBJS)\monodll_xh_unkwn.obj \ + $(OBJS)\monodll_xh_wizrd.obj \ + $(OBJS)\monodll_xmlres.obj \ + $(OBJS)\monodll_xmlrsall.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_OBJECTS = \ @@ -1125,9 +1272,10 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_utilsgui.obj \ $(OBJS)\monodll_uxtheme.obj \ $(OBJS)\monodll_window.obj \ + $(OBJS)\monodll_helpchm.obj \ + $(OBJS)\monodll_helpwin.obj \ $(OBJS)\monodll_automtn.obj \ $(OBJS)\monodll_uuid.obj \ - $(OBJS)\monodll_dirdlg.obj \ $(OBJS)\monodll_statusbr.obj \ $(OBJS)\monodll_prntdlgg.obj \ $(OBJS)\monodll_accel.obj \ @@ -1140,6 +1288,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_combobox.obj \ $(OBJS)\monodll_control.obj \ $(OBJS)\monodll_dialog.obj \ + $(OBJS)\monodll_dirdlg.obj \ $(OBJS)\monodll_dragimag.obj \ $(OBJS)\monodll_filedlg.obj \ $(OBJS)\monodll_frame.obj \ @@ -1175,14 +1324,11 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_treectrl.obj \ $(OBJS)\monodll_fdrepdlg.obj \ $(OBJS)\monodll_fontdlg.obj \ - $(OBJS)\monodll_helpchm.obj \ - $(OBJS)\monodll_helpwin.obj \ $(OBJS)\monodll_accesscmn.obj \ $(OBJS)\monodll_appcmn.obj \ $(OBJS)\monodll_artprov.obj \ $(OBJS)\monodll_artstd.obj \ $(OBJS)\monodll_bmpbase.obj \ - $(OBJS)\monodll_buttoncmn.obj \ $(OBJS)\monodll_bookctrl.obj \ $(OBJS)\monodll_choiccmn.obj \ $(OBJS)\monodll_clipcmn.obj \ @@ -1254,6 +1400,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xpmdecod.obj \ $(OBJS)\monodll_busyinfo.obj \ $(OBJS)\monodll_choicdgg.obj \ + $(OBJS)\monodll_choicbkg.obj \ $(OBJS)\monodll_dcpsg.obj \ $(OBJS)\monodll_dirctrlg.obj \ $(OBJS)\monodll_dragimgg.obj \ @@ -1320,9 +1467,10 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_utilsgui.obj \ $(OBJS)\monodll_uxtheme.obj \ $(OBJS)\monodll_window.obj \ + $(OBJS)\monodll_helpchm.obj \ + $(OBJS)\monodll_helpwin.obj \ $(OBJS)\monodll_automtn.obj \ $(OBJS)\monodll_uuid.obj \ - $(OBJS)\monodll_dirdlg.obj \ $(OBJS)\monodll_accel.obj \ $(OBJS)\monodll_colrdlgg.obj \ $(OBJS)\monodll_dirdlgg.obj \ @@ -1377,7 +1525,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_artprov.obj \ $(OBJS)\monodll_artstd.obj \ $(OBJS)\monodll_bmpbase.obj \ - $(OBJS)\monodll_buttoncmn.obj \ $(OBJS)\monodll_bookctrl.obj \ $(OBJS)\monodll_choiccmn.obj \ $(OBJS)\monodll_clipcmn.obj \ @@ -1449,6 +1596,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xpmdecod.obj \ $(OBJS)\monodll_busyinfo.obj \ $(OBJS)\monodll_choicdgg.obj \ + $(OBJS)\monodll_choicbkg.obj \ $(OBJS)\monodll_dcpsg.obj \ $(OBJS)\monodll_dirctrlg.obj \ $(OBJS)\monodll_dragimgg.obj \ @@ -1471,7 +1619,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ !endif !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0" __monolib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_87_p = @@ -1489,7 +1637,7 @@ __DEBUGRUNTIME_88 = __DEBUGRUNTIME_88 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_88 = $(__DEBUGINFO_23) +__DEBUGRUNTIME_88 = $(__DEBUGINFO_28) !endif !if "$(USE_GUI)" == "1" ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ @@ -1532,7 +1680,46 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_htmllbox.obj \ $(OBJS)\monolib_db.obj \ $(OBJS)\monolib_dbtable.obj \ - $(OBJS)\monolib_dbgrid.obj + $(OBJS)\monolib_dbgrid.obj \ + $(OBJS)\monolib_xh_bmpbt.obj \ + $(OBJS)\monolib_xh_bmp.obj \ + $(OBJS)\monolib_xh_bttn.obj \ + $(OBJS)\monolib_xh_cald.obj \ + $(OBJS)\monolib_xh_chckb.obj \ + $(OBJS)\monolib_xh_chckl.obj \ + $(OBJS)\monolib_xh_choic.obj \ + $(OBJS)\monolib_xh_combo.obj \ + $(OBJS)\monolib_xh_dlg.obj \ + $(OBJS)\monolib_xh_frame.obj \ + $(OBJS)\monolib_xh_gauge.obj \ + $(OBJS)\monolib_xh_gdctl.obj \ + $(OBJS)\monolib_xh_html.obj \ + $(OBJS)\monolib_xh_listb.obj \ + $(OBJS)\monolib_xh_listc.obj \ + $(OBJS)\monolib_xh_menu.obj \ + $(OBJS)\monolib_xh_notbk.obj \ + $(OBJS)\monolib_xh_panel.obj \ + $(OBJS)\monolib_xh_radbt.obj \ + $(OBJS)\monolib_xh_radbx.obj \ + $(OBJS)\monolib_xh_scrol.obj \ + $(OBJS)\monolib_xh_scwin.obj \ + $(OBJS)\monolib_xh_sizer.obj \ + $(OBJS)\monolib_xh_slidr.obj \ + $(OBJS)\monolib_xh_spin.obj \ + $(OBJS)\monolib_xh_split.obj \ + $(OBJS)\monolib_xh_statbar.obj \ + $(OBJS)\monolib_xh_stbmp.obj \ + $(OBJS)\monolib_xh_stbox.obj \ + $(OBJS)\monolib_xh_stlin.obj \ + $(OBJS)\monolib_xh_sttxt.obj \ + $(OBJS)\monolib_xh_text.obj \ + $(OBJS)\monolib_xh_tglbtn.obj \ + $(OBJS)\monolib_xh_toolb.obj \ + $(OBJS)\monolib_xh_tree.obj \ + $(OBJS)\monolib_xh_unkwn.obj \ + $(OBJS)\monolib_xh_wizrd.obj \ + $(OBJS)\monolib_xmlres.obj \ + $(OBJS)\monolib_xmlrsall.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_1_OBJECTS = \ @@ -1580,9 +1767,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_utilsgui.obj \ $(OBJS)\monolib_uxtheme.obj \ $(OBJS)\monolib_window.obj \ + $(OBJS)\monolib_helpchm.obj \ + $(OBJS)\monolib_helpwin.obj \ $(OBJS)\monolib_automtn.obj \ $(OBJS)\monolib_uuid.obj \ - $(OBJS)\monolib_dirdlg.obj \ $(OBJS)\monolib_statusbr.obj \ $(OBJS)\monolib_prntdlgg.obj \ $(OBJS)\monolib_accel.obj \ @@ -1595,6 +1783,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_combobox.obj \ $(OBJS)\monolib_control.obj \ $(OBJS)\monolib_dialog.obj \ + $(OBJS)\monolib_dirdlg.obj \ $(OBJS)\monolib_dragimag.obj \ $(OBJS)\monolib_filedlg.obj \ $(OBJS)\monolib_frame.obj \ @@ -1630,14 +1819,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_treectrl.obj \ $(OBJS)\monolib_fdrepdlg.obj \ $(OBJS)\monolib_fontdlg.obj \ - $(OBJS)\monolib_helpchm.obj \ - $(OBJS)\monolib_helpwin.obj \ $(OBJS)\monolib_accesscmn.obj \ $(OBJS)\monolib_appcmn.obj \ $(OBJS)\monolib_artprov.obj \ $(OBJS)\monolib_artstd.obj \ $(OBJS)\monolib_bmpbase.obj \ - $(OBJS)\monolib_buttoncmn.obj \ $(OBJS)\monolib_bookctrl.obj \ $(OBJS)\monolib_choiccmn.obj \ $(OBJS)\monolib_clipcmn.obj \ @@ -1709,6 +1895,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xpmdecod.obj \ $(OBJS)\monolib_busyinfo.obj \ $(OBJS)\monolib_choicdgg.obj \ + $(OBJS)\monolib_choicbkg.obj \ $(OBJS)\monolib_dcpsg.obj \ $(OBJS)\monolib_dirctrlg.obj \ $(OBJS)\monolib_dragimgg.obj \ @@ -1775,9 +1962,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_utilsgui.obj \ $(OBJS)\monolib_uxtheme.obj \ $(OBJS)\monolib_window.obj \ + $(OBJS)\monolib_helpchm.obj \ + $(OBJS)\monolib_helpwin.obj \ $(OBJS)\monolib_automtn.obj \ $(OBJS)\monolib_uuid.obj \ - $(OBJS)\monolib_dirdlg.obj \ $(OBJS)\monolib_accel.obj \ $(OBJS)\monolib_colrdlgg.obj \ $(OBJS)\monolib_dirdlgg.obj \ @@ -1832,7 +2020,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_artprov.obj \ $(OBJS)\monolib_artstd.obj \ $(OBJS)\monolib_bmpbase.obj \ - $(OBJS)\monolib_buttoncmn.obj \ $(OBJS)\monolib_bookctrl.obj \ $(OBJS)\monolib_choiccmn.obj \ $(OBJS)\monolib_clipcmn.obj \ @@ -1904,6 +2091,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xpmdecod.obj \ $(OBJS)\monolib_busyinfo.obj \ $(OBJS)\monolib_choicdgg.obj \ + $(OBJS)\monolib_choicbkg.obj \ $(OBJS)\monolib_dcpsg.obj \ $(OBJS)\monolib_dirctrlg.obj \ $(OBJS)\monolib_dragimgg.obj \ @@ -1926,7 +2114,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" __basedll___depname = \ - $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_100_p = @@ -1944,11 +2132,11 @@ __DEBUGRUNTIME_101 = __DEBUGRUNTIME_101 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_101 = $(__DEBUGINFO_23) +__DEBUGRUNTIME_101 = $(__DEBUGINFO_28) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" __baselib___depname = \ - $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib + $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_112_p = @@ -1966,11 +2154,11 @@ __DEBUGRUNTIME_113 = __DEBUGRUNTIME_113 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_113 = $(__DEBUGINFO_23) +__DEBUGRUNTIME_113 = $(__DEBUGINFO_28) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" __netdll___depname = \ - $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_125_p = @@ -1988,11 +2176,11 @@ __DEBUGRUNTIME_126 = __DEBUGRUNTIME_126 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_126 = $(__DEBUGINFO_23) +__DEBUGRUNTIME_126 = $(__DEBUGINFO_28) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" __netlib___depname = \ - $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib + $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_137_p = @@ -2010,11 +2198,11 @@ __DEBUGRUNTIME_138 = __DEBUGRUNTIME_138 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_138 = $(__DEBUGINFO_23) +__DEBUGRUNTIME_138 = $(__DEBUGINFO_28) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" __coredll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_150_p = @@ -2032,7 +2220,7 @@ __DEBUGRUNTIME_151 = __DEBUGRUNTIME_151 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_151 = $(__DEBUGINFO_23) +__DEBUGRUNTIME_151 = $(__DEBUGINFO_28) !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_2_OBJECTS = \ @@ -2080,9 +2268,10 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_utilsgui.obj \ $(OBJS)\coredll_uxtheme.obj \ $(OBJS)\coredll_window.obj \ + $(OBJS)\coredll_helpchm.obj \ + $(OBJS)\coredll_helpwin.obj \ $(OBJS)\coredll_automtn.obj \ $(OBJS)\coredll_uuid.obj \ - $(OBJS)\coredll_dirdlg.obj \ $(OBJS)\coredll_statusbr.obj \ $(OBJS)\coredll_prntdlgg.obj \ $(OBJS)\coredll_accel.obj \ @@ -2095,6 +2284,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_combobox.obj \ $(OBJS)\coredll_control.obj \ $(OBJS)\coredll_dialog.obj \ + $(OBJS)\coredll_dirdlg.obj \ $(OBJS)\coredll_dragimag.obj \ $(OBJS)\coredll_filedlg.obj \ $(OBJS)\coredll_frame.obj \ @@ -2130,14 +2320,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_treectrl.obj \ $(OBJS)\coredll_fdrepdlg.obj \ $(OBJS)\coredll_fontdlg.obj \ - $(OBJS)\coredll_helpchm.obj \ - $(OBJS)\coredll_helpwin.obj \ $(OBJS)\coredll_accesscmn.obj \ $(OBJS)\coredll_appcmn.obj \ $(OBJS)\coredll_artprov.obj \ $(OBJS)\coredll_artstd.obj \ $(OBJS)\coredll_bmpbase.obj \ - $(OBJS)\coredll_buttoncmn.obj \ $(OBJS)\coredll_bookctrl.obj \ $(OBJS)\coredll_choiccmn.obj \ $(OBJS)\coredll_clipcmn.obj \ @@ -2209,6 +2396,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_xpmdecod.obj \ $(OBJS)\coredll_busyinfo.obj \ $(OBJS)\coredll_choicdgg.obj \ + $(OBJS)\coredll_choicbkg.obj \ $(OBJS)\coredll_dcpsg.obj \ $(OBJS)\coredll_dirctrlg.obj \ $(OBJS)\coredll_dragimgg.obj \ @@ -2275,9 +2463,10 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_utilsgui.obj \ $(OBJS)\coredll_uxtheme.obj \ $(OBJS)\coredll_window.obj \ + $(OBJS)\coredll_helpchm.obj \ + $(OBJS)\coredll_helpwin.obj \ $(OBJS)\coredll_automtn.obj \ $(OBJS)\coredll_uuid.obj \ - $(OBJS)\coredll_dirdlg.obj \ $(OBJS)\coredll_accel.obj \ $(OBJS)\coredll_colrdlgg.obj \ $(OBJS)\coredll_dirdlgg.obj \ @@ -2332,7 +2521,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_artprov.obj \ $(OBJS)\coredll_artstd.obj \ $(OBJS)\coredll_bmpbase.obj \ - $(OBJS)\coredll_buttoncmn.obj \ $(OBJS)\coredll_bookctrl.obj \ $(OBJS)\coredll_choiccmn.obj \ $(OBJS)\coredll_clipcmn.obj \ @@ -2404,6 +2592,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_xpmdecod.obj \ $(OBJS)\coredll_busyinfo.obj \ $(OBJS)\coredll_choicdgg.obj \ + $(OBJS)\coredll_choicbkg.obj \ $(OBJS)\coredll_dcpsg.obj \ $(OBJS)\coredll_dirctrlg.obj \ $(OBJS)\coredll_dragimgg.obj \ @@ -2426,7 +2615,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" __corelib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_162_p = @@ -2444,7 +2633,7 @@ __DEBUGRUNTIME_163 = __DEBUGRUNTIME_163 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_163 = $(__DEBUGINFO_23) +__DEBUGRUNTIME_163 = $(__DEBUGINFO_28) !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_3_OBJECTS = \ @@ -2492,9 +2681,10 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_utilsgui.obj \ $(OBJS)\corelib_uxtheme.obj \ $(OBJS)\corelib_window.obj \ + $(OBJS)\corelib_helpchm.obj \ + $(OBJS)\corelib_helpwin.obj \ $(OBJS)\corelib_automtn.obj \ $(OBJS)\corelib_uuid.obj \ - $(OBJS)\corelib_dirdlg.obj \ $(OBJS)\corelib_statusbr.obj \ $(OBJS)\corelib_prntdlgg.obj \ $(OBJS)\corelib_accel.obj \ @@ -2507,6 +2697,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_combobox.obj \ $(OBJS)\corelib_control.obj \ $(OBJS)\corelib_dialog.obj \ + $(OBJS)\corelib_dirdlg.obj \ $(OBJS)\corelib_dragimag.obj \ $(OBJS)\corelib_filedlg.obj \ $(OBJS)\corelib_frame.obj \ @@ -2542,14 +2733,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_treectrl.obj \ $(OBJS)\corelib_fdrepdlg.obj \ $(OBJS)\corelib_fontdlg.obj \ - $(OBJS)\corelib_helpchm.obj \ - $(OBJS)\corelib_helpwin.obj \ $(OBJS)\corelib_accesscmn.obj \ $(OBJS)\corelib_appcmn.obj \ $(OBJS)\corelib_artprov.obj \ $(OBJS)\corelib_artstd.obj \ $(OBJS)\corelib_bmpbase.obj \ - $(OBJS)\corelib_buttoncmn.obj \ $(OBJS)\corelib_bookctrl.obj \ $(OBJS)\corelib_choiccmn.obj \ $(OBJS)\corelib_clipcmn.obj \ @@ -2621,6 +2809,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_xpmdecod.obj \ $(OBJS)\corelib_busyinfo.obj \ $(OBJS)\corelib_choicdgg.obj \ + $(OBJS)\corelib_choicbkg.obj \ $(OBJS)\corelib_dcpsg.obj \ $(OBJS)\corelib_dirctrlg.obj \ $(OBJS)\corelib_dragimgg.obj \ @@ -2687,9 +2876,10 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_utilsgui.obj \ $(OBJS)\corelib_uxtheme.obj \ $(OBJS)\corelib_window.obj \ + $(OBJS)\corelib_helpchm.obj \ + $(OBJS)\corelib_helpwin.obj \ $(OBJS)\corelib_automtn.obj \ $(OBJS)\corelib_uuid.obj \ - $(OBJS)\corelib_dirdlg.obj \ $(OBJS)\corelib_accel.obj \ $(OBJS)\corelib_colrdlgg.obj \ $(OBJS)\corelib_dirdlgg.obj \ @@ -2744,7 +2934,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_artprov.obj \ $(OBJS)\corelib_artstd.obj \ $(OBJS)\corelib_bmpbase.obj \ - $(OBJS)\corelib_buttoncmn.obj \ $(OBJS)\corelib_bookctrl.obj \ $(OBJS)\corelib_choiccmn.obj \ $(OBJS)\corelib_clipcmn.obj \ @@ -2816,6 +3005,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_xpmdecod.obj \ $(OBJS)\corelib_busyinfo.obj \ $(OBJS)\corelib_choicdgg.obj \ + $(OBJS)\corelib_choicbkg.obj \ $(OBJS)\corelib_dcpsg.obj \ $(OBJS)\corelib_dirctrlg.obj \ $(OBJS)\corelib_dragimgg.obj \ @@ -2838,7 +3028,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" __advdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_175_p = @@ -2856,11 +3046,11 @@ __DEBUGRUNTIME_176 = __DEBUGRUNTIME_176 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_176 = $(__DEBUGINFO_23) +__DEBUGRUNTIME_176 = $(__DEBUGINFO_28) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" __advlib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_187_p = @@ -2878,11 +3068,11 @@ __DEBUGRUNTIME_188 = __DEBUGRUNTIME_188 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_188 = $(__DEBUGINFO_23) +__DEBUGRUNTIME_188 = $(__DEBUGINFO_28) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1" __odbcdll___depname = \ - $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_200_p = @@ -2900,11 +3090,11 @@ __DEBUGRUNTIME_201 = __DEBUGRUNTIME_201 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_201 = $(__DEBUGINFO_23) +__DEBUGRUNTIME_201 = $(__DEBUGINFO_28) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1" __odbclib___depname = \ - $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib + $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_212_p = @@ -2922,11 +3112,11 @@ __DEBUGRUNTIME_213 = __DEBUGRUNTIME_213 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_213 = $(__DEBUGINFO_23) +__DEBUGRUNTIME_213 = $(__DEBUGINFO_28) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" __dbgriddll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_225_p = @@ -2944,11 +3134,11 @@ __DEBUGRUNTIME_226 = __DEBUGRUNTIME_226 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_226 = $(__DEBUGINFO_23) +__DEBUGRUNTIME_226 = $(__DEBUGINFO_28) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" __dbgridlib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_237_p = @@ -2966,11 +3156,11 @@ __DEBUGRUNTIME_238 = __DEBUGRUNTIME_238 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_238 = $(__DEBUGINFO_23) +__DEBUGRUNTIME_238 = $(__DEBUGINFO_28) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1" __htmldll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_250_p = @@ -2988,11 +3178,11 @@ __DEBUGRUNTIME_251 = __DEBUGRUNTIME_251 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_251 = $(__DEBUGINFO_23) +__DEBUGRUNTIME_251 = $(__DEBUGINFO_28) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_HTML)" == "1" __htmllib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_262_p = @@ -3010,11 +3200,11 @@ __DEBUGRUNTIME_263 = __DEBUGRUNTIME_263 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_263 = $(__DEBUGINFO_23) +__DEBUGRUNTIME_263 = $(__DEBUGINFO_28) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" __xmldll___depname = \ - $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_275_p = @@ -3032,11 +3222,11 @@ __DEBUGRUNTIME_276 = __DEBUGRUNTIME_276 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_276 = $(__DEBUGINFO_23) +__DEBUGRUNTIME_276 = $(__DEBUGINFO_28) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" __xmllib___depname = \ - $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib + $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_287_p = @@ -3054,11 +3244,11 @@ __DEBUGRUNTIME_288 = __DEBUGRUNTIME_288 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_288 = $(__DEBUGINFO_23) +__DEBUGRUNTIME_288 = $(__DEBUGINFO_28) !endif -!if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" -__gldll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).dll +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1" +__xrcdll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_300_p = @@ -3076,52 +3266,97 @@ __DEBUGRUNTIME_301 = __DEBUGRUNTIME_301 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_301 = $(__DEBUGINFO_23) +__DEBUGRUNTIME_301 = $(__DEBUGINFO_28) +!endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_XRC)" == "1" +__xrclib___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_312_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_312_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_312_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_313 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_313 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_313 = $(__DEBUGINFO_28) +!endif +!if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" +__gldll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_325_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_325_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_325_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_326 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_326 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_326 = $(__DEBUGINFO_28) !endif !if "$(MONOLITHIC)" == "0" __WXLIBGLDEP_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIBGLDEP_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIBGLDEP_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif !if "$(MONOLITHIC)" == "1" __WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif !if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" __gllib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_312_p = +____DEBUGRUNTIME_337_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_312_p = /D_DEBUG +____DEBUGRUNTIME_337_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_312_p = $(____DEBUGINFO) +____DEBUGRUNTIME_337_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_313 = +__DEBUGRUNTIME_338 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_313 = d +__DEBUGRUNTIME_338 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_313 = $(__DEBUGINFO_23) +__DEBUGRUNTIME_338 = $(__DEBUGINFO_28) !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_2_2 = /DEBUG +__DEBUGINFO_23 = /DEBUG !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_2_2 = +__DEBUGINFO_23 = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_2_2 = +__DEBUGINFO_23 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_2_2 = /DEBUG +__DEBUGINFO_23 = /DEBUG !endif !if "$(USE_GUI)" == "1" __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib @@ -3160,16 +3395,16 @@ ____DEBUGINFO = ____DEBUGINFO = /D_DEBUG !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_23 = d +__DEBUGINFO_28 = d !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_23 = +__DEBUGINFO_28 = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_23 = +__DEBUGINFO_28 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_23 = d +__DEBUGINFO_28 = d !endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG = /Od @@ -3233,7 +3468,7 @@ $(OBJS): ### Targets: ### -all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file +all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -3244,56 +3479,61 @@ clean: -if exist $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib -if exist $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib -if exist $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib - -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib - -if exist $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib - -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib - -if exist $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib - -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).ilk + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).ilk + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb + -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib + -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).ilk + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb + -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib + -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).ilk + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).ilk + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).ilk + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).pdb + -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib + -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).ilk + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).pdb + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).ilk + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).ilk + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb + -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib + -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).ilk + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).ilk + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib cd ..\..\samples $(MAKE) -f makefile.vc $(MAKEARGS) clean cd $(MAKEDIR) @@ -3343,14 +3583,14 @@ $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib: $(WXEXPAT_OBJECTS) << !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(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_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 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_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_23) /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)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib << !endif !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(OBJS)\monolib_dummy.obj $(MONOLIB_OBJECTS) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib: $(OBJS)\monolib_dummy.obj $(MONOLIB_OBJECTS) if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< $(MONOLIB_OBJECTS) @@ -3358,14 +3598,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $( !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wxbase252$(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_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 +$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_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_23) /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)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib << !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" -$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(OBJS)\baselib_dummy.obj $(BASELIB_OBJECTS) +$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib: $(OBJS)\baselib_dummy.obj $(BASELIB_OBJECTS) if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< $(BASELIB_OBJECTS) @@ -3373,14 +3613,14 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(OBJS)\baselib_dummy. !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wxbase252$(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_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 +$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_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_23) /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)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib << !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" -$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(OBJS)\netlib_dummy.obj $(NETLIB_OBJECTS) +$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib: $(OBJS)\netlib_dummy.obj $(NETLIB_OBJECTS) if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< $(NETLIB_OBJECTS) @@ -3388,14 +3628,14 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(OBJS)\netlib_dum !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(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_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 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_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_23) /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)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib << !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib: $(OBJS)\corelib_dummy.obj $(CORELIB_OBJECTS) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib: $(OBJS)\corelib_dummy.obj $(CORELIB_OBJECTS) if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< $(CORELIB_OBJECTS) @@ -3403,14 +3643,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.li !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(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_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 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_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_23) /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)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib << !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib: $(OBJS)\advlib_dummy.obj $(ADVLIB_OBJECTS) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib: $(OBJS)\advlib_dummy.obj $(ADVLIB_OBJECTS) if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< $(ADVLIB_OBJECTS) @@ -3418,14 +3658,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1" -$(LIBDIRNAME)\wxbase252$(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_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 +$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_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_23) /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)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib << !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1" -$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(OBJS)\odbclib_dummy.obj $(ODBCLIB_OBJECTS) +$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib: $(OBJS)\odbclib_dummy.obj $(ODBCLIB_OBJECTS) if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< $(ODBCLIB_OBJECTS) @@ -3433,14 +3673,14 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(OBJS)\odbclib_d !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(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_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 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_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_23) /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)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib << !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib: $(OBJS)\dbgridlib_dummy.obj $(DBGRIDLIB_OBJECTS) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib: $(OBJS)\dbgridlib_dummy.obj $(DBGRIDLIB_OBJECTS) if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< $(DBGRIDLIB_OBJECTS) @@ -3448,14 +3688,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid. !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(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_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 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_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_23) /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)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib << !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_HTML)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib: $(OBJS)\htmllib_dummy.obj $(HTMLLIB_OBJECTS) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib: $(OBJS)\htmllib_dummy.obj $(HTMLLIB_OBJECTS) if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< $(HTMLLIB_OBJECTS) @@ -3463,29 +3703,44 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.li !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wxbase252$(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_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 +$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_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_23) /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)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib << !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" -$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib: $(OBJS)\xmllib_dummy.obj $(XMLLIB_OBJECTS) +$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib: $(OBJS)\xmllib_dummy.obj $(XMLLIB_OBJECTS) if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< $(XMLLIB_OBJECTS) << !endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__htmldll___depname) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname) + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_23) /LIBPATH:$(LIBDIRNAME) @<< + $(XRCDLL_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)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib +<< +!endif + +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_XRC)" == "1" +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib: $(OBJS)\xrclib_dummy.obj $(XRCLIB_OBJECTS) + if exist $@ del $@ + lib /NOLOGO /OUT:$@ @<< + $(XRCLIB_OBJECTS) +<< +!endif + !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(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_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 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_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_23) /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)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib << !endif !if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib: $(OBJS)\gllib_dummy.obj $(GLLIB_OBJECTS) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib: $(OBJS)\gllib_dummy.obj $(GLLIB_OBJECTS) if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< $(GLLIB_OBJECTS) @@ -3515,7 +3770,7 @@ $(SETUPHDIR)\wx\setup.h: build_cfg_file: $(SETUPHDIR) @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=5 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @@ -3994,6 +4249,9 @@ $(OBJS)\monodll_process.obj: ..\..\src\common\process.cpp $(OBJS)\monodll_regex.obj: ..\..\src\common\regex.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_sstream.obj: ..\..\src\common\sstream.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_stopwatch.obj: ..\..\src\common\stopwatch.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -4138,6 +4396,9 @@ $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_dragimag.obj: ..\..\src\msw\dragimag.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -4198,12 +4459,6 @@ $(OBJS)\monodll_treectrl.obj: ..\..\src\msw\treectrl.cpp $(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_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -4390,6 +4645,123 @@ $(OBJS)\monodll_dbtable.obj: ..\..\src\common\dbtable.cpp $(OBJS)\monodll_dbgrid.obj: ..\..\src\common\dbgrid.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_html.obj: ..\..\src\xrc\xh_html.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_split.obj: ..\..\src\xrc\xh_split.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_text.obj: ..\..\src\xrc\xh_text.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xmlres.obj: ..\..\src\xrc\xmlres.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_xml.obj: ..\..\src\xml\xml.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -4617,17 +4989,22 @@ $(OBJS)\monodll_window.obj: ..\..\src\msw\window.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_automtn.obj: ..\..\src\msw\ole\automtn.cpp +$(OBJS)\monodll_helpchm.obj: ..\..\src\msw\helpchm.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp +$(OBJS)\monodll_helpwin.obj: ..\..\src\msw\helpwin.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp +$(OBJS)\monodll_automtn.obj: ..\..\src\msw\ole\automtn.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 @@ -4911,11 +5288,6 @@ $(OBJS)\monodll_bmpbase.obj: ..\..\src\common\bmpbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_buttoncmn.obj: ..\..\src\common\buttoncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -5271,6 +5643,11 @@ $(OBJS)\monodll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -5474,6 +5851,9 @@ $(OBJS)\monolib_process.obj: ..\..\src\common\process.cpp $(OBJS)\monolib_regex.obj: ..\..\src\common\regex.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_sstream.obj: ..\..\src\common\sstream.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_stopwatch.obj: ..\..\src\common\stopwatch.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -5618,6 +5998,9 @@ $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_dragimag.obj: ..\..\src\msw\dragimag.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -5678,12 +6061,6 @@ $(OBJS)\monolib_treectrl.obj: ..\..\src\msw\treectrl.cpp $(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_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -5870,6 +6247,123 @@ $(OBJS)\monolib_dbtable.obj: ..\..\src\common\dbtable.cpp $(OBJS)\monolib_dbgrid.obj: ..\..\src\common\dbgrid.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_html.obj: ..\..\src\xrc\xh_html.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_split.obj: ..\..\src\xrc\xh_split.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_text.obj: ..\..\src\xrc\xh_text.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xmlres.obj: ..\..\src\xrc\xmlres.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_xml.obj: ..\..\src\xml\xml.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -6097,17 +6591,22 @@ $(OBJS)\monolib_window.obj: ..\..\src\msw\window.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_automtn.obj: ..\..\src\msw\ole\automtn.cpp +$(OBJS)\monolib_helpchm.obj: ..\..\src\msw\helpchm.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp +$(OBJS)\monolib_helpwin.obj: ..\..\src\msw\helpwin.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp +$(OBJS)\monolib_automtn.obj: ..\..\src\msw\ole\automtn.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 @@ -6391,11 +6890,6 @@ $(OBJS)\monolib_bmpbase.obj: ..\..\src\common\bmpbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_buttoncmn.obj: ..\..\src\common\buttoncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -6751,6 +7245,11 @@ $(OBJS)\monolib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_dcpsg.obj: ..\..\src\generic\dcpsg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -6954,6 +7453,9 @@ $(OBJS)\basedll_process.obj: ..\..\src\common\process.cpp $(OBJS)\basedll_regex.obj: ..\..\src\common\regex.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** +$(OBJS)\basedll_sstream.obj: ..\..\src\common\sstream.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** + $(OBJS)\basedll_stopwatch.obj: ..\..\src\common\stopwatch.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** @@ -7167,6 +7669,9 @@ $(OBJS)\baselib_process.obj: ..\..\src\common\process.cpp $(OBJS)\baselib_regex.obj: ..\..\src\common\regex.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** +$(OBJS)\baselib_sstream.obj: ..\..\src\common\sstream.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** + $(OBJS)\baselib_stopwatch.obj: ..\..\src\common\stopwatch.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** @@ -7377,6 +7882,9 @@ $(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp $(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** +$(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** + $(OBJS)\coredll_dragimag.obj: ..\..\src\msw\dragimag.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -7437,12 +7945,6 @@ $(OBJS)\coredll_treectrl.obj: ..\..\src\msw\treectrl.cpp $(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_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -7733,17 +8235,22 @@ $(OBJS)\coredll_window.obj: ..\..\src\msw\window.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_automtn.obj: ..\..\src\msw\ole\automtn.cpp +$(OBJS)\coredll_helpchm.obj: ..\..\src\msw\helpchm.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp +$(OBJS)\coredll_helpwin.obj: ..\..\src\msw\helpwin.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp +$(OBJS)\coredll_automtn.obj: ..\..\src\msw\ole\automtn.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 @@ -8027,11 +8534,6 @@ $(OBJS)\coredll_bmpbase.obj: ..\..\src\common\bmpbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_buttoncmn.obj: ..\..\src\common\buttoncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -8387,6 +8889,11 @@ $(OBJS)\coredll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -8509,6 +9016,9 @@ $(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp $(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** +$(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** + $(OBJS)\corelib_dragimag.obj: ..\..\src\msw\dragimag.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -8569,12 +9079,6 @@ $(OBJS)\corelib_treectrl.obj: ..\..\src\msw\treectrl.cpp $(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_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -8865,17 +9369,22 @@ $(OBJS)\corelib_window.obj: ..\..\src\msw\window.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_automtn.obj: ..\..\src\msw\ole\automtn.cpp +$(OBJS)\corelib_helpchm.obj: ..\..\src\msw\helpchm.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp +$(OBJS)\corelib_helpwin.obj: ..\..\src\msw\helpwin.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp +$(OBJS)\corelib_automtn.obj: ..\..\src\msw\ole\automtn.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 @@ -9159,11 +9668,6 @@ $(OBJS)\corelib_bmpbase.obj: ..\..\src\common\bmpbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_buttoncmn.obj: ..\..\src\common\buttoncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -9519,6 +10023,11 @@ $(OBJS)\corelib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_dcpsg.obj: ..\..\src\generic\dcpsg.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -9890,6 +10399,246 @@ $(OBJS)\xmllib_xml.obj: ..\..\src\xml\xml.cpp $(OBJS)\xmllib_xtixml.obj: ..\..\src\common\xtixml.cpp $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) $** +$(OBJS)\xrcdll_dummy.obj: ..\..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\xrcdll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_html.obj: ..\..\src\xrc\xh_html.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_split.obj: ..\..\src\xrc\xh_split.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_text.obj: ..\..\src\xrc\xh_text.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xmlres.obj: ..\..\src\xrc\xmlres.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrcdll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + +$(OBJS)\xrclib_dummy.obj: ..\..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\xrclib_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_html.obj: ..\..\src\xrc\xh_html.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_split.obj: ..\..\src\xrc\xh_split.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_text.obj: ..\..\src\xrc\xh_text.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xmlres.obj: ..\..\src\xrc\xmlres.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + +$(OBJS)\xrclib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + $(OBJS)\gldll_dummy.obj: ..\..\src\msw\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h $**