X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c3255f5fbab93ad229178ec1610a180afa35133a..49742d4ecc295b12cf0f557089b2b64a6b1131a2:/build/msw/makefile.gcc diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index d617b2bacd..9212bee788 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.3 (http://bakefile.sourceforge.net) +# Bakefile 0.1.4 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -17,16 +17,21 @@ 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)" \ MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ - USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" \ + USE_XRC="$(USE_XRC)" USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" \ USE_EXCEPTIONS="$(USE_EXCEPTIONS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \ - VENDOR="$(VENDOR)" CFG="$(CFG)" RUNTIME_LIBS="$(RUNTIME_LIBS)" \ - GCC_VERSION="$(GCC_VERSION)" + VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" \ + WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ + CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ + RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" +WX_RELEASE_NODOT = 25 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) WXREGEX_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ - -I..\..\include -I$(SETUPHDIR) $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS) + -I..\..\include -I$(SETUPHDIR) -D__WXMSW__ $(__UNICODE_DEFINE_p) $(CPPFLAGS) \ + $(CFLAGS) WXREGEX_OBJECTS = \ $(OBJS)\wxregex_regcomp.o \ $(OBJS)\wxregex_regexec.o \ @@ -44,10 +49,8 @@ WXZLIB_OBJECTS = \ $(OBJS)\wxzlib_trees.o \ $(OBJS)\wxzlib_zutil.o \ $(OBJS)\wxzlib_inflate.o \ - $(OBJS)\wxzlib_infblock.o \ + $(OBJS)\wxzlib_infback.o \ $(OBJS)\wxzlib_inftrees.o \ - $(OBJS)\wxzlib_infcodes.o \ - $(OBJS)\wxzlib_infutil.o \ $(OBJS)\wxzlib_inffast.o WXPNG_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -I..\..\src\zlib $(CPPFLAGS) $(CFLAGS) @@ -125,6 +128,7 @@ WXTIFF_OBJECTS = \ $(OBJS)\wxtiff_tif_aux.o \ $(OBJS)\wxtiff_tif_close.o \ $(OBJS)\wxtiff_tif_codec.o \ + $(OBJS)\wxtiff_tif_color.o \ $(OBJS)\wxtiff_tif_compress.o \ $(OBJS)\wxtiff_tif_dir.o \ $(OBJS)\wxtiff_tif_dirinfo.o \ @@ -162,18 +166,20 @@ WXEXPAT_OBJECTS = \ $(OBJS)\wxexpat_xmltok.o MONODLL_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ -DwxUSE_BASE=1 -DWXMAKINGDLL $(CPPFLAGS) $(CFLAGS) MONODLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_BASE=1 -DWXMAKINGDLL $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1_7) \ + -DwxUSE_BASE=1 -DWXMAKINGDLL $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) \ $(CPPFLAGS) $(CXXFLAGS) MONODLL_OBJECTS = \ $(OBJS)\monodll_dummy.o \ $(OBJS)\monodll_appbase.o \ + $(OBJS)\monodll_archive.o \ + $(OBJS)\monodll_clntdata.o \ $(OBJS)\monodll_cmdline.o \ $(OBJS)\monodll_config.o \ $(OBJS)\monodll_datetime.o \ @@ -192,7 +198,6 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_filesys.o \ $(OBJS)\monodll_fmapbase.o \ $(OBJS)\monodll_fs_zip.o \ - $(OBJS)\monodll_gzstream.o \ $(OBJS)\monodll_hash.o \ $(OBJS)\monodll_hashmap.o \ $(OBJS)\monodll_init.o \ @@ -208,6 +213,8 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_object.o \ $(OBJS)\monodll_process.o \ $(OBJS)\monodll_regex.o \ + $(OBJS)\monodll_stdpbase.o \ + $(OBJS)\monodll_sstream.o \ $(OBJS)\monodll_stopwatch.o \ $(OBJS)\monodll_strconv.o \ $(OBJS)\monodll_stream.o \ @@ -217,7 +224,7 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_textfile.o \ $(OBJS)\monodll_tokenzr.o \ $(OBJS)\monodll_txtstrm.o \ - $(OBJS)\monodll_unzip.o \ + $(OBJS)\monodll_uri.o \ $(OBJS)\monodll_variant.o \ $(OBJS)\monodll_wfstream.o \ $(OBJS)\monodll_wxchar.o \ @@ -233,6 +240,7 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_regconf.o \ $(OBJS)\monodll_registry.o \ $(OBJS)\monodll_snglinst.o \ + $(OBJS)\monodll_stdpaths.o \ $(OBJS)\monodll_thread.o \ $(OBJS)\monodll_utils.o \ $(OBJS)\monodll_utilsexc.o \ @@ -260,18 +268,20 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_xtixml.o MONOLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) MONOLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_BASE=1 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1_7) $(CPPFLAGS) \ + -DwxUSE_BASE=1 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) \ $(CXXFLAGS) MONOLIB_OBJECTS = \ $(OBJS)\monolib_dummy.o \ $(OBJS)\monolib_appbase.o \ + $(OBJS)\monolib_archive.o \ + $(OBJS)\monolib_clntdata.o \ $(OBJS)\monolib_cmdline.o \ $(OBJS)\monolib_config.o \ $(OBJS)\monolib_datetime.o \ @@ -290,7 +300,6 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_filesys.o \ $(OBJS)\monolib_fmapbase.o \ $(OBJS)\monolib_fs_zip.o \ - $(OBJS)\monolib_gzstream.o \ $(OBJS)\monolib_hash.o \ $(OBJS)\monolib_hashmap.o \ $(OBJS)\monolib_init.o \ @@ -306,6 +315,8 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_object.o \ $(OBJS)\monolib_process.o \ $(OBJS)\monolib_regex.o \ + $(OBJS)\monolib_stdpbase.o \ + $(OBJS)\monolib_sstream.o \ $(OBJS)\monolib_stopwatch.o \ $(OBJS)\monolib_strconv.o \ $(OBJS)\monolib_stream.o \ @@ -315,7 +326,7 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_textfile.o \ $(OBJS)\monolib_tokenzr.o \ $(OBJS)\monolib_txtstrm.o \ - $(OBJS)\monolib_unzip.o \ + $(OBJS)\monolib_uri.o \ $(OBJS)\monolib_variant.o \ $(OBJS)\monolib_wfstream.o \ $(OBJS)\monolib_wxchar.o \ @@ -331,6 +342,7 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_regconf.o \ $(OBJS)\monolib_registry.o \ $(OBJS)\monolib_snglinst.o \ + $(OBJS)\monolib_stdpaths.o \ $(OBJS)\monolib_thread.o \ $(OBJS)\monolib_utils.o \ $(OBJS)\monolib_utilsexc.o \ @@ -358,18 +370,20 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_xtixml.o BASEDLL_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) BASEDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_1_7) $(CPPFLAGS) $(CXXFLAGS) + $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) BASEDLL_OBJECTS = \ $(OBJS)\basedll_dummy.o \ $(OBJS)\basedll_appbase.o \ + $(OBJS)\basedll_archive.o \ + $(OBJS)\basedll_clntdata.o \ $(OBJS)\basedll_cmdline.o \ $(OBJS)\basedll_config.o \ $(OBJS)\basedll_datetime.o \ @@ -388,7 +402,6 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_filesys.o \ $(OBJS)\basedll_fmapbase.o \ $(OBJS)\basedll_fs_zip.o \ - $(OBJS)\basedll_gzstream.o \ $(OBJS)\basedll_hash.o \ $(OBJS)\basedll_hashmap.o \ $(OBJS)\basedll_init.o \ @@ -404,6 +417,8 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_object.o \ $(OBJS)\basedll_process.o \ $(OBJS)\basedll_regex.o \ + $(OBJS)\basedll_stdpbase.o \ + $(OBJS)\basedll_sstream.o \ $(OBJS)\basedll_stopwatch.o \ $(OBJS)\basedll_strconv.o \ $(OBJS)\basedll_stream.o \ @@ -413,7 +428,7 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_textfile.o \ $(OBJS)\basedll_tokenzr.o \ $(OBJS)\basedll_txtstrm.o \ - $(OBJS)\basedll_unzip.o \ + $(OBJS)\basedll_uri.o \ $(OBJS)\basedll_variant.o \ $(OBJS)\basedll_wfstream.o \ $(OBJS)\basedll_wxchar.o \ @@ -429,6 +444,7 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_regconf.o \ $(OBJS)\basedll_registry.o \ $(OBJS)\basedll_snglinst.o \ + $(OBJS)\basedll_stdpaths.o \ $(OBJS)\basedll_thread.o \ $(OBJS)\basedll_utils.o \ $(OBJS)\basedll_utilsexc.o \ @@ -441,18 +457,20 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_volume.o BASELIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) BASELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1_7) \ + -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) \ $(CPPFLAGS) $(CXXFLAGS) BASELIB_OBJECTS = \ $(OBJS)\baselib_dummy.o \ $(OBJS)\baselib_appbase.o \ + $(OBJS)\baselib_archive.o \ + $(OBJS)\baselib_clntdata.o \ $(OBJS)\baselib_cmdline.o \ $(OBJS)\baselib_config.o \ $(OBJS)\baselib_datetime.o \ @@ -471,7 +489,6 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_filesys.o \ $(OBJS)\baselib_fmapbase.o \ $(OBJS)\baselib_fs_zip.o \ - $(OBJS)\baselib_gzstream.o \ $(OBJS)\baselib_hash.o \ $(OBJS)\baselib_hashmap.o \ $(OBJS)\baselib_init.o \ @@ -487,6 +504,8 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_object.o \ $(OBJS)\baselib_process.o \ $(OBJS)\baselib_regex.o \ + $(OBJS)\baselib_stdpbase.o \ + $(OBJS)\baselib_sstream.o \ $(OBJS)\baselib_stopwatch.o \ $(OBJS)\baselib_strconv.o \ $(OBJS)\baselib_stream.o \ @@ -496,7 +515,7 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_textfile.o \ $(OBJS)\baselib_tokenzr.o \ $(OBJS)\baselib_txtstrm.o \ - $(OBJS)\baselib_unzip.o \ + $(OBJS)\baselib_uri.o \ $(OBJS)\baselib_variant.o \ $(OBJS)\baselib_wfstream.o \ $(OBJS)\baselib_wxchar.o \ @@ -512,6 +531,7 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_regconf.o \ $(OBJS)\baselib_registry.o \ $(OBJS)\baselib_snglinst.o \ + $(OBJS)\baselib_stdpaths.o \ $(OBJS)\baselib_thread.o \ $(OBJS)\baselib_utils.o \ $(OBJS)\baselib_utilsexc.o \ @@ -522,17 +542,12 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_main.o \ $(OBJS)\baselib_mslu.o \ $(OBJS)\baselib_volume.o -NETDLL_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ - -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ - -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(CPPFLAGS) $(CFLAGS) NETDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_1_7) $(CPPFLAGS) $(CXXFLAGS) + $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) NETDLL_OBJECTS = \ $(OBJS)\netdll_dummy.o \ $(OBJS)\netdll_fs_inet.o \ @@ -547,16 +562,11 @@ NETDLL_OBJECTS = \ $(OBJS)\netdll_url.o \ $(OBJS)\netdll_gsocket.o \ $(OBJS)\netdll_urlmsw.o -NETLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ - -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ - -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_GUI=0 $(CPPFLAGS) $(CFLAGS) NETLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_GUI=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1_7) $(CPPFLAGS) \ + -DwxUSE_GUI=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) \ $(CXXFLAGS) NETLIB_OBJECTS = \ $(OBJS)\netlib_dummy.o \ @@ -572,17 +582,12 @@ NETLIB_OBJECTS = \ $(OBJS)\netlib_url.o \ $(OBJS)\netlib_gsocket.o \ $(OBJS)\netlib_urlmsw.o -COREDLL_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ - -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ - -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS) COREDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_1_7) $(CPPFLAGS) $(CXXFLAGS) + $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) COREDLL_OBJECTS = \ $(OBJS)\coredll_dummy.o \ $(OBJS)\coredll_event.o \ @@ -593,16 +598,11 @@ COREDLL_OBJECTS = \ $(OBJS)\coredll_mslu.o \ $(OBJS)\coredll_volume.o \ $(____CORE_SRC_FILENAMES_2_OBJECTS) -CORELIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ - -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ - -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS) CORELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_BASE=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1_7) $(CPPFLAGS) \ + -DwxUSE_BASE=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) \ $(CXXFLAGS) CORELIB_OBJECTS = \ $(OBJS)\corelib_dummy.o \ @@ -616,14 +616,13 @@ CORELIB_OBJECTS = \ $(____CORE_SRC_FILENAMES_3_OBJECTS) ADVDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DWXUSINGDLL -DWXMAKINGDLL_ADV $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1_7) \ + -DWXUSINGDLL -DWXMAKINGDLL_ADV $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) \ $(CPPFLAGS) $(CXXFLAGS) ADVDLL_OBJECTS = \ $(OBJS)\advdll_dummy.o \ $(OBJS)\advdll_calctrl.o \ - $(OBJS)\advdll_dcbuffer.o \ $(OBJS)\advdll_grid.o \ $(OBJS)\advdll_gridctrl.o \ $(OBJS)\advdll_gridsel.o \ @@ -634,18 +633,17 @@ ADVDLL_OBJECTS = \ $(OBJS)\advdll_tipdlg.o \ $(OBJS)\advdll_wizard.o \ $(OBJS)\advdll_taskbarcmn.o \ - $(OBJS)\advdll_joystick.o \ $(OBJS)\advdll_sound.o \ - $(OBJS)\advdll_taskbar.o + $(OBJS)\advdll_taskbar.o \ + $(OBJS)\advdll_joystick.o ADVLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1_7) $(CPPFLAGS) $(CXXFLAGS) + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) ADVLIB_OBJECTS = \ $(OBJS)\advlib_dummy.o \ $(OBJS)\advlib_calctrl.o \ - $(OBJS)\advlib_dcbuffer.o \ $(OBJS)\advlib_grid.o \ $(OBJS)\advlib_gridctrl.o \ $(OBJS)\advlib_gridsel.o \ @@ -656,24 +654,44 @@ ADVLIB_OBJECTS = \ $(OBJS)\advlib_tipdlg.o \ $(OBJS)\advlib_wizard.o \ $(OBJS)\advlib_taskbarcmn.o \ - $(OBJS)\advlib_joystick.o \ $(OBJS)\advlib_sound.o \ - $(OBJS)\advlib_taskbar.o + $(OBJS)\advlib_taskbar.o \ + $(OBJS)\advlib_joystick.o +MEDIADLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W -Wall \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_MEDIA \ + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) +MEDIADLL_OBJECTS = \ + $(OBJS)\mediadll_dummy.o \ + $(OBJS)\mediadll_mediactrlcmn.o \ + $(OBJS)\mediadll_mediactrl.o +MEDIALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W -Wall \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib $(__EXCEPTIONSFLAG) \ + $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) +MEDIALIB_OBJECTS = \ + $(OBJS)\medialib_dummy.o \ + $(OBJS)\medialib_mediactrlcmn.o \ + $(OBJS)\medialib_mediactrl.o ODBCDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_1_7) $(CPPFLAGS) $(CXXFLAGS) + $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) ODBCDLL_OBJECTS = \ $(OBJS)\odbcdll_dummy.o \ $(OBJS)\odbcdll_db.o \ $(OBJS)\odbcdll_dbtable.o ODBCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_GUI=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1_7) $(CPPFLAGS) \ + -DwxUSE_GUI=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) \ $(CXXFLAGS) ODBCLIB_OBJECTS = \ $(OBJS)\odbclib_dummy.o \ @@ -681,27 +699,27 @@ ODBCLIB_OBJECTS = \ $(OBJS)\odbclib_dbtable.o DBGRIDDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_DBGRID $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_1_7) $(CPPFLAGS) $(CXXFLAGS) + $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W -Wall \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_DBGRID \ + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) DBGRIDDLL_OBJECTS = \ $(OBJS)\dbgriddll_dummy.o \ $(OBJS)\dbgriddll_dbgrid.o DBGRIDLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1_7) \ - $(CPPFLAGS) $(CXXFLAGS) + $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W -Wall \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib $(__EXCEPTIONSFLAG) \ + $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) DBGRIDLIB_OBJECTS = \ $(OBJS)\dbgridlib_dummy.o \ $(OBJS)\dbgridlib_dbgrid.o HTMLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DWXUSINGDLL -DWXMAKINGDLL_HTML $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1_7) \ + -DWXUSINGDLL -DWXMAKINGDLL_HTML $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) \ $(CPPFLAGS) $(CXXFLAGS) HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_dummy.o \ @@ -729,9 +747,9 @@ HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_htmllbox.o HTMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1_7) $(CPPFLAGS) $(CXXFLAGS) + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_dummy.o \ $(OBJS)\htmllib_helpbest.o \ @@ -758,38 +776,131 @@ HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_htmllbox.o XMLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_XML $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_1_7) $(CPPFLAGS) $(CXXFLAGS) + $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) XMLDLL_OBJECTS = \ $(OBJS)\xmldll_dummy.o \ $(OBJS)\xmldll_xml.o \ $(OBJS)\xmldll_xtixml.o XMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_GUI=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1_7) $(CPPFLAGS) \ + -DwxUSE_GUI=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) \ $(CXXFLAGS) XMLLIB_OBJECTS = \ $(OBJS)\xmllib_dummy.o \ $(OBJS)\xmllib_xml.o \ $(OBJS)\xmllib_xtixml.o +XRCDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + -DWXUSINGDLL -DWXMAKINGDLL_XRC $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) \ + $(CPPFLAGS) $(CXXFLAGS) +XRCDLL_OBJECTS = \ + $(OBJS)\xrcdll_dummy.o \ + $(OBJS)\xrcdll_xh_bmpbt.o \ + $(OBJS)\xrcdll_xh_bmp.o \ + $(OBJS)\xrcdll_xh_bttn.o \ + $(OBJS)\xrcdll_xh_cald.o \ + $(OBJS)\xrcdll_xh_chckb.o \ + $(OBJS)\xrcdll_xh_chckl.o \ + $(OBJS)\xrcdll_xh_choic.o \ + $(OBJS)\xrcdll_xh_combo.o \ + $(OBJS)\xrcdll_xh_dlg.o \ + $(OBJS)\xrcdll_xh_frame.o \ + $(OBJS)\xrcdll_xh_gauge.o \ + $(OBJS)\xrcdll_xh_gdctl.o \ + $(OBJS)\xrcdll_xh_html.o \ + $(OBJS)\xrcdll_xh_listb.o \ + $(OBJS)\xrcdll_xh_listc.o \ + $(OBJS)\xrcdll_xh_menu.o \ + $(OBJS)\xrcdll_xh_notbk.o \ + $(OBJS)\xrcdll_xh_panel.o \ + $(OBJS)\xrcdll_xh_radbt.o \ + $(OBJS)\xrcdll_xh_radbx.o \ + $(OBJS)\xrcdll_xh_scrol.o \ + $(OBJS)\xrcdll_xh_scwin.o \ + $(OBJS)\xrcdll_xh_sizer.o \ + $(OBJS)\xrcdll_xh_slidr.o \ + $(OBJS)\xrcdll_xh_spin.o \ + $(OBJS)\xrcdll_xh_split.o \ + $(OBJS)\xrcdll_xh_statbar.o \ + $(OBJS)\xrcdll_xh_stbmp.o \ + $(OBJS)\xrcdll_xh_stbox.o \ + $(OBJS)\xrcdll_xh_stlin.o \ + $(OBJS)\xrcdll_xh_sttxt.o \ + $(OBJS)\xrcdll_xh_text.o \ + $(OBJS)\xrcdll_xh_tglbtn.o \ + $(OBJS)\xrcdll_xh_toolb.o \ + $(OBJS)\xrcdll_xh_tree.o \ + $(OBJS)\xrcdll_xh_unkwn.o \ + $(OBJS)\xrcdll_xh_wizrd.o \ + $(OBJS)\xrcdll_xmlres.o \ + $(OBJS)\xrcdll_xmlrsall.o +XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) +XRCLIB_OBJECTS = \ + $(OBJS)\xrclib_dummy.o \ + $(OBJS)\xrclib_xh_bmpbt.o \ + $(OBJS)\xrclib_xh_bmp.o \ + $(OBJS)\xrclib_xh_bttn.o \ + $(OBJS)\xrclib_xh_cald.o \ + $(OBJS)\xrclib_xh_chckb.o \ + $(OBJS)\xrclib_xh_chckl.o \ + $(OBJS)\xrclib_xh_choic.o \ + $(OBJS)\xrclib_xh_combo.o \ + $(OBJS)\xrclib_xh_dlg.o \ + $(OBJS)\xrclib_xh_frame.o \ + $(OBJS)\xrclib_xh_gauge.o \ + $(OBJS)\xrclib_xh_gdctl.o \ + $(OBJS)\xrclib_xh_html.o \ + $(OBJS)\xrclib_xh_listb.o \ + $(OBJS)\xrclib_xh_listc.o \ + $(OBJS)\xrclib_xh_menu.o \ + $(OBJS)\xrclib_xh_notbk.o \ + $(OBJS)\xrclib_xh_panel.o \ + $(OBJS)\xrclib_xh_radbt.o \ + $(OBJS)\xrclib_xh_radbx.o \ + $(OBJS)\xrclib_xh_scrol.o \ + $(OBJS)\xrclib_xh_scwin.o \ + $(OBJS)\xrclib_xh_sizer.o \ + $(OBJS)\xrclib_xh_slidr.o \ + $(OBJS)\xrclib_xh_spin.o \ + $(OBJS)\xrclib_xh_split.o \ + $(OBJS)\xrclib_xh_statbar.o \ + $(OBJS)\xrclib_xh_stbmp.o \ + $(OBJS)\xrclib_xh_stbox.o \ + $(OBJS)\xrclib_xh_stlin.o \ + $(OBJS)\xrclib_xh_sttxt.o \ + $(OBJS)\xrclib_xh_text.o \ + $(OBJS)\xrclib_xh_tglbtn.o \ + $(OBJS)\xrclib_xh_toolb.o \ + $(OBJS)\xrclib_xh_tree.o \ + $(OBJS)\xrclib_xh_unkwn.o \ + $(OBJS)\xrclib_xh_wizrd.o \ + $(OBJS)\xrclib_xmlres.o \ + $(OBJS)\xrclib_xmlrsall.o GLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DWXUSINGDLL -DWXMAKINGDLL_GL $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1_7) \ + -DWXUSINGDLL -DWXMAKINGDLL_GL $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) \ $(CPPFLAGS) $(CXXFLAGS) GLDLL_OBJECTS = \ $(OBJS)\gldll_dummy.o \ $(OBJS)\gldll_glcanvas.o GLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ + -I..\..\include -I$(SETUPHDIR) -W -Wall -I..\..\src\tiff -I..\..\src\jpeg \ -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1_7) $(CPPFLAGS) $(CXXFLAGS) + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) GLLIB_OBJECTS = \ $(OBJS)\gllib_dummy.o \ $(OBJS)\gllib_glcanvas.o @@ -844,17 +955,22 @@ endif ifeq ($(SHARED),1) ____LIBDIRNAME_FILENAMES_6_p = -I..\..\lib\gcc_dll$(CFG) endif +ifeq ($(MONOLITHIC),0) +EXTRALIBS_FOR_BASE = +endif +ifeq ($(MONOLITHIC),1) +EXTRALIBS_FOR_BASE = +endif ifeq ($(MONOLITHIC),1) ifeq ($(SHARED),1) __monodll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll endif endif ifeq ($(USE_GUI),1) ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(____CORE_SRC_FILENAMES_OBJECTS) \ $(OBJS)\monodll_calctrl.o \ - $(OBJS)\monodll_dcbuffer.o \ $(OBJS)\monodll_grid.o \ $(OBJS)\monodll_gridctrl.o \ $(OBJS)\monodll_gridsel.o \ @@ -865,9 +981,11 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_tipdlg.o \ $(OBJS)\monodll_wizard.o \ $(OBJS)\monodll_taskbarcmn.o \ - $(OBJS)\monodll_joystick.o \ $(OBJS)\monodll_sound.o \ $(OBJS)\monodll_taskbar.o \ + $(OBJS)\monodll_joystick.o \ + $(OBJS)\monodll_mediactrlcmn.o \ + $(OBJS)\monodll_mediactrl.o \ $(OBJS)\monodll_helpbest.o \ $(OBJS)\monodll_helpctrl.o \ $(OBJS)\monodll_helpdata.o \ @@ -892,7 +1010,46 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_htmllbox.o \ $(OBJS)\monodll_db.o \ $(OBJS)\monodll_dbtable.o \ - $(OBJS)\monodll_dbgrid.o + $(OBJS)\monodll_dbgrid.o \ + $(OBJS)\monodll_xh_bmpbt.o \ + $(OBJS)\monodll_xh_bmp.o \ + $(OBJS)\monodll_xh_bttn.o \ + $(OBJS)\monodll_xh_cald.o \ + $(OBJS)\monodll_xh_chckb.o \ + $(OBJS)\monodll_xh_chckl.o \ + $(OBJS)\monodll_xh_choic.o \ + $(OBJS)\monodll_xh_combo.o \ + $(OBJS)\monodll_xh_dlg.o \ + $(OBJS)\monodll_xh_frame.o \ + $(OBJS)\monodll_xh_gauge.o \ + $(OBJS)\monodll_xh_gdctl.o \ + $(OBJS)\monodll_xh_html.o \ + $(OBJS)\monodll_xh_listb.o \ + $(OBJS)\monodll_xh_listc.o \ + $(OBJS)\monodll_xh_menu.o \ + $(OBJS)\monodll_xh_notbk.o \ + $(OBJS)\monodll_xh_panel.o \ + $(OBJS)\monodll_xh_radbt.o \ + $(OBJS)\monodll_xh_radbx.o \ + $(OBJS)\monodll_xh_scrol.o \ + $(OBJS)\monodll_xh_scwin.o \ + $(OBJS)\monodll_xh_sizer.o \ + $(OBJS)\monodll_xh_slidr.o \ + $(OBJS)\monodll_xh_spin.o \ + $(OBJS)\monodll_xh_split.o \ + $(OBJS)\monodll_xh_statbar.o \ + $(OBJS)\monodll_xh_stbmp.o \ + $(OBJS)\monodll_xh_stbox.o \ + $(OBJS)\monodll_xh_stlin.o \ + $(OBJS)\monodll_xh_sttxt.o \ + $(OBJS)\monodll_xh_text.o \ + $(OBJS)\monodll_xh_tglbtn.o \ + $(OBJS)\monodll_xh_toolb.o \ + $(OBJS)\monodll_xh_tree.o \ + $(OBJS)\monodll_xh_unkwn.o \ + $(OBJS)\monodll_xh_wizrd.o \ + $(OBJS)\monodll_xmlres.o \ + $(OBJS)\monodll_xmlrsall.o endif ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) @@ -912,7 +1069,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dcscreen.o \ $(OBJS)\monodll_dialup.o \ $(OBJS)\monodll_dib.o \ - $(OBJS)\monodll_dirdlg.o \ $(OBJS)\monodll_display.o \ $(OBJS)\monodll_enhmeta.o \ $(OBJS)\monodll_evtloop.o \ @@ -922,16 +1078,12 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gdiimage.o \ $(OBJS)\monodll_gdiobj.o \ $(OBJS)\monodll_gsockmsw.o \ - $(OBJS)\monodll_helpchm.o \ - $(OBJS)\monodll_helpwin.o \ $(OBJS)\monodll_icon.o \ $(OBJS)\monodll_minifram.o \ - $(OBJS)\monodll_automtn.o \ $(OBJS)\monodll_dataobj.o \ $(OBJS)\monodll_dropsrc.o \ $(OBJS)\monodll_droptgt.o \ $(OBJS)\monodll_oleutils.o \ - $(OBJS)\monodll_uuid.o \ $(OBJS)\monodll_palette.o \ $(OBJS)\monodll_pen.o \ $(OBJS)\monodll_popupwin.o \ @@ -946,6 +1098,10 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_utilsgui.o \ $(OBJS)\monodll_uxtheme.o \ $(OBJS)\monodll_window.o \ + $(OBJS)\monodll_helpchm.o \ + $(OBJS)\monodll_helpwin.o \ + $(OBJS)\monodll_automtn.o \ + $(OBJS)\monodll_uuid.o \ $(OBJS)\monodll_statusbr.o \ $(OBJS)\monodll_prntdlgg.o \ $(OBJS)\monodll_accel.o \ @@ -958,10 +1114,9 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_combobox.o \ $(OBJS)\monodll_control.o \ $(OBJS)\monodll_dialog.o \ + $(OBJS)\monodll_dirdlg.o \ $(OBJS)\monodll_dragimag.o \ - $(OBJS)\monodll_fdrepdlg.o \ $(OBJS)\monodll_filedlg.o \ - $(OBJS)\monodll_fontdlg.o \ $(OBJS)\monodll_frame.o \ $(OBJS)\monodll_gauge95.o \ $(OBJS)\monodll_imaglist.o \ @@ -993,6 +1148,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_textctrl.o \ $(OBJS)\monodll_tglbtn.o \ $(OBJS)\monodll_treectrl.o \ + $(OBJS)\monodll_fdrepdlg.o \ + $(OBJS)\monodll_fontdlg.o \ $(OBJS)\monodll_accesscmn.o \ $(OBJS)\monodll_appcmn.o \ $(OBJS)\monodll_artprov.o \ @@ -1001,7 +1158,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_bookctrl.o \ $(OBJS)\monodll_choiccmn.o \ $(OBJS)\monodll_clipcmn.o \ - $(OBJS)\monodll_clntdata.o \ $(OBJS)\monodll_cmdproc.o \ $(OBJS)\monodll_cmndata.o \ $(OBJS)\monodll_containr.o \ @@ -1057,6 +1213,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_settcmn.o \ $(OBJS)\monodll_sizer.o \ $(OBJS)\monodll_statbar.o \ + $(OBJS)\monodll_stockitem.o \ $(OBJS)\monodll_tbarbase.o \ $(OBJS)\monodll_textcmn.o \ $(OBJS)\monodll_timercmn.o \ @@ -1069,6 +1226,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xpmdecod.o \ $(OBJS)\monodll_busyinfo.o \ $(OBJS)\monodll_choicdgg.o \ + $(OBJS)\monodll_choicbkg.o \ $(OBJS)\monodll_dcpsg.o \ $(OBJS)\monodll_dirctrlg.o \ $(OBJS)\monodll_dragimgg.o \ @@ -1108,7 +1266,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dcscreen.o \ $(OBJS)\monodll_dialup.o \ $(OBJS)\monodll_dib.o \ - $(OBJS)\monodll_dirdlg.o \ $(OBJS)\monodll_display.o \ $(OBJS)\monodll_enhmeta.o \ $(OBJS)\monodll_evtloop.o \ @@ -1118,16 +1275,12 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gdiimage.o \ $(OBJS)\monodll_gdiobj.o \ $(OBJS)\monodll_gsockmsw.o \ - $(OBJS)\monodll_helpchm.o \ - $(OBJS)\monodll_helpwin.o \ $(OBJS)\monodll_icon.o \ $(OBJS)\monodll_minifram.o \ - $(OBJS)\monodll_automtn.o \ $(OBJS)\monodll_dataobj.o \ $(OBJS)\monodll_dropsrc.o \ $(OBJS)\monodll_droptgt.o \ $(OBJS)\monodll_oleutils.o \ - $(OBJS)\monodll_uuid.o \ $(OBJS)\monodll_palette.o \ $(OBJS)\monodll_pen.o \ $(OBJS)\monodll_popupwin.o \ @@ -1142,6 +1295,10 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_utilsgui.o \ $(OBJS)\monodll_uxtheme.o \ $(OBJS)\monodll_window.o \ + $(OBJS)\monodll_helpchm.o \ + $(OBJS)\monodll_helpwin.o \ + $(OBJS)\monodll_automtn.o \ + $(OBJS)\monodll_uuid.o \ $(OBJS)\monodll_accel.o \ $(OBJS)\monodll_colrdlgg.o \ $(OBJS)\monodll_dirdlgg.o \ @@ -1199,7 +1356,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_bookctrl.o \ $(OBJS)\monodll_choiccmn.o \ $(OBJS)\monodll_clipcmn.o \ - $(OBJS)\monodll_clntdata.o \ $(OBJS)\monodll_cmdproc.o \ $(OBJS)\monodll_cmndata.o \ $(OBJS)\monodll_containr.o \ @@ -1255,6 +1411,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_settcmn.o \ $(OBJS)\monodll_sizer.o \ $(OBJS)\monodll_statbar.o \ + $(OBJS)\monodll_stockitem.o \ $(OBJS)\monodll_tbarbase.o \ $(OBJS)\monodll_textcmn.o \ $(OBJS)\monodll_timercmn.o \ @@ -1267,6 +1424,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xpmdecod.o \ $(OBJS)\monodll_busyinfo.o \ $(OBJS)\monodll_choicdgg.o \ + $(OBJS)\monodll_choicbkg.o \ $(OBJS)\monodll_dcpsg.o \ $(OBJS)\monodll_dirctrlg.o \ $(OBJS)\monodll_dragimgg.o \ @@ -1291,14 +1449,13 @@ endif ifeq ($(MONOLITHIC),1) ifeq ($(SHARED),0) __monolib___depname = \ - $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a + $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif ifeq ($(USE_GUI),1) ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(____CORE_SRC_FILENAMES_1_OBJECTS) \ $(OBJS)\monolib_calctrl.o \ - $(OBJS)\monolib_dcbuffer.o \ $(OBJS)\monolib_grid.o \ $(OBJS)\monolib_gridctrl.o \ $(OBJS)\monolib_gridsel.o \ @@ -1309,9 +1466,11 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_tipdlg.o \ $(OBJS)\monolib_wizard.o \ $(OBJS)\monolib_taskbarcmn.o \ - $(OBJS)\monolib_joystick.o \ $(OBJS)\monolib_sound.o \ $(OBJS)\monolib_taskbar.o \ + $(OBJS)\monolib_joystick.o \ + $(OBJS)\monolib_mediactrlcmn.o \ + $(OBJS)\monolib_mediactrl.o \ $(OBJS)\monolib_helpbest.o \ $(OBJS)\monolib_helpctrl.o \ $(OBJS)\monolib_helpdata.o \ @@ -1336,7 +1495,46 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_htmllbox.o \ $(OBJS)\monolib_db.o \ $(OBJS)\monolib_dbtable.o \ - $(OBJS)\monolib_dbgrid.o + $(OBJS)\monolib_dbgrid.o \ + $(OBJS)\monolib_xh_bmpbt.o \ + $(OBJS)\monolib_xh_bmp.o \ + $(OBJS)\monolib_xh_bttn.o \ + $(OBJS)\monolib_xh_cald.o \ + $(OBJS)\monolib_xh_chckb.o \ + $(OBJS)\monolib_xh_chckl.o \ + $(OBJS)\monolib_xh_choic.o \ + $(OBJS)\monolib_xh_combo.o \ + $(OBJS)\monolib_xh_dlg.o \ + $(OBJS)\monolib_xh_frame.o \ + $(OBJS)\monolib_xh_gauge.o \ + $(OBJS)\monolib_xh_gdctl.o \ + $(OBJS)\monolib_xh_html.o \ + $(OBJS)\monolib_xh_listb.o \ + $(OBJS)\monolib_xh_listc.o \ + $(OBJS)\monolib_xh_menu.o \ + $(OBJS)\monolib_xh_notbk.o \ + $(OBJS)\monolib_xh_panel.o \ + $(OBJS)\monolib_xh_radbt.o \ + $(OBJS)\monolib_xh_radbx.o \ + $(OBJS)\monolib_xh_scrol.o \ + $(OBJS)\monolib_xh_scwin.o \ + $(OBJS)\monolib_xh_sizer.o \ + $(OBJS)\monolib_xh_slidr.o \ + $(OBJS)\monolib_xh_spin.o \ + $(OBJS)\monolib_xh_split.o \ + $(OBJS)\monolib_xh_statbar.o \ + $(OBJS)\monolib_xh_stbmp.o \ + $(OBJS)\monolib_xh_stbox.o \ + $(OBJS)\monolib_xh_stlin.o \ + $(OBJS)\monolib_xh_sttxt.o \ + $(OBJS)\monolib_xh_text.o \ + $(OBJS)\monolib_xh_tglbtn.o \ + $(OBJS)\monolib_xh_toolb.o \ + $(OBJS)\monolib_xh_tree.o \ + $(OBJS)\monolib_xh_unkwn.o \ + $(OBJS)\monolib_xh_wizrd.o \ + $(OBJS)\monolib_xmlres.o \ + $(OBJS)\monolib_xmlrsall.o endif ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) @@ -1356,7 +1554,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dcscreen.o \ $(OBJS)\monolib_dialup.o \ $(OBJS)\monolib_dib.o \ - $(OBJS)\monolib_dirdlg.o \ $(OBJS)\monolib_display.o \ $(OBJS)\monolib_enhmeta.o \ $(OBJS)\monolib_evtloop.o \ @@ -1366,16 +1563,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gdiimage.o \ $(OBJS)\monolib_gdiobj.o \ $(OBJS)\monolib_gsockmsw.o \ - $(OBJS)\monolib_helpchm.o \ - $(OBJS)\monolib_helpwin.o \ $(OBJS)\monolib_icon.o \ $(OBJS)\monolib_minifram.o \ - $(OBJS)\monolib_automtn.o \ $(OBJS)\monolib_dataobj.o \ $(OBJS)\monolib_dropsrc.o \ $(OBJS)\monolib_droptgt.o \ $(OBJS)\monolib_oleutils.o \ - $(OBJS)\monolib_uuid.o \ $(OBJS)\monolib_palette.o \ $(OBJS)\monolib_pen.o \ $(OBJS)\monolib_popupwin.o \ @@ -1390,6 +1583,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_utilsgui.o \ $(OBJS)\monolib_uxtheme.o \ $(OBJS)\monolib_window.o \ + $(OBJS)\monolib_helpchm.o \ + $(OBJS)\monolib_helpwin.o \ + $(OBJS)\monolib_automtn.o \ + $(OBJS)\monolib_uuid.o \ $(OBJS)\monolib_statusbr.o \ $(OBJS)\monolib_prntdlgg.o \ $(OBJS)\monolib_accel.o \ @@ -1402,10 +1599,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_combobox.o \ $(OBJS)\monolib_control.o \ $(OBJS)\monolib_dialog.o \ + $(OBJS)\monolib_dirdlg.o \ $(OBJS)\monolib_dragimag.o \ - $(OBJS)\monolib_fdrepdlg.o \ $(OBJS)\monolib_filedlg.o \ - $(OBJS)\monolib_fontdlg.o \ $(OBJS)\monolib_frame.o \ $(OBJS)\monolib_gauge95.o \ $(OBJS)\monolib_imaglist.o \ @@ -1437,6 +1633,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_textctrl.o \ $(OBJS)\monolib_tglbtn.o \ $(OBJS)\monolib_treectrl.o \ + $(OBJS)\monolib_fdrepdlg.o \ + $(OBJS)\monolib_fontdlg.o \ $(OBJS)\monolib_accesscmn.o \ $(OBJS)\monolib_appcmn.o \ $(OBJS)\monolib_artprov.o \ @@ -1445,7 +1643,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_bookctrl.o \ $(OBJS)\monolib_choiccmn.o \ $(OBJS)\monolib_clipcmn.o \ - $(OBJS)\monolib_clntdata.o \ $(OBJS)\monolib_cmdproc.o \ $(OBJS)\monolib_cmndata.o \ $(OBJS)\monolib_containr.o \ @@ -1501,6 +1698,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_settcmn.o \ $(OBJS)\monolib_sizer.o \ $(OBJS)\monolib_statbar.o \ + $(OBJS)\monolib_stockitem.o \ $(OBJS)\monolib_tbarbase.o \ $(OBJS)\monolib_textcmn.o \ $(OBJS)\monolib_timercmn.o \ @@ -1513,6 +1711,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xpmdecod.o \ $(OBJS)\monolib_busyinfo.o \ $(OBJS)\monolib_choicdgg.o \ + $(OBJS)\monolib_choicbkg.o \ $(OBJS)\monolib_dcpsg.o \ $(OBJS)\monolib_dirctrlg.o \ $(OBJS)\monolib_dragimgg.o \ @@ -1552,7 +1751,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dcscreen.o \ $(OBJS)\monolib_dialup.o \ $(OBJS)\monolib_dib.o \ - $(OBJS)\monolib_dirdlg.o \ $(OBJS)\monolib_display.o \ $(OBJS)\monolib_enhmeta.o \ $(OBJS)\monolib_evtloop.o \ @@ -1562,16 +1760,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gdiimage.o \ $(OBJS)\monolib_gdiobj.o \ $(OBJS)\monolib_gsockmsw.o \ - $(OBJS)\monolib_helpchm.o \ - $(OBJS)\monolib_helpwin.o \ $(OBJS)\monolib_icon.o \ $(OBJS)\monolib_minifram.o \ - $(OBJS)\monolib_automtn.o \ $(OBJS)\monolib_dataobj.o \ $(OBJS)\monolib_dropsrc.o \ $(OBJS)\monolib_droptgt.o \ $(OBJS)\monolib_oleutils.o \ - $(OBJS)\monolib_uuid.o \ $(OBJS)\monolib_palette.o \ $(OBJS)\monolib_pen.o \ $(OBJS)\monolib_popupwin.o \ @@ -1586,6 +1780,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_utilsgui.o \ $(OBJS)\monolib_uxtheme.o \ $(OBJS)\monolib_window.o \ + $(OBJS)\monolib_helpchm.o \ + $(OBJS)\monolib_helpwin.o \ + $(OBJS)\monolib_automtn.o \ + $(OBJS)\monolib_uuid.o \ $(OBJS)\monolib_accel.o \ $(OBJS)\monolib_colrdlgg.o \ $(OBJS)\monolib_dirdlgg.o \ @@ -1643,7 +1841,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_bookctrl.o \ $(OBJS)\monolib_choiccmn.o \ $(OBJS)\monolib_clipcmn.o \ - $(OBJS)\monolib_clntdata.o \ $(OBJS)\monolib_cmdproc.o \ $(OBJS)\monolib_cmndata.o \ $(OBJS)\monolib_containr.o \ @@ -1699,6 +1896,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_settcmn.o \ $(OBJS)\monolib_sizer.o \ $(OBJS)\monolib_statbar.o \ + $(OBJS)\monolib_stockitem.o \ $(OBJS)\monolib_tbarbase.o \ $(OBJS)\monolib_textcmn.o \ $(OBJS)\monolib_timercmn.o \ @@ -1711,6 +1909,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xpmdecod.o \ $(OBJS)\monolib_busyinfo.o \ $(OBJS)\monolib_choicdgg.o \ + $(OBJS)\monolib_choicbkg.o \ $(OBJS)\monolib_dcpsg.o \ $(OBJS)\monolib_dirctrlg.o \ $(OBJS)\monolib_dragimgg.o \ @@ -1735,32 +1934,32 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) __basedll___depname = \ - $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll endif endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) __baselib___depname = \ - $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a + $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) __netdll___depname = \ - $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_gcc$(VENDORTAG).dll endif endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) __netlib___depname = \ - $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.a + $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a endif endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) __coredll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_gcc$(VENDORTAG).dll endif endif endif @@ -1782,7 +1981,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dcscreen.o \ $(OBJS)\coredll_dialup.o \ $(OBJS)\coredll_dib.o \ - $(OBJS)\coredll_dirdlg.o \ $(OBJS)\coredll_display.o \ $(OBJS)\coredll_enhmeta.o \ $(OBJS)\coredll_evtloop.o \ @@ -1792,16 +1990,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_gdiimage.o \ $(OBJS)\coredll_gdiobj.o \ $(OBJS)\coredll_gsockmsw.o \ - $(OBJS)\coredll_helpchm.o \ - $(OBJS)\coredll_helpwin.o \ $(OBJS)\coredll_icon.o \ $(OBJS)\coredll_minifram.o \ - $(OBJS)\coredll_automtn.o \ $(OBJS)\coredll_dataobj.o \ $(OBJS)\coredll_dropsrc.o \ $(OBJS)\coredll_droptgt.o \ $(OBJS)\coredll_oleutils.o \ - $(OBJS)\coredll_uuid.o \ $(OBJS)\coredll_palette.o \ $(OBJS)\coredll_pen.o \ $(OBJS)\coredll_popupwin.o \ @@ -1816,6 +2010,10 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_utilsgui.o \ $(OBJS)\coredll_uxtheme.o \ $(OBJS)\coredll_window.o \ + $(OBJS)\coredll_helpchm.o \ + $(OBJS)\coredll_helpwin.o \ + $(OBJS)\coredll_automtn.o \ + $(OBJS)\coredll_uuid.o \ $(OBJS)\coredll_statusbr.o \ $(OBJS)\coredll_prntdlgg.o \ $(OBJS)\coredll_accel.o \ @@ -1828,10 +2026,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_combobox.o \ $(OBJS)\coredll_control.o \ $(OBJS)\coredll_dialog.o \ + $(OBJS)\coredll_dirdlg.o \ $(OBJS)\coredll_dragimag.o \ - $(OBJS)\coredll_fdrepdlg.o \ $(OBJS)\coredll_filedlg.o \ - $(OBJS)\coredll_fontdlg.o \ $(OBJS)\coredll_frame.o \ $(OBJS)\coredll_gauge95.o \ $(OBJS)\coredll_imaglist.o \ @@ -1863,6 +2060,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_textctrl.o \ $(OBJS)\coredll_tglbtn.o \ $(OBJS)\coredll_treectrl.o \ + $(OBJS)\coredll_fdrepdlg.o \ + $(OBJS)\coredll_fontdlg.o \ $(OBJS)\coredll_accesscmn.o \ $(OBJS)\coredll_appcmn.o \ $(OBJS)\coredll_artprov.o \ @@ -1871,7 +2070,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_bookctrl.o \ $(OBJS)\coredll_choiccmn.o \ $(OBJS)\coredll_clipcmn.o \ - $(OBJS)\coredll_clntdata.o \ $(OBJS)\coredll_cmdproc.o \ $(OBJS)\coredll_cmndata.o \ $(OBJS)\coredll_containr.o \ @@ -1927,6 +2125,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_settcmn.o \ $(OBJS)\coredll_sizer.o \ $(OBJS)\coredll_statbar.o \ + $(OBJS)\coredll_stockitem.o \ $(OBJS)\coredll_tbarbase.o \ $(OBJS)\coredll_textcmn.o \ $(OBJS)\coredll_timercmn.o \ @@ -1939,6 +2138,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_xpmdecod.o \ $(OBJS)\coredll_busyinfo.o \ $(OBJS)\coredll_choicdgg.o \ + $(OBJS)\coredll_choicbkg.o \ $(OBJS)\coredll_dcpsg.o \ $(OBJS)\coredll_dirctrlg.o \ $(OBJS)\coredll_dragimgg.o \ @@ -1978,7 +2178,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dcscreen.o \ $(OBJS)\coredll_dialup.o \ $(OBJS)\coredll_dib.o \ - $(OBJS)\coredll_dirdlg.o \ $(OBJS)\coredll_display.o \ $(OBJS)\coredll_enhmeta.o \ $(OBJS)\coredll_evtloop.o \ @@ -1988,16 +2187,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_gdiimage.o \ $(OBJS)\coredll_gdiobj.o \ $(OBJS)\coredll_gsockmsw.o \ - $(OBJS)\coredll_helpchm.o \ - $(OBJS)\coredll_helpwin.o \ $(OBJS)\coredll_icon.o \ $(OBJS)\coredll_minifram.o \ - $(OBJS)\coredll_automtn.o \ $(OBJS)\coredll_dataobj.o \ $(OBJS)\coredll_dropsrc.o \ $(OBJS)\coredll_droptgt.o \ $(OBJS)\coredll_oleutils.o \ - $(OBJS)\coredll_uuid.o \ $(OBJS)\coredll_palette.o \ $(OBJS)\coredll_pen.o \ $(OBJS)\coredll_popupwin.o \ @@ -2012,6 +2207,10 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_utilsgui.o \ $(OBJS)\coredll_uxtheme.o \ $(OBJS)\coredll_window.o \ + $(OBJS)\coredll_helpchm.o \ + $(OBJS)\coredll_helpwin.o \ + $(OBJS)\coredll_automtn.o \ + $(OBJS)\coredll_uuid.o \ $(OBJS)\coredll_accel.o \ $(OBJS)\coredll_colrdlgg.o \ $(OBJS)\coredll_dirdlgg.o \ @@ -2069,7 +2268,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_bookctrl.o \ $(OBJS)\coredll_choiccmn.o \ $(OBJS)\coredll_clipcmn.o \ - $(OBJS)\coredll_clntdata.o \ $(OBJS)\coredll_cmdproc.o \ $(OBJS)\coredll_cmndata.o \ $(OBJS)\coredll_containr.o \ @@ -2125,6 +2323,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_settcmn.o \ $(OBJS)\coredll_sizer.o \ $(OBJS)\coredll_statbar.o \ + $(OBJS)\coredll_stockitem.o \ $(OBJS)\coredll_tbarbase.o \ $(OBJS)\coredll_textcmn.o \ $(OBJS)\coredll_timercmn.o \ @@ -2137,6 +2336,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_xpmdecod.o \ $(OBJS)\coredll_busyinfo.o \ $(OBJS)\coredll_choicdgg.o \ + $(OBJS)\coredll_choicbkg.o \ $(OBJS)\coredll_dcpsg.o \ $(OBJS)\coredll_dirctrlg.o \ $(OBJS)\coredll_dragimgg.o \ @@ -2162,7 +2362,7 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) ifeq ($(USE_GUI),1) __corelib___depname = \ - $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a + $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a endif endif endif @@ -2184,7 +2384,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dcscreen.o \ $(OBJS)\corelib_dialup.o \ $(OBJS)\corelib_dib.o \ - $(OBJS)\corelib_dirdlg.o \ $(OBJS)\corelib_display.o \ $(OBJS)\corelib_enhmeta.o \ $(OBJS)\corelib_evtloop.o \ @@ -2194,16 +2393,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_gdiimage.o \ $(OBJS)\corelib_gdiobj.o \ $(OBJS)\corelib_gsockmsw.o \ - $(OBJS)\corelib_helpchm.o \ - $(OBJS)\corelib_helpwin.o \ $(OBJS)\corelib_icon.o \ $(OBJS)\corelib_minifram.o \ - $(OBJS)\corelib_automtn.o \ $(OBJS)\corelib_dataobj.o \ $(OBJS)\corelib_dropsrc.o \ $(OBJS)\corelib_droptgt.o \ $(OBJS)\corelib_oleutils.o \ - $(OBJS)\corelib_uuid.o \ $(OBJS)\corelib_palette.o \ $(OBJS)\corelib_pen.o \ $(OBJS)\corelib_popupwin.o \ @@ -2218,6 +2413,10 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_utilsgui.o \ $(OBJS)\corelib_uxtheme.o \ $(OBJS)\corelib_window.o \ + $(OBJS)\corelib_helpchm.o \ + $(OBJS)\corelib_helpwin.o \ + $(OBJS)\corelib_automtn.o \ + $(OBJS)\corelib_uuid.o \ $(OBJS)\corelib_statusbr.o \ $(OBJS)\corelib_prntdlgg.o \ $(OBJS)\corelib_accel.o \ @@ -2230,10 +2429,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_combobox.o \ $(OBJS)\corelib_control.o \ $(OBJS)\corelib_dialog.o \ + $(OBJS)\corelib_dirdlg.o \ $(OBJS)\corelib_dragimag.o \ - $(OBJS)\corelib_fdrepdlg.o \ $(OBJS)\corelib_filedlg.o \ - $(OBJS)\corelib_fontdlg.o \ $(OBJS)\corelib_frame.o \ $(OBJS)\corelib_gauge95.o \ $(OBJS)\corelib_imaglist.o \ @@ -2265,6 +2463,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_textctrl.o \ $(OBJS)\corelib_tglbtn.o \ $(OBJS)\corelib_treectrl.o \ + $(OBJS)\corelib_fdrepdlg.o \ + $(OBJS)\corelib_fontdlg.o \ $(OBJS)\corelib_accesscmn.o \ $(OBJS)\corelib_appcmn.o \ $(OBJS)\corelib_artprov.o \ @@ -2273,7 +2473,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_bookctrl.o \ $(OBJS)\corelib_choiccmn.o \ $(OBJS)\corelib_clipcmn.o \ - $(OBJS)\corelib_clntdata.o \ $(OBJS)\corelib_cmdproc.o \ $(OBJS)\corelib_cmndata.o \ $(OBJS)\corelib_containr.o \ @@ -2329,6 +2528,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_settcmn.o \ $(OBJS)\corelib_sizer.o \ $(OBJS)\corelib_statbar.o \ + $(OBJS)\corelib_stockitem.o \ $(OBJS)\corelib_tbarbase.o \ $(OBJS)\corelib_textcmn.o \ $(OBJS)\corelib_timercmn.o \ @@ -2341,6 +2541,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_xpmdecod.o \ $(OBJS)\corelib_busyinfo.o \ $(OBJS)\corelib_choicdgg.o \ + $(OBJS)\corelib_choicbkg.o \ $(OBJS)\corelib_dcpsg.o \ $(OBJS)\corelib_dirctrlg.o \ $(OBJS)\corelib_dragimgg.o \ @@ -2380,7 +2581,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dcscreen.o \ $(OBJS)\corelib_dialup.o \ $(OBJS)\corelib_dib.o \ - $(OBJS)\corelib_dirdlg.o \ $(OBJS)\corelib_display.o \ $(OBJS)\corelib_enhmeta.o \ $(OBJS)\corelib_evtloop.o \ @@ -2390,16 +2590,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_gdiimage.o \ $(OBJS)\corelib_gdiobj.o \ $(OBJS)\corelib_gsockmsw.o \ - $(OBJS)\corelib_helpchm.o \ - $(OBJS)\corelib_helpwin.o \ $(OBJS)\corelib_icon.o \ $(OBJS)\corelib_minifram.o \ - $(OBJS)\corelib_automtn.o \ $(OBJS)\corelib_dataobj.o \ $(OBJS)\corelib_dropsrc.o \ $(OBJS)\corelib_droptgt.o \ $(OBJS)\corelib_oleutils.o \ - $(OBJS)\corelib_uuid.o \ $(OBJS)\corelib_palette.o \ $(OBJS)\corelib_pen.o \ $(OBJS)\corelib_popupwin.o \ @@ -2414,6 +2610,10 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_utilsgui.o \ $(OBJS)\corelib_uxtheme.o \ $(OBJS)\corelib_window.o \ + $(OBJS)\corelib_helpchm.o \ + $(OBJS)\corelib_helpwin.o \ + $(OBJS)\corelib_automtn.o \ + $(OBJS)\corelib_uuid.o \ $(OBJS)\corelib_accel.o \ $(OBJS)\corelib_colrdlgg.o \ $(OBJS)\corelib_dirdlgg.o \ @@ -2471,7 +2671,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_bookctrl.o \ $(OBJS)\corelib_choiccmn.o \ $(OBJS)\corelib_clipcmn.o \ - $(OBJS)\corelib_clntdata.o \ $(OBJS)\corelib_cmdproc.o \ $(OBJS)\corelib_cmndata.o \ $(OBJS)\corelib_containr.o \ @@ -2527,6 +2726,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_settcmn.o \ $(OBJS)\corelib_sizer.o \ $(OBJS)\corelib_statbar.o \ + $(OBJS)\corelib_stockitem.o \ $(OBJS)\corelib_tbarbase.o \ $(OBJS)\corelib_textcmn.o \ $(OBJS)\corelib_timercmn.o \ @@ -2539,6 +2739,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_xpmdecod.o \ $(OBJS)\corelib_busyinfo.o \ $(OBJS)\corelib_choicdgg.o \ + $(OBJS)\corelib_choicbkg.o \ $(OBJS)\corelib_dcpsg.o \ $(OBJS)\corelib_dirctrlg.o \ $(OBJS)\corelib_dragimgg.o \ @@ -2564,7 +2765,7 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) __advdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_gcc$(VENDORTAG).dll endif endif endif @@ -2572,7 +2773,23 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) ifeq ($(USE_GUI),1) __advlib___depname = \ - $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a + $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a +endif +endif +endif +ifeq ($(MONOLITHIC),0) +ifeq ($(SHARED),1) +ifeq ($(USE_GUI),1) +__mediadll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG).dll +endif +endif +endif +ifeq ($(MONOLITHIC),0) +ifeq ($(SHARED),0) +ifeq ($(USE_GUI),1) +__medialib___depname = \ + $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a endif endif endif @@ -2580,7 +2797,7 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_ODBC),1) __odbcdll___depname = \ - $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_gcc$(VENDORTAG).dll endif endif endif @@ -2588,7 +2805,7 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) ifeq ($(USE_ODBC),1) __odbclib___depname = \ - $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a + $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a endif endif endif @@ -2597,7 +2814,7 @@ ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_ODBC),1) __dbgriddll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_gcc$(VENDORTAG).dll endif endif endif @@ -2607,63 +2824,84 @@ ifeq ($(SHARED),0) ifeq ($(USE_GUI),1) ifeq ($(USE_ODBC),1) __dbgridlib___depname = \ - $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.a + $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.a endif endif endif endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) +ifeq ($(USE_GUI),1) ifeq ($(USE_HTML),1) __htmldll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_gcc$(VENDORTAG).dll +endif endif endif endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) +ifeq ($(USE_GUI),1) ifeq ($(USE_HTML),1) __htmllib___depname = \ - $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a + $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a +endif endif endif endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) __xmldll___depname = \ - $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_gcc$(VENDORTAG).dll endif endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) __xmllib___depname = \ - $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.a + $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a +endif +endif +ifeq ($(MONOLITHIC),0) +ifeq ($(SHARED),1) +ifeq ($(USE_XRC),1) +__xrcdll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_gcc$(VENDORTAG).dll +endif +endif +endif +ifeq ($(MONOLITHIC),0) +ifeq ($(SHARED),0) +ifeq ($(USE_XRC),1) +__xrclib___depname = \ + $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a +endif endif endif ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_OPENGL),1) __gldll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_gcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG).dll endif endif endif ifeq ($(MONOLITHIC),0) __WXLIBGLDEP_CORE_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core + -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core endif ifeq ($(MONOLITHIC),0) -__WXLIBGLDEP_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +__WXLIBGLDEP_BASE_p = \ + -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) __WXLIB_MONO_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) + -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(SHARED),0) ifeq ($(USE_GUI),1) ifeq ($(USE_OPENGL),1) __gllib___depname = \ - $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a + $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a endif endif endif @@ -2708,10 +2946,10 @@ ifeq ($(USE_EXCEPTIONS),1) __EXCEPTIONSFLAG = endif ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONSFLAG_1_7 = -fno-exceptions +__EXCEPTIONSFLAG_14 = -fno-exceptions endif ifeq ($(USE_EXCEPTIONS),1) -__EXCEPTIONSFLAG_1_7 = +__EXCEPTIONSFLAG_14 = endif ifeq ($(WXUNIV),1) __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -2747,50 +2985,57 @@ $(OBJS): ### Targets: ### -all: setup_h $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(__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)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o - -if exist $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a del $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a + -if exist $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a del $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a -if exist $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a del $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a -if exist $(LIBDIRNAME)\libwxpng$(WXDEBUGFLAG).a del $(LIBDIRNAME)\libwxpng$(WXDEBUGFLAG).a -if exist $(LIBDIRNAME)\libwxjpeg$(WXDEBUGFLAG).a del $(LIBDIRNAME)\libwxjpeg$(WXDEBUGFLAG).a -if exist $(LIBDIRNAME)\libwxtiff$(WXDEBUGFLAG).a del $(LIBDIRNAME)\libwxtiff$(WXDEBUGFLAG).a -if exist $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a del $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gcc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gcc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a del $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a - -if exist $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a del $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_gcc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.a del $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.a - -if exist $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.a del $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_gcc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_gcc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_gcc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a del $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a - -if exist $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a del $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_gcc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.a - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_gcc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a - -if exist $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_gcc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.a del $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.a - -if exist $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.a del $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_gcc$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a del $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a + -if exist $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a del $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a del $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a + -if exist $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a del $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a del $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a + -if exist $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a del $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.a + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.a + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a + -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a del $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a + -if exist $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a del $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a + $(MAKE) -C ..\..\samples -f makefile.gcc $(MAKEARGS) clean setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h -$(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a: $(WXREGEX_OBJECTS) +$(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a: $(WXREGEX_OBJECTS) if exist $@ del $@ ar rcu $@ $(WXREGEX_OBJECTS) ranlib $@ @@ -2828,14 +3073,14 @@ $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a: $(WXEXPAT_OBJECTS) ifeq ($(MONOLITHIC),1) ifeq ($(SHARED),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gcc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a - $(CXX) -shared -o $@ $(MONODLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a + $(CXX) -shared -fPIC -o $@ $(MONODLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif ifeq ($(MONOLITHIC),1) ifeq ($(SHARED),0) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a: $(MONOLIB_OBJECTS) +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a: $(MONOLIB_OBJECTS) if exist $@ del $@ ar rcu $@ $(MONOLIB_OBJECTS) ranlib $@ @@ -2844,14 +3089,14 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) -$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gcc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a - $(CXX) -shared -o $@ $(BASEDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 +$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a + $(CXX) -shared -fPIC -o $@ $(BASEDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) -$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a: $(BASELIB_OBJECTS) +$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a: $(BASELIB_OBJECTS) if exist $@ del $@ ar rcu $@ $(BASELIB_OBJECTS) ranlib $@ @@ -2860,14 +3105,14 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) -$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_gcc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__basedll___depname) - $(CXX) -shared -o $@ $(NETDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a +$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_gcc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(NETDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) -$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.a: $(NETLIB_OBJECTS) +$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a: $(NETLIB_OBJECTS) if exist $@ del $@ ar rcu $@ $(NETLIB_OBJECTS) ranlib $@ @@ -2877,8 +3122,8 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_gcc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__basedll___depname) - $(CXX) -shared -o $@ $(COREDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_gcc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(COREDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -2886,7 +3131,7 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) ifeq ($(USE_GUI),1) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a: $(CORELIB_OBJECTS) +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a: $(CORELIB_OBJECTS) if exist $@ del $@ ar rcu $@ $(CORELIB_OBJECTS) ranlib $@ @@ -2897,8 +3142,8 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_gcc$(VENDORTAG).dll: $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname) - $(CXX) -shared -o $@ $(ADVDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_gcc$(VENDORTAG).dll: $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(ADVDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -2906,7 +3151,7 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) ifeq ($(USE_GUI),1) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a: $(ADVLIB_OBJECTS) +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a: $(ADVLIB_OBJECTS) if exist $@ del $@ ar rcu $@ $(ADVLIB_OBJECTS) ranlib $@ @@ -2914,11 +3159,31 @@ endif endif endif +ifeq ($(MONOLITHIC),0) +ifeq ($(SHARED),1) +ifeq ($(USE_GUI),1) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG).dll: $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(MEDIADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a +endif +endif +endif + +ifeq ($(MONOLITHIC),0) +ifeq ($(SHARED),0) +ifeq ($(USE_GUI),1) +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a: $(MEDIALIB_OBJECTS) + if exist $@ del $@ + ar rcu $@ $(MEDIALIB_OBJECTS) + ranlib $@ +endif +endif +endif + ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_ODBC),1) -$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_gcc$(VENDORTAG).dll: $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__basedll___depname) - $(CXX) -shared -o $@ $(ODBCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a +$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_gcc$(VENDORTAG).dll: $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(ODBCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -2926,7 +3191,7 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) ifeq ($(USE_ODBC),1) -$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a: $(ODBCLIB_OBJECTS) +$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a: $(ODBCLIB_OBJECTS) if exist $@ del $@ ar rcu $@ $(ODBCLIB_OBJECTS) ranlib $@ @@ -2938,8 +3203,8 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_ODBC),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_gcc$(VENDORTAG).dll: $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname) - $(CXX) -shared -o $@ $(DBGRIDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_gcc$(VENDORTAG).dll: $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(DBGRIDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -2949,7 +3214,7 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) ifeq ($(USE_GUI),1) ifeq ($(USE_ODBC),1) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.a: $(DBGRIDLIB_OBJECTS) +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.a: $(DBGRIDLIB_OBJECTS) if exist $@ del $@ ar rcu $@ $(DBGRIDLIB_OBJECTS) ranlib $@ @@ -2960,45 +3225,69 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) +ifeq ($(USE_GUI),1) ifeq ($(USE_HTML),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_gcc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname) - $(CXX) -shared -o $@ $(HTMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_gcc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(HTMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a +endif endif endif endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) +ifeq ($(USE_GUI),1) ifeq ($(USE_HTML),1) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a: $(HTMLLIB_OBJECTS) +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a: $(HTMLLIB_OBJECTS) if exist $@ del $@ ar rcu $@ $(HTMLLIB_OBJECTS) ranlib $@ endif endif endif +endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) -$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_gcc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__basedll___depname) - $(CXX) -shared -o $@ $(XMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a +$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_gcc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(XMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) -$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.a: $(XMLLIB_OBJECTS) +$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a: $(XMLLIB_OBJECTS) if exist $@ del $@ ar rcu $@ $(XMLLIB_OBJECTS) ranlib $@ endif endif +ifeq ($(MONOLITHIC),0) +ifeq ($(SHARED),1) +ifeq ($(USE_XRC),1) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_gcc$(VENDORTAG).dll: $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__htmldll___depname) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(XRCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a +endif +endif +endif + +ifeq ($(MONOLITHIC),0) +ifeq ($(SHARED),0) +ifeq ($(USE_XRC),1) +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a: $(XRCLIB_OBJECTS) + if exist $@ del $@ + ar rcu $@ $(XRCLIB_OBJECTS) + ranlib $@ +endif +endif +endif + ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_OPENGL),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_gcc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__basedll___depname) $(__coredll___depname) - $(CXX) -shared -o $@ $(GLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) -lopengl32 -lglu32 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) $(__coredll___depname) + $(CXX) -shared -fPIC -o $@ $(GLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) -lopengl32 -lglu32 endif endif endif @@ -3006,7 +3295,7 @@ endif ifeq ($(SHARED),0) ifeq ($(USE_GUI),1) ifeq ($(USE_OPENGL),1) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a: $(GLLIB_OBJECTS) +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a: $(GLLIB_OBJECTS) if exist $@ del $@ ar rcu $@ $(GLLIB_OBJECTS) ranlib $@ @@ -3035,7 +3324,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=1 >>$(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) @@ -3100,18 +3389,12 @@ $(OBJS)\wxzlib_zutil.o: ../../src/zlib/zutil.c $(OBJS)\wxzlib_inflate.o: ../../src/zlib/inflate.c $(CC) -c -o $@ $(WXZLIB_CFLAGS) $< -$(OBJS)\wxzlib_infblock.o: ../../src/zlib/infblock.c +$(OBJS)\wxzlib_infback.o: ../../src/zlib/infback.c $(CC) -c -o $@ $(WXZLIB_CFLAGS) $< $(OBJS)\wxzlib_inftrees.o: ../../src/zlib/inftrees.c $(CC) -c -o $@ $(WXZLIB_CFLAGS) $< -$(OBJS)\wxzlib_infcodes.o: ../../src/zlib/infcodes.c - $(CC) -c -o $@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_infutil.o: ../../src/zlib/infutil.c - $(CC) -c -o $@ $(WXZLIB_CFLAGS) $< - $(OBJS)\wxzlib_inffast.o: ../../src/zlib/inffast.c $(CC) -c -o $@ $(WXZLIB_CFLAGS) $< @@ -3316,6 +3599,9 @@ $(OBJS)\wxtiff_tif_close.o: ../../src/tiff/tif_close.c $(OBJS)\wxtiff_tif_codec.o: ../../src/tiff/tif_codec.c $(CC) -c -o $@ $(WXTIFF_CFLAGS) $< +$(OBJS)\wxtiff_tif_color.o: ../../src/tiff/tif_color.c + $(CC) -c -o $@ $(WXTIFF_CFLAGS) $< + $(OBJS)\wxtiff_tif_compress.o: ../../src/tiff/tif_compress.c $(CC) -c -o $@ $(WXTIFF_CFLAGS) $< @@ -3418,6 +3704,12 @@ $(OBJS)\monodll_dummy.o: ../../src/msw/dummy.cpp $(OBJS)\monodll_appbase.o: ../../src/common/appbase.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_archive.o: ../../src/common/archive.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_clntdata.o: ../../src/common/clntdata.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_cmdline.o: ../../src/common/cmdline.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -3472,9 +3764,6 @@ $(OBJS)\monodll_fmapbase.o: ../../src/common/fmapbase.cpp $(OBJS)\monodll_fs_zip.o: ../../src/common/fs_zip.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_gzstream.o: ../../src/common/gzstream.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_hash.o: ../../src/common/hash.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -3520,6 +3809,12 @@ $(OBJS)\monodll_process.o: ../../src/common/process.cpp $(OBJS)\monodll_regex.o: ../../src/common/regex.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_stdpbase.o: ../../src/common/stdpbase.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_sstream.o: ../../src/common/sstream.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_stopwatch.o: ../../src/common/stopwatch.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -3547,8 +3842,8 @@ $(OBJS)\monodll_tokenzr.o: ../../src/common/tokenzr.cpp $(OBJS)\monodll_txtstrm.o: ../../src/common/txtstrm.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_unzip.o: ../../src/common/unzip.c - $(CC) -c -o $@ $(MONODLL_CFLAGS) $< +$(OBJS)\monodll_uri.o: ../../src/common/uri.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_variant.o: ../../src/common/variant.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -3595,6 +3890,9 @@ $(OBJS)\monodll_registry.o: ../../src/msw/registry.cpp $(OBJS)\monodll_snglinst.o: ../../src/msw/snglinst.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_stdpaths.o: ../../src/msw/stdpaths.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_thread.o: ../../src/msw/thread.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -3655,8 +3953,8 @@ $(OBJS)\monodll_socket.o: ../../src/common/socket.cpp $(OBJS)\monodll_url.o: ../../src/common/url.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_gsocket.o: ../../src/msw/gsocket.c - $(CC) -c -o $@ $(MONODLL_CFLAGS) $< +$(OBJS)\monodll_gsocket.o: ../../src/msw/gsocket.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_urlmsw.o: ../../src/msw/urlmsw.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -3664,13 +3962,13 @@ $(OBJS)\monodll_urlmsw.o: ../../src/msw/urlmsw.cpp $(OBJS)\monodll_colordlg.o: ../../src/msw/colordlg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_dragimag.o: ../../src/msw/dragimag.cpp +$(OBJS)\monodll_dirdlg.o: ../../src/msw/dirdlg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_filedlg.o: ../../src/msw/filedlg.cpp +$(OBJS)\monodll_dragimag.o: ../../src/msw/dragimag.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_fontdlg.o: ../../src/msw/fontdlg.cpp +$(OBJS)\monodll_filedlg.o: ../../src/msw/filedlg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_frame.o: ../../src/msw/frame.cpp @@ -3724,6 +4022,9 @@ $(OBJS)\monodll_tglbtn.o: ../../src/msw/tglbtn.cpp $(OBJS)\monodll_treectrl.o: ../../src/msw/treectrl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_fontdlg.o: ../../src/msw/fontdlg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_colrdlgg.o: ../../src/generic/colrdlgg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -3796,9 +4097,6 @@ $(OBJS)\monodll_win32.o: ../../src/univ/themes/win32.cpp $(OBJS)\monodll_calctrl.o: ../../src/generic/calctrl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_dcbuffer.o: ../../src/generic/dcbuffer.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_grid.o: ../../src/generic/grid.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -3829,13 +4127,19 @@ $(OBJS)\monodll_wizard.o: ../../src/generic/wizard.cpp $(OBJS)\monodll_taskbarcmn.o: ../../src/common/taskbarcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_sound.o: ../../src/msw/sound.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_taskbar.o: ../../src/msw/taskbar.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_joystick.o: ../../src/msw/joystick.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_sound.o: ../../src/msw/sound.cpp +$(OBJS)\monodll_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_taskbar.o: ../../src/msw/taskbar.cpp +$(OBJS)\monodll_mediactrl.o: ../../src/msw/mediactrl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_helpbest.o: ../../src/msw/helpbest.cpp @@ -3913,184 +4217,276 @@ $(OBJS)\monodll_dbtable.o: ../../src/common/dbtable.cpp $(OBJS)\monodll_dbgrid.o: ../../src/common/dbgrid.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_xml.o: ../../src/xml/xml.cpp +$(OBJS)\monodll_xh_bmpbt.o: ../../src/xrc/xh_bmpbt.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_xtixml.o: ../../src/common/xtixml.cpp +$(OBJS)\monodll_xh_bmp.o: ../../src/xrc/xh_bmp.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_app.o: ../../src/msw/app.cpp +$(OBJS)\monodll_xh_bttn.o: ../../src/xrc/xh_bttn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_bitmap.o: ../../src/msw/bitmap.cpp +$(OBJS)\monodll_xh_cald.o: ../../src/xrc/xh_cald.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_brush.o: ../../src/msw/brush.cpp +$(OBJS)\monodll_xh_chckb.o: ../../src/xrc/xh_chckb.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_caret.o: ../../src/msw/caret.cpp +$(OBJS)\monodll_xh_chckl.o: ../../src/xrc/xh_chckl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_clipbrd.o: ../../src/msw/clipbrd.cpp +$(OBJS)\monodll_xh_choic.o: ../../src/xrc/xh_choic.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_colour.o: ../../src/msw/colour.cpp +$(OBJS)\monodll_xh_combo.o: ../../src/xrc/xh_combo.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_cursor.o: ../../src/msw/cursor.cpp +$(OBJS)\monodll_xh_dlg.o: ../../src/xrc/xh_dlg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_data.o: ../../src/msw/data.cpp +$(OBJS)\monodll_xh_frame.o: ../../src/xrc/xh_frame.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dc.o: ../../src/msw/dc.cpp +$(OBJS)\monodll_xh_gauge.o: ../../src/xrc/xh_gauge.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dcclient.o: ../../src/msw/dcclient.cpp +$(OBJS)\monodll_xh_gdctl.o: ../../src/xrc/xh_gdctl.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_html.o: ../../src/xrc/xh_html.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_listb.o: ../../src/xrc/xh_listb.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_listc.o: ../../src/xrc/xh_listc.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_menu.o: ../../src/xrc/xh_menu.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_notbk.o: ../../src/xrc/xh_notbk.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_panel.o: ../../src/xrc/xh_panel.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_radbt.o: ../../src/xrc/xh_radbt.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_radbx.o: ../../src/xrc/xh_radbx.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_scrol.o: ../../src/xrc/xh_scrol.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_scwin.o: ../../src/xrc/xh_scwin.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_sizer.o: ../../src/xrc/xh_sizer.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_slidr.o: ../../src/xrc/xh_slidr.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_spin.o: ../../src/xrc/xh_spin.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_split.o: ../../src/xrc/xh_split.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_statbar.o: ../../src/xrc/xh_statbar.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_stbmp.o: ../../src/xrc/xh_stbmp.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_stbox.o: ../../src/xrc/xh_stbox.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_stlin.o: ../../src/xrc/xh_stlin.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_sttxt.o: ../../src/xrc/xh_sttxt.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_text.o: ../../src/xrc/xh_text.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_toolb.o: ../../src/xrc/xh_toolb.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_tree.o: ../../src/xrc/xh_tree.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_unkwn.o: ../../src/xrc/xh_unkwn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_wizrd.o: ../../src/xrc/xh_wizrd.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xmlres.o: ../../src/xrc/xmlres.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xmlrsall.o: ../../src/xrc/xmlrsall.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xml.o: ../../src/xml/xml.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xtixml.o: ../../src/common/xtixml.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dcmemory.o: ../../src/msw/dcmemory.cpp +$(OBJS)\monodll_app.o: ../../src/msw/app.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dcprint.o: ../../src/msw/dcprint.cpp +$(OBJS)\monodll_bitmap.o: ../../src/msw/bitmap.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dcscreen.o: ../../src/msw/dcscreen.cpp +$(OBJS)\monodll_brush.o: ../../src/msw/brush.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dialup.o: ../../src/msw/dialup.cpp +$(OBJS)\monodll_caret.o: ../../src/msw/caret.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dib.o: ../../src/msw/dib.cpp +$(OBJS)\monodll_clipbrd.o: ../../src/msw/clipbrd.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dirdlg.o: ../../src/msw/dirdlg.cpp +$(OBJS)\monodll_colour.o: ../../src/msw/colour.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_display.o: ../../src/msw/display.cpp +$(OBJS)\monodll_cursor.o: ../../src/msw/cursor.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_enhmeta.o: ../../src/msw/enhmeta.cpp +$(OBJS)\monodll_data.o: ../../src/msw/data.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_evtloop.o: ../../src/msw/evtloop.cpp +$(OBJS)\monodll_dc.o: ../../src/msw/dc.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_font.o: ../../src/msw/font.cpp +$(OBJS)\monodll_dcclient.o: ../../src/msw/dcclient.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_fontenum.o: ../../src/msw/fontenum.cpp +$(OBJS)\monodll_dcmemory.o: ../../src/msw/dcmemory.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_fontutil.o: ../../src/msw/fontutil.cpp +$(OBJS)\monodll_dcprint.o: ../../src/msw/dcprint.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_gdiimage.o: ../../src/msw/gdiimage.cpp +$(OBJS)\monodll_dcscreen.o: ../../src/msw/dcscreen.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_gdiobj.o: ../../src/msw/gdiobj.cpp +$(OBJS)\monodll_dialup.o: ../../src/msw/dialup.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_gsockmsw.o: ../../src/msw/gsockmsw.c - $(CC) -c -o $@ $(MONODLL_CFLAGS) $< +$(OBJS)\monodll_dib.o: ../../src/msw/dib.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_helpchm.o: ../../src/msw/helpchm.cpp +$(OBJS)\monodll_display.o: ../../src/msw/display.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_helpwin.o: ../../src/msw/helpwin.cpp +$(OBJS)\monodll_enhmeta.o: ../../src/msw/enhmeta.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_icon.o: ../../src/msw/icon.cpp +$(OBJS)\monodll_evtloop.o: ../../src/msw/evtloop.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_minifram.o: ../../src/msw/minifram.cpp +$(OBJS)\monodll_font.o: ../../src/msw/font.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_automtn.o: ../../src/msw/ole/automtn.cpp +$(OBJS)\monodll_fontenum.o: ../../src/msw/fontenum.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dataobj.o: ../../src/msw/ole/dataobj.cpp +$(OBJS)\monodll_fontutil.o: ../../src/msw/fontutil.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dropsrc.o: ../../src/msw/ole/dropsrc.cpp +$(OBJS)\monodll_gdiimage.o: ../../src/msw/gdiimage.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_droptgt.o: ../../src/msw/ole/droptgt.cpp +$(OBJS)\monodll_gdiobj.o: ../../src/msw/gdiobj.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_oleutils.o: ../../src/msw/ole/oleutils.cpp +$(OBJS)\monodll_gsockmsw.o: ../../src/msw/gsockmsw.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_uuid.o: ../../src/msw/ole/uuid.cpp +$(OBJS)\monodll_icon.o: ../../src/msw/icon.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_minifram.o: ../../src/msw/minifram.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_dataobj.o: ../../src/msw/ole/dataobj.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_dropsrc.o: ../../src/msw/ole/dropsrc.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_droptgt.o: ../../src/msw/ole/droptgt.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_oleutils.o: ../../src/msw/ole/oleutils.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif @@ -4164,6 +4560,26 @@ $(OBJS)\monodll_window.o: ../../src/msw/window.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_helpchm.o: ../../src/msw/helpchm.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_helpwin.o: ../../src/msw/helpwin.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_automtn.o: ../../src/msw/ole/automtn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_uuid.o: ../../src/msw/ole/uuid.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\monodll_statusbr.o: ../../src/generic/statusbr.cpp @@ -4309,20 +4725,6 @@ $(OBJS)\monodll_dialog.o: ../../src/univ/dialog.cpp endif endif -ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),0) -$(OBJS)\monodll_fdrepdlg.o: ../../src/msw/fdrepdlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif -endif - -ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),1) -$(OBJS)\monodll_fdrepdlg.o: ../../src/generic/fdrepdlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif -endif - ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\monodll_imaglist.o: ../../src/msw/imaglist.cpp @@ -4519,6 +4921,20 @@ $(OBJS)\monodll_textctrl.o: ../../src/univ/textctrl.cpp endif endif +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),0) +$(OBJS)\monodll_fdrepdlg.o: ../../src/msw/fdrepdlg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif +endif + +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),1) +$(OBJS)\monodll_fdrepdlg.o: ../../src/generic/fdrepdlg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_accesscmn.o: ../../src/common/accesscmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -4559,11 +4975,6 @@ $(OBJS)\monodll_clipcmn.o: ../../src/common/clipcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_clntdata.o: ../../src/common/clntdata.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monodll_cmdproc.o: ../../src/common/cmdproc.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -4839,6 +5250,11 @@ $(OBJS)\monodll_statbar.o: ../../src/common/statbar.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_stockitem.o: ../../src/common/stockitem.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_tbarbase.o: ../../src/common/tbarbase.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -4899,6 +5315,11 @@ $(OBJS)\monodll_choicdgg.o: ../../src/generic/choicdgg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_choicbkg.o: ../../src/generic/choicbkg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_dcpsg.o: ../../src/generic/dcpsg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -5000,6 +5421,12 @@ $(OBJS)\monolib_dummy.o: ../../src/msw/dummy.cpp $(OBJS)\monolib_appbase.o: ../../src/common/appbase.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_archive.o: ../../src/common/archive.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_clntdata.o: ../../src/common/clntdata.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_cmdline.o: ../../src/common/cmdline.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -5054,9 +5481,6 @@ $(OBJS)\monolib_fmapbase.o: ../../src/common/fmapbase.cpp $(OBJS)\monolib_fs_zip.o: ../../src/common/fs_zip.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_gzstream.o: ../../src/common/gzstream.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_hash.o: ../../src/common/hash.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -5102,6 +5526,12 @@ $(OBJS)\monolib_process.o: ../../src/common/process.cpp $(OBJS)\monolib_regex.o: ../../src/common/regex.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_stdpbase.o: ../../src/common/stdpbase.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_sstream.o: ../../src/common/sstream.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_stopwatch.o: ../../src/common/stopwatch.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -5129,8 +5559,8 @@ $(OBJS)\monolib_tokenzr.o: ../../src/common/tokenzr.cpp $(OBJS)\monolib_txtstrm.o: ../../src/common/txtstrm.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_unzip.o: ../../src/common/unzip.c - $(CC) -c -o $@ $(MONOLIB_CFLAGS) $< +$(OBJS)\monolib_uri.o: ../../src/common/uri.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_variant.o: ../../src/common/variant.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -5177,6 +5607,9 @@ $(OBJS)\monolib_registry.o: ../../src/msw/registry.cpp $(OBJS)\monolib_snglinst.o: ../../src/msw/snglinst.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_stdpaths.o: ../../src/msw/stdpaths.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_thread.o: ../../src/msw/thread.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -5237,8 +5670,8 @@ $(OBJS)\monolib_socket.o: ../../src/common/socket.cpp $(OBJS)\monolib_url.o: ../../src/common/url.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_gsocket.o: ../../src/msw/gsocket.c - $(CC) -c -o $@ $(MONOLIB_CFLAGS) $< +$(OBJS)\monolib_gsocket.o: ../../src/msw/gsocket.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_urlmsw.o: ../../src/msw/urlmsw.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -5246,13 +5679,13 @@ $(OBJS)\monolib_urlmsw.o: ../../src/msw/urlmsw.cpp $(OBJS)\monolib_colordlg.o: ../../src/msw/colordlg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_dragimag.o: ../../src/msw/dragimag.cpp +$(OBJS)\monolib_dirdlg.o: ../../src/msw/dirdlg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_filedlg.o: ../../src/msw/filedlg.cpp +$(OBJS)\monolib_dragimag.o: ../../src/msw/dragimag.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_fontdlg.o: ../../src/msw/fontdlg.cpp +$(OBJS)\monolib_filedlg.o: ../../src/msw/filedlg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_frame.o: ../../src/msw/frame.cpp @@ -5306,6 +5739,9 @@ $(OBJS)\monolib_tglbtn.o: ../../src/msw/tglbtn.cpp $(OBJS)\monolib_treectrl.o: ../../src/msw/treectrl.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_fontdlg.o: ../../src/msw/fontdlg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_colrdlgg.o: ../../src/generic/colrdlgg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -5378,9 +5814,6 @@ $(OBJS)\monolib_win32.o: ../../src/univ/themes/win32.cpp $(OBJS)\monolib_calctrl.o: ../../src/generic/calctrl.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_dcbuffer.o: ../../src/generic/dcbuffer.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_grid.o: ../../src/generic/grid.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -5411,13 +5844,19 @@ $(OBJS)\monolib_wizard.o: ../../src/generic/wizard.cpp $(OBJS)\monolib_taskbarcmn.o: ../../src/common/taskbarcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_sound.o: ../../src/msw/sound.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_taskbar.o: ../../src/msw/taskbar.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_joystick.o: ../../src/msw/joystick.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_sound.o: ../../src/msw/sound.cpp +$(OBJS)\monolib_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_taskbar.o: ../../src/msw/taskbar.cpp +$(OBJS)\monolib_mediactrl.o: ../../src/msw/mediactrl.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_helpbest.o: ../../src/msw/helpbest.cpp @@ -5495,6 +5934,123 @@ $(OBJS)\monolib_dbtable.o: ../../src/common/dbtable.cpp $(OBJS)\monolib_dbgrid.o: ../../src/common/dbgrid.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_xh_bmpbt.o: ../../src/xrc/xh_bmpbt.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_bmp.o: ../../src/xrc/xh_bmp.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_bttn.o: ../../src/xrc/xh_bttn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_cald.o: ../../src/xrc/xh_cald.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_chckb.o: ../../src/xrc/xh_chckb.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_chckl.o: ../../src/xrc/xh_chckl.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_choic.o: ../../src/xrc/xh_choic.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_combo.o: ../../src/xrc/xh_combo.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_dlg.o: ../../src/xrc/xh_dlg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_frame.o: ../../src/xrc/xh_frame.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_gauge.o: ../../src/xrc/xh_gauge.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_gdctl.o: ../../src/xrc/xh_gdctl.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_html.o: ../../src/xrc/xh_html.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_listb.o: ../../src/xrc/xh_listb.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_listc.o: ../../src/xrc/xh_listc.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_menu.o: ../../src/xrc/xh_menu.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_notbk.o: ../../src/xrc/xh_notbk.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_panel.o: ../../src/xrc/xh_panel.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_radbt.o: ../../src/xrc/xh_radbt.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_radbx.o: ../../src/xrc/xh_radbx.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_scrol.o: ../../src/xrc/xh_scrol.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_scwin.o: ../../src/xrc/xh_scwin.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_sizer.o: ../../src/xrc/xh_sizer.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_slidr.o: ../../src/xrc/xh_slidr.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_spin.o: ../../src/xrc/xh_spin.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_split.o: ../../src/xrc/xh_split.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_statbar.o: ../../src/xrc/xh_statbar.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_stbmp.o: ../../src/xrc/xh_stbmp.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_stbox.o: ../../src/xrc/xh_stbox.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_stlin.o: ../../src/xrc/xh_stlin.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_sttxt.o: ../../src/xrc/xh_sttxt.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_text.o: ../../src/xrc/xh_text.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_toolb.o: ../../src/xrc/xh_toolb.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_tree.o: ../../src/xrc/xh_tree.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_unkwn.o: ../../src/xrc/xh_unkwn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_wizrd.o: ../../src/xrc/xh_wizrd.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xmlres.o: ../../src/xrc/xmlres.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xmlrsall.o: ../../src/xrc/xmlrsall.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_xml.o: ../../src/xml/xml.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -5576,11 +6132,6 @@ $(OBJS)\monolib_dib.o: ../../src/msw/dib.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_dirdlg.o: ../../src/msw/dirdlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monolib_display.o: ../../src/msw/display.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -5622,17 +6173,7 @@ $(OBJS)\monolib_gdiobj.o: ../../src/msw/gdiobj.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\monolib_gsockmsw.o: ../../src/msw/gsockmsw.c - $(CC) -c -o $@ $(MONOLIB_CFLAGS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_helpchm.o: ../../src/msw/helpchm.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_helpwin.o: ../../src/msw/helpwin.cpp +$(OBJS)\monolib_gsockmsw.o: ../../src/msw/gsockmsw.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< endif @@ -5646,11 +6187,6 @@ $(OBJS)\monolib_minifram.o: ../../src/msw/minifram.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_automtn.o: ../../src/msw/ole/automtn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monolib_dataobj.o: ../../src/msw/ole/dataobj.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -5671,11 +6207,6 @@ $(OBJS)\monolib_oleutils.o: ../../src/msw/ole/oleutils.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_uuid.o: ../../src/msw/ole/uuid.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monolib_palette.o: ../../src/msw/palette.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -5746,6 +6277,26 @@ $(OBJS)\monolib_window.o: ../../src/msw/window.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_helpchm.o: ../../src/msw/helpchm.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_helpwin.o: ../../src/msw/helpwin.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_automtn.o: ../../src/msw/ole/automtn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_uuid.o: ../../src/msw/ole/uuid.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\monolib_statusbr.o: ../../src/generic/statusbr.cpp @@ -5891,20 +6442,6 @@ $(OBJS)\monolib_dialog.o: ../../src/univ/dialog.cpp endif endif -ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),0) -$(OBJS)\monolib_fdrepdlg.o: ../../src/msw/fdrepdlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -endif -endif - -ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),1) -$(OBJS)\monolib_fdrepdlg.o: ../../src/generic/fdrepdlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -endif -endif - ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\monolib_imaglist.o: ../../src/msw/imaglist.cpp @@ -6101,6 +6638,20 @@ $(OBJS)\monolib_textctrl.o: ../../src/univ/textctrl.cpp endif endif +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),0) +$(OBJS)\monolib_fdrepdlg.o: ../../src/msw/fdrepdlg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif +endif + +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),1) +$(OBJS)\monolib_fdrepdlg.o: ../../src/generic/fdrepdlg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_accesscmn.o: ../../src/common/accesscmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -6141,11 +6692,6 @@ $(OBJS)\monolib_clipcmn.o: ../../src/common/clipcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_clntdata.o: ../../src/common/clntdata.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monolib_cmdproc.o: ../../src/common/cmdproc.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -6421,6 +6967,11 @@ $(OBJS)\monolib_statbar.o: ../../src/common/statbar.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_stockitem.o: ../../src/common/stockitem.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_tbarbase.o: ../../src/common/tbarbase.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -6481,6 +7032,11 @@ $(OBJS)\monolib_choicdgg.o: ../../src/generic/choicdgg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_choicbkg.o: ../../src/generic/choicbkg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_dcpsg.o: ../../src/generic/dcpsg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -6582,6 +7138,12 @@ $(OBJS)\basedll_dummy.o: ../../src/msw/dummy.cpp $(OBJS)\basedll_appbase.o: ../../src/common/appbase.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_archive.o: ../../src/common/archive.cpp + $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< + +$(OBJS)\basedll_clntdata.o: ../../src/common/clntdata.cpp + $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_cmdline.o: ../../src/common/cmdline.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -6636,9 +7198,6 @@ $(OBJS)\basedll_fmapbase.o: ../../src/common/fmapbase.cpp $(OBJS)\basedll_fs_zip.o: ../../src/common/fs_zip.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< -$(OBJS)\basedll_gzstream.o: ../../src/common/gzstream.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< - $(OBJS)\basedll_hash.o: ../../src/common/hash.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -6684,6 +7243,12 @@ $(OBJS)\basedll_process.o: ../../src/common/process.cpp $(OBJS)\basedll_regex.o: ../../src/common/regex.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_stdpbase.o: ../../src/common/stdpbase.cpp + $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< + +$(OBJS)\basedll_sstream.o: ../../src/common/sstream.cpp + $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_stopwatch.o: ../../src/common/stopwatch.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -6711,8 +7276,8 @@ $(OBJS)\basedll_tokenzr.o: ../../src/common/tokenzr.cpp $(OBJS)\basedll_txtstrm.o: ../../src/common/txtstrm.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< -$(OBJS)\basedll_unzip.o: ../../src/common/unzip.c - $(CC) -c -o $@ $(BASEDLL_CFLAGS) $< +$(OBJS)\basedll_uri.o: ../../src/common/uri.cpp + $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< $(OBJS)\basedll_variant.o: ../../src/common/variant.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -6759,6 +7324,9 @@ $(OBJS)\basedll_registry.o: ../../src/msw/registry.cpp $(OBJS)\basedll_snglinst.o: ../../src/msw/snglinst.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_stdpaths.o: ../../src/msw/stdpaths.cpp + $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_thread.o: ../../src/msw/thread.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -6795,6 +7363,12 @@ $(OBJS)\baselib_dummy.o: ../../src/msw/dummy.cpp $(OBJS)\baselib_appbase.o: ../../src/common/appbase.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_archive.o: ../../src/common/archive.cpp + $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< + +$(OBJS)\baselib_clntdata.o: ../../src/common/clntdata.cpp + $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_cmdline.o: ../../src/common/cmdline.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6849,9 +7423,6 @@ $(OBJS)\baselib_fmapbase.o: ../../src/common/fmapbase.cpp $(OBJS)\baselib_fs_zip.o: ../../src/common/fs_zip.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< -$(OBJS)\baselib_gzstream.o: ../../src/common/gzstream.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< - $(OBJS)\baselib_hash.o: ../../src/common/hash.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6897,6 +7468,12 @@ $(OBJS)\baselib_process.o: ../../src/common/process.cpp $(OBJS)\baselib_regex.o: ../../src/common/regex.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_stdpbase.o: ../../src/common/stdpbase.cpp + $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< + +$(OBJS)\baselib_sstream.o: ../../src/common/sstream.cpp + $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_stopwatch.o: ../../src/common/stopwatch.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6924,8 +7501,8 @@ $(OBJS)\baselib_tokenzr.o: ../../src/common/tokenzr.cpp $(OBJS)\baselib_txtstrm.o: ../../src/common/txtstrm.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< -$(OBJS)\baselib_unzip.o: ../../src/common/unzip.c - $(CC) -c -o $@ $(BASELIB_CFLAGS) $< +$(OBJS)\baselib_uri.o: ../../src/common/uri.cpp + $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< $(OBJS)\baselib_variant.o: ../../src/common/variant.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6972,6 +7549,9 @@ $(OBJS)\baselib_registry.o: ../../src/msw/registry.cpp $(OBJS)\baselib_snglinst.o: ../../src/msw/snglinst.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_stdpaths.o: ../../src/msw/stdpaths.cpp + $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_thread.o: ../../src/msw/thread.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -7035,8 +7615,8 @@ $(OBJS)\netdll_socket.o: ../../src/common/socket.cpp $(OBJS)\netdll_url.o: ../../src/common/url.cpp $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $< -$(OBJS)\netdll_gsocket.o: ../../src/msw/gsocket.c - $(CC) -c -o $@ $(NETDLL_CFLAGS) $< +$(OBJS)\netdll_gsocket.o: ../../src/msw/gsocket.cpp + $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $< $(OBJS)\netdll_urlmsw.o: ../../src/msw/urlmsw.cpp $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $< @@ -7074,8 +7654,8 @@ $(OBJS)\netlib_socket.o: ../../src/common/socket.cpp $(OBJS)\netlib_url.o: ../../src/common/url.cpp $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $< -$(OBJS)\netlib_gsocket.o: ../../src/msw/gsocket.c - $(CC) -c -o $@ $(NETLIB_CFLAGS) $< +$(OBJS)\netlib_gsocket.o: ../../src/msw/gsocket.cpp + $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $< $(OBJS)\netlib_urlmsw.o: ../../src/msw/urlmsw.cpp $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $< @@ -7107,13 +7687,13 @@ $(OBJS)\coredll_volume.o: ../../src/msw/volume.cpp $(OBJS)\coredll_colordlg.o: ../../src/msw/colordlg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_dragimag.o: ../../src/msw/dragimag.cpp +$(OBJS)\coredll_dirdlg.o: ../../src/msw/dirdlg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_filedlg.o: ../../src/msw/filedlg.cpp +$(OBJS)\coredll_dragimag.o: ../../src/msw/dragimag.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_fontdlg.o: ../../src/msw/fontdlg.cpp +$(OBJS)\coredll_filedlg.o: ../../src/msw/filedlg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< $(OBJS)\coredll_frame.o: ../../src/msw/frame.cpp @@ -7167,6 +7747,9 @@ $(OBJS)\coredll_tglbtn.o: ../../src/msw/tglbtn.cpp $(OBJS)\coredll_treectrl.o: ../../src/msw/treectrl.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_fontdlg.o: ../../src/msw/fontdlg.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_colrdlgg.o: ../../src/generic/colrdlgg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7311,11 +7894,6 @@ $(OBJS)\coredll_dib.o: ../../src/msw/dib.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_dirdlg.o: ../../src/msw/dirdlg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\coredll_display.o: ../../src/msw/display.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7357,17 +7935,7 @@ $(OBJS)\coredll_gdiobj.o: ../../src/msw/gdiobj.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\coredll_gsockmsw.o: ../../src/msw/gsockmsw.c - $(CC) -c -o $@ $(COREDLL_CFLAGS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_helpchm.o: ../../src/msw/helpchm.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_helpwin.o: ../../src/msw/helpwin.cpp +$(OBJS)\coredll_gsockmsw.o: ../../src/msw/gsockmsw.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif @@ -7381,11 +7949,6 @@ $(OBJS)\coredll_minifram.o: ../../src/msw/minifram.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_automtn.o: ../../src/msw/ole/automtn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\coredll_dataobj.o: ../../src/msw/ole/dataobj.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7406,11 +7969,6 @@ $(OBJS)\coredll_oleutils.o: ../../src/msw/ole/oleutils.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_uuid.o: ../../src/msw/ole/uuid.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\coredll_palette.o: ../../src/msw/palette.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7481,6 +8039,26 @@ $(OBJS)\coredll_window.o: ../../src/msw/window.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_helpchm.o: ../../src/msw/helpchm.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_helpwin.o: ../../src/msw/helpwin.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_automtn.o: ../../src/msw/ole/automtn.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_uuid.o: ../../src/msw/ole/uuid.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< +endif + ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\coredll_statusbr.o: ../../src/generic/statusbr.cpp @@ -7626,20 +8204,6 @@ $(OBJS)\coredll_dialog.o: ../../src/univ/dialog.cpp endif endif -ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),0) -$(OBJS)\coredll_fdrepdlg.o: ../../src/msw/fdrepdlg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -endif -endif - -ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),1) -$(OBJS)\coredll_fdrepdlg.o: ../../src/generic/fdrepdlg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -endif -endif - ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\coredll_imaglist.o: ../../src/msw/imaglist.cpp @@ -7836,6 +8400,20 @@ $(OBJS)\coredll_textctrl.o: ../../src/univ/textctrl.cpp endif endif +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),0) +$(OBJS)\coredll_fdrepdlg.o: ../../src/msw/fdrepdlg.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< +endif +endif + +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),1) +$(OBJS)\coredll_fdrepdlg.o: ../../src/generic/fdrepdlg.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< +endif +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_accesscmn.o: ../../src/common/accesscmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7876,11 +8454,6 @@ $(OBJS)\coredll_clipcmn.o: ../../src/common/clipcmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_clntdata.o: ../../src/common/clntdata.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\coredll_cmdproc.o: ../../src/common/cmdproc.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8156,6 +8729,11 @@ $(OBJS)\coredll_statbar.o: ../../src/common/statbar.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_stockitem.o: ../../src/common/stockitem.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_tbarbase.o: ../../src/common/tbarbase.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8216,6 +8794,11 @@ $(OBJS)\coredll_choicdgg.o: ../../src/generic/choicdgg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_choicbkg.o: ../../src/generic/choicbkg.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_dcpsg.o: ../../src/generic/dcpsg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8338,13 +8921,13 @@ $(OBJS)\corelib_volume.o: ../../src/msw/volume.cpp $(OBJS)\corelib_colordlg.o: ../../src/msw/colordlg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_dragimag.o: ../../src/msw/dragimag.cpp +$(OBJS)\corelib_dirdlg.o: ../../src/msw/dirdlg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_filedlg.o: ../../src/msw/filedlg.cpp +$(OBJS)\corelib_dragimag.o: ../../src/msw/dragimag.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_fontdlg.o: ../../src/msw/fontdlg.cpp +$(OBJS)\corelib_filedlg.o: ../../src/msw/filedlg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< $(OBJS)\corelib_frame.o: ../../src/msw/frame.cpp @@ -8398,6 +8981,9 @@ $(OBJS)\corelib_tglbtn.o: ../../src/msw/tglbtn.cpp $(OBJS)\corelib_treectrl.o: ../../src/msw/treectrl.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_fontdlg.o: ../../src/msw/fontdlg.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_colrdlgg.o: ../../src/generic/colrdlgg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -8542,11 +9128,6 @@ $(OBJS)\corelib_dib.o: ../../src/msw/dib.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_dirdlg.o: ../../src/msw/dirdlg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\corelib_display.o: ../../src/msw/display.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -8588,17 +9169,7 @@ $(OBJS)\corelib_gdiobj.o: ../../src/msw/gdiobj.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\corelib_gsockmsw.o: ../../src/msw/gsockmsw.c - $(CC) -c -o $@ $(CORELIB_CFLAGS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_helpchm.o: ../../src/msw/helpchm.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_helpwin.o: ../../src/msw/helpwin.cpp +$(OBJS)\corelib_gsockmsw.o: ../../src/msw/gsockmsw.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< endif @@ -8612,11 +9183,6 @@ $(OBJS)\corelib_minifram.o: ../../src/msw/minifram.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_automtn.o: ../../src/msw/ole/automtn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\corelib_dataobj.o: ../../src/msw/ole/dataobj.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -8637,11 +9203,6 @@ $(OBJS)\corelib_oleutils.o: ../../src/msw/ole/oleutils.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_uuid.o: ../../src/msw/ole/uuid.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\corelib_palette.o: ../../src/msw/palette.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -8712,6 +9273,26 @@ $(OBJS)\corelib_window.o: ../../src/msw/window.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_helpchm.o: ../../src/msw/helpchm.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_helpwin.o: ../../src/msw/helpwin.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_automtn.o: ../../src/msw/ole/automtn.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_uuid.o: ../../src/msw/ole/uuid.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< +endif + ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\corelib_statusbr.o: ../../src/generic/statusbr.cpp @@ -8857,20 +9438,6 @@ $(OBJS)\corelib_dialog.o: ../../src/univ/dialog.cpp endif endif -ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),0) -$(OBJS)\corelib_fdrepdlg.o: ../../src/msw/fdrepdlg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -endif -endif - -ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),1) -$(OBJS)\corelib_fdrepdlg.o: ../../src/generic/fdrepdlg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -endif -endif - ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) $(OBJS)\corelib_imaglist.o: ../../src/msw/imaglist.cpp @@ -9067,6 +9634,20 @@ $(OBJS)\corelib_textctrl.o: ../../src/univ/textctrl.cpp endif endif +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),0) +$(OBJS)\corelib_fdrepdlg.o: ../../src/msw/fdrepdlg.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< +endif +endif + +ifeq ($(USE_GUI),1) +ifeq ($(WXUNIV),1) +$(OBJS)\corelib_fdrepdlg.o: ../../src/generic/fdrepdlg.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< +endif +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_accesscmn.o: ../../src/common/accesscmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9107,11 +9688,6 @@ $(OBJS)\corelib_clipcmn.o: ../../src/common/clipcmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_clntdata.o: ../../src/common/clntdata.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\corelib_cmdproc.o: ../../src/common/cmdproc.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9387,6 +9963,11 @@ $(OBJS)\corelib_statbar.o: ../../src/common/statbar.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_stockitem.o: ../../src/common/stockitem.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_tbarbase.o: ../../src/common/tbarbase.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9447,6 +10028,11 @@ $(OBJS)\corelib_choicdgg.o: ../../src/generic/choicdgg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_choicbkg.o: ../../src/generic/choicbkg.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_dcpsg.o: ../../src/generic/dcpsg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9548,9 +10134,6 @@ $(OBJS)\advdll_dummy.o: ../../src/msw/dummy.cpp $(OBJS)\advdll_calctrl.o: ../../src/generic/calctrl.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< -$(OBJS)\advdll_dcbuffer.o: ../../src/generic/dcbuffer.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< - $(OBJS)\advdll_grid.o: ../../src/generic/grid.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< @@ -9581,24 +10164,21 @@ $(OBJS)\advdll_wizard.o: ../../src/generic/wizard.cpp $(OBJS)\advdll_taskbarcmn.o: ../../src/common/taskbarcmn.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< -$(OBJS)\advdll_joystick.o: ../../src/msw/joystick.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< - $(OBJS)\advdll_sound.o: ../../src/msw/sound.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< $(OBJS)\advdll_taskbar.o: ../../src/msw/taskbar.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< +$(OBJS)\advdll_joystick.o: ../../src/msw/joystick.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< + $(OBJS)\advlib_dummy.o: ../../src/msw/dummy.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< $(OBJS)\advlib_calctrl.o: ../../src/generic/calctrl.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< -$(OBJS)\advlib_dcbuffer.o: ../../src/generic/dcbuffer.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< - $(OBJS)\advlib_grid.o: ../../src/generic/grid.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< @@ -9629,15 +10209,33 @@ $(OBJS)\advlib_wizard.o: ../../src/generic/wizard.cpp $(OBJS)\advlib_taskbarcmn.o: ../../src/common/taskbarcmn.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< -$(OBJS)\advlib_joystick.o: ../../src/msw/joystick.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< - $(OBJS)\advlib_sound.o: ../../src/msw/sound.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< $(OBJS)\advlib_taskbar.o: ../../src/msw/taskbar.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< +$(OBJS)\advlib_joystick.o: ../../src/msw/joystick.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\mediadll_dummy.o: ../../src/msw/dummy.cpp + $(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $< + +$(OBJS)\mediadll_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp + $(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $< + +$(OBJS)\mediadll_mediactrl.o: ../../src/msw/mediactrl.cpp + $(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $< + +$(OBJS)\medialib_dummy.o: ../../src/msw/dummy.cpp + $(CXX) -c -o $@ $(MEDIALIB_CXXFLAGS) $< + +$(OBJS)\medialib_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp + $(CXX) -c -o $@ $(MEDIALIB_CXXFLAGS) $< + +$(OBJS)\medialib_mediactrl.o: ../../src/msw/mediactrl.cpp + $(CXX) -c -o $@ $(MEDIALIB_CXXFLAGS) $< + $(OBJS)\odbcdll_dummy.o: ../../src/msw/dummy.cpp $(CXX) -c -o $@ $(ODBCDLL_CXXFLAGS) $< @@ -9824,6 +10422,246 @@ $(OBJS)\xmllib_xml.o: ../../src/xml/xml.cpp $(OBJS)\xmllib_xtixml.o: ../../src/common/xtixml.cpp $(CXX) -c -o $@ $(XMLLIB_CXXFLAGS) $< +$(OBJS)\xrcdll_dummy.o: ../../src/msw/dummy.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_bmpbt.o: ../../src/xrc/xh_bmpbt.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_bmp.o: ../../src/xrc/xh_bmp.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_bttn.o: ../../src/xrc/xh_bttn.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_cald.o: ../../src/xrc/xh_cald.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_chckb.o: ../../src/xrc/xh_chckb.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_chckl.o: ../../src/xrc/xh_chckl.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_choic.o: ../../src/xrc/xh_choic.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_combo.o: ../../src/xrc/xh_combo.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_dlg.o: ../../src/xrc/xh_dlg.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_frame.o: ../../src/xrc/xh_frame.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_gauge.o: ../../src/xrc/xh_gauge.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_gdctl.o: ../../src/xrc/xh_gdctl.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_html.o: ../../src/xrc/xh_html.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_listb.o: ../../src/xrc/xh_listb.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_listc.o: ../../src/xrc/xh_listc.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_menu.o: ../../src/xrc/xh_menu.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_notbk.o: ../../src/xrc/xh_notbk.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_panel.o: ../../src/xrc/xh_panel.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_radbt.o: ../../src/xrc/xh_radbt.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_radbx.o: ../../src/xrc/xh_radbx.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_scrol.o: ../../src/xrc/xh_scrol.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_scwin.o: ../../src/xrc/xh_scwin.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_sizer.o: ../../src/xrc/xh_sizer.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_slidr.o: ../../src/xrc/xh_slidr.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_spin.o: ../../src/xrc/xh_spin.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_split.o: ../../src/xrc/xh_split.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_statbar.o: ../../src/xrc/xh_statbar.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_stbmp.o: ../../src/xrc/xh_stbmp.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_stbox.o: ../../src/xrc/xh_stbox.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_stlin.o: ../../src/xrc/xh_stlin.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_sttxt.o: ../../src/xrc/xh_sttxt.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_text.o: ../../src/xrc/xh_text.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_toolb.o: ../../src/xrc/xh_toolb.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_tree.o: ../../src/xrc/xh_tree.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_unkwn.o: ../../src/xrc/xh_unkwn.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_wizrd.o: ../../src/xrc/xh_wizrd.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xmlres.o: ../../src/xrc/xmlres.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xmlrsall.o: ../../src/xrc/xmlrsall.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrclib_dummy.o: ../../src/msw/dummy.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_bmpbt.o: ../../src/xrc/xh_bmpbt.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_bmp.o: ../../src/xrc/xh_bmp.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_bttn.o: ../../src/xrc/xh_bttn.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_cald.o: ../../src/xrc/xh_cald.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_chckb.o: ../../src/xrc/xh_chckb.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_chckl.o: ../../src/xrc/xh_chckl.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_choic.o: ../../src/xrc/xh_choic.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_combo.o: ../../src/xrc/xh_combo.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_dlg.o: ../../src/xrc/xh_dlg.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_frame.o: ../../src/xrc/xh_frame.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_gauge.o: ../../src/xrc/xh_gauge.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_gdctl.o: ../../src/xrc/xh_gdctl.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_html.o: ../../src/xrc/xh_html.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_listb.o: ../../src/xrc/xh_listb.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_listc.o: ../../src/xrc/xh_listc.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_menu.o: ../../src/xrc/xh_menu.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_notbk.o: ../../src/xrc/xh_notbk.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_panel.o: ../../src/xrc/xh_panel.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_radbt.o: ../../src/xrc/xh_radbt.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_radbx.o: ../../src/xrc/xh_radbx.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_scrol.o: ../../src/xrc/xh_scrol.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_scwin.o: ../../src/xrc/xh_scwin.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_sizer.o: ../../src/xrc/xh_sizer.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_slidr.o: ../../src/xrc/xh_slidr.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_spin.o: ../../src/xrc/xh_spin.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_split.o: ../../src/xrc/xh_split.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_statbar.o: ../../src/xrc/xh_statbar.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_stbmp.o: ../../src/xrc/xh_stbmp.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_stbox.o: ../../src/xrc/xh_stbox.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_stlin.o: ../../src/xrc/xh_stlin.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_sttxt.o: ../../src/xrc/xh_sttxt.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_text.o: ../../src/xrc/xh_text.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_toolb.o: ../../src/xrc/xh_toolb.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_tree.o: ../../src/xrc/xh_tree.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_unkwn.o: ../../src/xrc/xh_unkwn.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_wizrd.o: ../../src/xrc/xh_wizrd.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xmlres.o: ../../src/xrc/xmlres.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xmlrsall.o: ../../src/xrc/xmlrsall.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + $(OBJS)\gldll_dummy.o: ../../src/msw/dummy.cpp $(CXX) -c -o $@ $(GLDLL_CXXFLAGS) $< @@ -9837,3 +10675,4 @@ $(OBJS)\gllib_glcanvas.o: ../../src/msw/glcanvas.cpp $(CXX) -c -o $@ $(GLLIB_CXXFLAGS) $< .PHONY: all clean setup_h samples build_cfg_file +