X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b92ca05a69325f72d59597eca2d9ac80027cceb1..75a2645e11fe191cc812cd768b61322456b5f8b8:/build/msw/makefile.gcc diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 834731efd8..f8164c03bd 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.2 (http://bakefile.sourceforge.net) +# Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -17,23 +17,30 @@ 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_EXCEPTIONS="$(USE_EXCEPTIONS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \ - VENDOR="$(VENDOR)" CFG="$(CFG)" RUNTIME_LIBS="$(RUNTIME_LIBS)" \ - GCC_VERSION="$(GCC_VERSION)" + USE_XRC="$(USE_XRC)" USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" \ + USE_QA="$(USE_QA)" USE_EXCEPTIONS="$(USE_EXCEPTIONS)" \ + USE_RTTI="$(USE_RTTI)" USE_THREADS="$(USE_THREADS)" \ + OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ + WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ + CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ + RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" +WX_RELEASE_NODOT = 25 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5 OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = ..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXREGEX_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ - -I..\..\include -I$(SETUPHDIR) $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS) +WXREGEX_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -I..\..\include -I$(SETUPHDIR) -D__WXMSW__ \ + $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS) WXREGEX_OBJECTS = \ $(OBJS)\wxregex_regcomp.o \ $(OBJS)\wxregex_regexec.o \ $(OBJS)\wxregex_regerror.o \ $(OBJS)\wxregex_regfree.o -WXZLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ - $(CPPFLAGS) $(CFLAGS) +WXZLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H $(CPPFLAGS) $(CFLAGS) WXZLIB_OBJECTS = \ $(OBJS)\wxzlib_adler32.o \ $(OBJS)\wxzlib_compress.o \ @@ -44,13 +51,11 @@ 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) +WXPNG_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -I..\..\src\zlib $(CPPFLAGS) $(CFLAGS) WXPNG_OBJECTS = \ $(OBJS)\wxpng_png.o \ $(OBJS)\wxpng_pngerror.o \ @@ -69,8 +74,8 @@ WXPNG_OBJECTS = \ $(OBJS)\wxpng_pngwrite.o \ $(OBJS)\wxpng_pngwtran.o \ $(OBJS)\wxpng_pngwutil.o -WXJPEG_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ - -I$(SETUPHDIR) $(CPPFLAGS) $(CFLAGS) +WXJPEG_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -I$(SETUPHDIR) $(CPPFLAGS) $(CFLAGS) WXJPEG_OBJECTS = \ $(OBJS)\wxjpeg_jcomapi.o \ $(OBJS)\wxjpeg_jutils.o \ @@ -118,13 +123,14 @@ WXJPEG_OBJECTS = \ $(OBJS)\wxjpeg_jquant1.o \ $(OBJS)\wxjpeg_jquant2.o \ $(OBJS)\wxjpeg_jdmerge.o -WXTIFF_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ - $(CPPFLAGS) $(CFLAGS) +WXTIFF_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -I..\..\src\zlib -I..\..\src\jpeg $(CPPFLAGS) $(CFLAGS) WXTIFF_OBJECTS = \ $(OBJS)\wxtiff_tif_win32.o \ $(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 \ @@ -154,26 +160,32 @@ WXTIFF_OBJECTS = \ $(OBJS)\wxtiff_tif_warning.o \ $(OBJS)\wxtiff_tif_write.o \ $(OBJS)\wxtiff_tif_zip.o -WXEXPAT_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ - $(____LIBDIRNAME_FILENAMES_6_p) -DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS) +WXEXPAT_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -I$(LIBDIRNAME) -DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS) WXEXPAT_OBJECTS = \ $(OBJS)\wxexpat_xmlparse.o \ $(OBJS)\wxexpat_xmlrole.o \ $(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..\..\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..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_BASE=1 -DWXMAKINGDLL $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1_7) \ - $(CPPFLAGS) $(CXXFLAGS) +MONODLL_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W -Wall \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_BASE=1 -DWXMAKINGDLL \ + $(CPPFLAGS) $(CFLAGS) +MONODLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ + $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W \ + -Wall -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_BASE=1 -DWXMAKINGDLL \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ + $(CXXFLAGS) MONODLL_OBJECTS = \ $(OBJS)\monodll_dummy.o \ + $(OBJS)\monodll_version_rc.o \ $(OBJS)\monodll_appbase.o \ + $(OBJS)\monodll_archive.o \ $(OBJS)\monodll_clntdata.o \ $(OBJS)\monodll_cmdline.o \ $(OBJS)\monodll_config.o \ @@ -193,7 +205,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 \ @@ -209,6 +220,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 \ @@ -218,7 +231,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 \ @@ -228,12 +241,16 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_zstream.o \ $(OBJS)\monodll_basemsw.o \ $(OBJS)\monodll_crashrpt.o \ + $(OBJS)\monodll_debughlp.o \ $(OBJS)\monodll_dde.o \ $(OBJS)\monodll_dir.o \ + $(OBJS)\monodll_dlmsw.o \ $(OBJS)\monodll_mimetype.o \ $(OBJS)\monodll_regconf.o \ $(OBJS)\monodll_registry.o \ $(OBJS)\monodll_snglinst.o \ + $(OBJS)\monodll_stackwalk.o \ + $(OBJS)\monodll_stdpaths.o \ $(OBJS)\monodll_thread.o \ $(OBJS)\monodll_utils.o \ $(OBJS)\monodll_utilsexc.o \ @@ -255,23 +272,27 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_socket.o \ $(OBJS)\monodll_url.o \ $(OBJS)\monodll_gsocket.o \ + $(OBJS)\monodll_urlmsw.o \ $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \ $(OBJS)\monodll_xml.o \ $(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..\..\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..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_BASE=1 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1_7) $(CPPFLAGS) \ - $(CXXFLAGS) +MONOLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W -Wall \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) +MONOLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ + $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W \ + -Wall -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_BASE=1 $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(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 \ @@ -291,7 +312,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 \ @@ -307,6 +327,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 \ @@ -316,7 +338,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 \ @@ -326,12 +348,16 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_zstream.o \ $(OBJS)\monolib_basemsw.o \ $(OBJS)\monolib_crashrpt.o \ + $(OBJS)\monolib_debughlp.o \ $(OBJS)\monolib_dde.o \ $(OBJS)\monolib_dir.o \ + $(OBJS)\monolib_dlmsw.o \ $(OBJS)\monolib_mimetype.o \ $(OBJS)\monolib_regconf.o \ $(OBJS)\monolib_registry.o \ $(OBJS)\monolib_snglinst.o \ + $(OBJS)\monolib_stackwalk.o \ + $(OBJS)\monolib_stdpaths.o \ $(OBJS)\monolib_thread.o \ $(OBJS)\monolib_utils.o \ $(OBJS)\monolib_utilsexc.o \ @@ -353,23 +379,30 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_socket.o \ $(OBJS)\monolib_url.o \ $(OBJS)\monolib_gsocket.o \ + $(OBJS)\monolib_urlmsw.o \ $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \ $(OBJS)\monolib_xml.o \ $(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..\..\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..\..\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) +BASEDLL_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W -Wall \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE \ + -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) +BASEDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ + $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W \ + -Wall -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE \ + -DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \ + $(CPPFLAGS) $(CXXFLAGS) BASEDLL_OBJECTS = \ $(OBJS)\basedll_dummy.o \ + $(OBJS)\basedll_version_rc.o \ $(OBJS)\basedll_appbase.o \ + $(OBJS)\basedll_archive.o \ $(OBJS)\basedll_clntdata.o \ $(OBJS)\basedll_cmdline.o \ $(OBJS)\basedll_config.o \ @@ -389,7 +422,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 \ @@ -405,6 +437,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 \ @@ -414,7 +448,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 \ @@ -424,12 +458,16 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_zstream.o \ $(OBJS)\basedll_basemsw.o \ $(OBJS)\basedll_crashrpt.o \ + $(OBJS)\basedll_debughlp.o \ $(OBJS)\basedll_dde.o \ $(OBJS)\basedll_dir.o \ + $(OBJS)\basedll_dlmsw.o \ $(OBJS)\basedll_mimetype.o \ $(OBJS)\basedll_regconf.o \ $(OBJS)\basedll_registry.o \ $(OBJS)\basedll_snglinst.o \ + $(OBJS)\basedll_stackwalk.o \ + $(OBJS)\basedll_stdpaths.o \ $(OBJS)\basedll_thread.o \ $(OBJS)\basedll_utils.o \ $(OBJS)\basedll_utilsexc.o \ @@ -440,20 +478,25 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_main.o \ $(OBJS)\basedll_mslu.o \ $(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..\..\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..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1_7) \ - $(CPPFLAGS) $(CXXFLAGS) +BASELIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W -Wall \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -DwxUSE_BASE=1 \ + $(CPPFLAGS) $(CFLAGS) +BASELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ + $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W \ + -Wall -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -DwxUSE_BASE=1 \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(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 \ @@ -473,7 +516,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 \ @@ -489,6 +531,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 \ @@ -498,7 +542,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 \ @@ -508,12 +552,16 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_zstream.o \ $(OBJS)\baselib_basemsw.o \ $(OBJS)\baselib_crashrpt.o \ + $(OBJS)\baselib_debughlp.o \ $(OBJS)\baselib_dde.o \ $(OBJS)\baselib_dir.o \ + $(OBJS)\baselib_dlmsw.o \ $(OBJS)\baselib_mimetype.o \ $(OBJS)\baselib_regconf.o \ $(OBJS)\baselib_registry.o \ $(OBJS)\baselib_snglinst.o \ + $(OBJS)\baselib_stackwalk.o \ + $(OBJS)\baselib_stdpaths.o \ $(OBJS)\baselib_thread.o \ $(OBJS)\baselib_utils.o \ $(OBJS)\baselib_utilsexc.o \ @@ -524,19 +572,17 @@ 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..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_1_7) $(CPPFLAGS) $(CXXFLAGS) +NETDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W -Wall \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL \ + -DWXMAKINGDLL_NET $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \ + $(CPPFLAGS) $(CXXFLAGS) NETDLL_OBJECTS = \ $(OBJS)\netdll_dummy.o \ + $(OBJS)\netdll_version_rc.o \ $(OBJS)\netdll_fs_inet.o \ $(OBJS)\netdll_ftp.o \ $(OBJS)\netdll_http.o \ @@ -547,18 +593,15 @@ NETDLL_OBJECTS = \ $(OBJS)\netdll_sckstrm.o \ $(OBJS)\netdll_socket.o \ $(OBJS)\netdll_url.o \ - $(OBJS)\netdll_gsocket.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..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_GUI=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1_7) $(CPPFLAGS) \ - $(CXXFLAGS) + $(OBJS)\netdll_gsocket.o \ + $(OBJS)\netdll_urlmsw.o +NETLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W -Wall \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) NETLIB_OBJECTS = \ $(OBJS)\netlib_dummy.o \ $(OBJS)\netlib_fs_inet.o \ @@ -571,20 +614,19 @@ NETLIB_OBJECTS = \ $(OBJS)\netlib_sckstrm.o \ $(OBJS)\netlib_socket.o \ $(OBJS)\netlib_url.o \ - $(OBJS)\netlib_gsocket.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..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_1_7) $(CPPFLAGS) $(CXXFLAGS) + $(OBJS)\netlib_gsocket.o \ + $(OBJS)\netlib_urlmsw.o +COREDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ + $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W \ + -Wall -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_CORE \ + -DwxUSE_BASE=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \ + $(CPPFLAGS) $(CXXFLAGS) COREDLL_OBJECTS = \ $(OBJS)\coredll_dummy.o \ + $(OBJS)\coredll_version_rc.o \ $(OBJS)\coredll_event.o \ $(OBJS)\coredll_fs_mem.o \ $(OBJS)\coredll_msgout.o \ @@ -593,17 +635,13 @@ 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..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_BASE=0 $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1_7) $(CPPFLAGS) \ - $(CXXFLAGS) +CORELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ + $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W \ + -Wall -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_BASE=0 $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) CORELIB_OBJECTS = \ $(OBJS)\corelib_dummy.o \ $(OBJS)\corelib_event.o \ @@ -614,97 +652,109 @@ CORELIB_OBJECTS = \ $(OBJS)\corelib_mslu.o \ $(OBJS)\corelib_volume.o \ $(____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..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DWXUSINGDLL -DWXMAKINGDLL_ADV $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1_7) \ - $(CPPFLAGS) $(CXXFLAGS) +ADVDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W -Wall \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_ADV \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(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 \ - $(OBJS)\advdll_helpext.o \ - $(OBJS)\advdll_laywin.o \ - $(OBJS)\advdll_sashwin.o \ - $(OBJS)\advdll_splash.o \ - $(OBJS)\advdll_tipdlg.o \ - $(OBJS)\advdll_wizard.o \ - $(OBJS)\advdll_taskbarcmn.o \ - $(OBJS)\advdll_joystick.o \ - $(OBJS)\advdll_taskbar.o \ - $(OBJS)\advdll_wave.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..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1_7) $(CPPFLAGS) $(CXXFLAGS) + $(OBJS)\advdll_version_rc.o \ + $(____ADVANCED_SRC_FILENAMES_2_OBJECTS) +ADVLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_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 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + -Wno-ctor-dtor-privacy $(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 \ - $(OBJS)\advlib_helpext.o \ - $(OBJS)\advlib_laywin.o \ - $(OBJS)\advlib_sashwin.o \ - $(OBJS)\advlib_splash.o \ - $(OBJS)\advlib_tipdlg.o \ - $(OBJS)\advlib_wizard.o \ - $(OBJS)\advlib_taskbarcmn.o \ - $(OBJS)\advlib_joystick.o \ - $(OBJS)\advlib_taskbar.o \ - $(OBJS)\advlib_wave.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..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_1_7) $(CPPFLAGS) $(CXXFLAGS) + $(____ADVANCED_SRC_FILENAMES_3_OBJECTS) +MEDIADLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ + $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_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 \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ + $(CXXFLAGS) +MEDIADLL_OBJECTS = \ + $(OBJS)\mediadll_dummy.o \ + $(OBJS)\mediadll_version_rc.o \ + $(OBJS)\mediadll_mediactrlcmn.o \ + $(OBJS)\mediadll_mediactrl.o +MEDIALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ + $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_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 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) +MEDIALIB_OBJECTS = \ + $(OBJS)\medialib_dummy.o \ + $(OBJS)\medialib_mediactrlcmn.o \ + $(OBJS)\medialib_mediactrl.o +ODBCDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ + $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W \ + -Wall -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL \ + -DWXMAKINGDLL_ODBC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \ + $(CPPFLAGS) $(CXXFLAGS) ODBCDLL_OBJECTS = \ $(OBJS)\odbcdll_dummy.o \ + $(OBJS)\odbcdll_version_rc.o \ $(OBJS)\odbcdll_db.o \ $(OBJS)\odbcdll_dbtable.o -ODBCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ - -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -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) \ - $(CXXFLAGS) +ODBCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ + $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W \ + -Wall -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) ODBCLIB_OBJECTS = \ $(OBJS)\odbclib_dummy.o \ $(OBJS)\odbclib_db.o \ $(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) +DBGRIDDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ + $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_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_DBGRID \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ + $(CXXFLAGS) DBGRIDDLL_OBJECTS = \ $(OBJS)\dbgriddll_dummy.o \ + $(OBJS)\dbgriddll_version_rc.o \ $(OBJS)\dbgriddll_dbgrid.o -DBGRIDLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -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) +DBGRIDLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ + $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_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 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + -Wno-ctor-dtor-privacy $(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..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DWXUSINGDLL -DWXMAKINGDLL_HTML $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1_7) \ - $(CPPFLAGS) $(CXXFLAGS) +HTMLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ + $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W \ + -Wall -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_HTML \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ + $(CXXFLAGS) HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_dummy.o \ + $(OBJS)\htmldll_version_rc.o \ $(OBJS)\htmldll_helpbest.o \ $(OBJS)\htmldll_helpctrl.o \ $(OBJS)\htmldll_helpdata.o \ @@ -727,11 +777,13 @@ HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_m_tables.o \ $(OBJS)\htmldll_winpars.o \ $(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..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1_7) $(CPPFLAGS) $(CXXFLAGS) +HTMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ + $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_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 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_dummy.o \ $(OBJS)\htmllib_helpbest.o \ @@ -756,40 +808,179 @@ HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_m_tables.o \ $(OBJS)\htmllib_winpars.o \ $(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..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_XML $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_1_7) $(CPPFLAGS) $(CXXFLAGS) +QADLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_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_QA \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ + $(CXXFLAGS) +QADLL_OBJECTS = \ + $(OBJS)\qadll_dummy.o \ + $(OBJS)\qadll_version_rc.o \ + $(OBJS)\qadll_debugrpt.o \ + $(OBJS)\qadll_dbgrptg.o +QALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_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 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) +QALIB_OBJECTS = \ + $(OBJS)\qalib_dummy.o \ + $(OBJS)\qalib_debugrpt.o \ + $(OBJS)\qalib_dbgrptg.o +XMLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W -Wall \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL \ + -DWXMAKINGDLL_XML $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \ + $(CPPFLAGS) $(CXXFLAGS) XMLDLL_OBJECTS = \ $(OBJS)\xmldll_dummy.o \ + $(OBJS)\xmldll_version_rc.o \ $(OBJS)\xmldll_xml.o \ $(OBJS)\xmldll_xtixml.o -XMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ - -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -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) \ - $(CXXFLAGS) +XMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W -Wall \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) XMLLIB_OBJECTS = \ $(OBJS)\xmllib_dummy.o \ $(OBJS)\xmllib_xml.o \ $(OBJS)\xmllib_xtixml.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..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DWXUSINGDLL -DWXMAKINGDLL_GL $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1_7) \ - $(CPPFLAGS) $(CXXFLAGS) +XRCDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_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 \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ + $(CXXFLAGS) +XRCDLL_OBJECTS = \ + $(OBJS)\xrcdll_dummy.o \ + $(OBJS)\xrcdll_version_rc.o \ + $(OBJS)\xrcdll_xh_bmpbt.o \ + $(OBJS)\xrcdll_xh_bmp.o \ + $(OBJS)\xrcdll_xh_bttn.o \ + $(OBJS)\xrcdll_xh_cald.o \ + $(OBJS)\xrcdll_xh_chckb.o \ + $(OBJS)\xrcdll_xh_chckl.o \ + $(OBJS)\xrcdll_xh_choic.o \ + $(OBJS)\xrcdll_xh_choicbk.o \ + $(OBJS)\xrcdll_xh_combo.o \ + $(OBJS)\xrcdll_xh_datectrl.o \ + $(OBJS)\xrcdll_xh_dlg.o \ + $(OBJS)\xrcdll_xh_frame.o \ + $(OBJS)\xrcdll_xh_mdi.o \ + $(OBJS)\xrcdll_xh_gauge.o \ + $(OBJS)\xrcdll_xh_gdctl.o \ + $(OBJS)\xrcdll_xh_html.o \ + $(OBJS)\xrcdll_xh_listb.o \ + $(OBJS)\xrcdll_xh_listbk.o \ + $(OBJS)\xrcdll_xh_listc.o \ + $(OBJS)\xrcdll_xh_menu.o \ + $(OBJS)\xrcdll_xh_notbk.o \ + $(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) $(__THREADSFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_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 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + -Wno-ctor-dtor-privacy $(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_choicbk.o \ + $(OBJS)\xrclib_xh_combo.o \ + $(OBJS)\xrclib_xh_datectrl.o \ + $(OBJS)\xrclib_xh_dlg.o \ + $(OBJS)\xrclib_xh_frame.o \ + $(OBJS)\xrclib_xh_mdi.o \ + $(OBJS)\xrclib_xh_gauge.o \ + $(OBJS)\xrclib_xh_gdctl.o \ + $(OBJS)\xrclib_xh_html.o \ + $(OBJS)\xrclib_xh_listb.o \ + $(OBJS)\xrclib_xh_listbk.o \ + $(OBJS)\xrclib_xh_listc.o \ + $(OBJS)\xrclib_xh_menu.o \ + $(OBJS)\xrclib_xh_notbk.o \ + $(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) $(__THREADSFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -W -Wall \ + -I..\..\src\tiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ + -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_GL \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ + $(CXXFLAGS) GLDLL_OBJECTS = \ $(OBJS)\gldll_dummy.o \ + $(OBJS)\gldll_version_rc.o \ $(OBJS)\gldll_glcanvas.o -GLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ - -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -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) +GLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_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 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) GLLIB_OBJECTS = \ $(OBJS)\gllib_dummy.o \ $(OBJS)\gllib_glcanvas.o @@ -829,6 +1020,12 @@ endif ifeq ($(SHARED),1) WXDLLFLAG = dll endif +ifeq ($(SHARED),0) +LIBTYPE_SUFFIX = lib +endif +ifeq ($(SHARED),1) +LIBTYPE_SUFFIX = dll +endif ifeq ($(USE_GUI),1) __wxpng___depname = $(LIBDIRNAME)\libwxpng$(WXDEBUGFLAG).a endif @@ -838,36 +1035,24 @@ endif ifeq ($(USE_GUI),1) __wxtiff___depname = $(LIBDIRNAME)\libwxtiff$(WXDEBUGFLAG).a endif -ifeq ($(SHARED),0) -____LIBDIRNAME_FILENAMES_6_p = -I..\..\lib\gcc_lib$(CFG) +ifeq ($(MONOLITHIC),0) +EXTRALIBS_FOR_BASE = endif -ifeq ($(SHARED),1) -____LIBDIRNAME_FILENAMES_6_p = -I..\..\lib\gcc_dll$(CFG) +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 \ - $(OBJS)\monodll_helpext.o \ - $(OBJS)\monodll_laywin.o \ - $(OBJS)\monodll_sashwin.o \ - $(OBJS)\monodll_splash.o \ - $(OBJS)\monodll_tipdlg.o \ - $(OBJS)\monodll_wizard.o \ - $(OBJS)\monodll_taskbarcmn.o \ - $(OBJS)\monodll_joystick.o \ - $(OBJS)\monodll_taskbar.o \ - $(OBJS)\monodll_wave.o \ + $(____ADVANCED_SRC_FILENAMES_OBJECTS) \ + $(OBJS)\monodll_mediactrlcmn.o \ + $(OBJS)\monodll_mediactrl.o \ $(OBJS)\monodll_helpbest.o \ $(OBJS)\monodll_helpctrl.o \ $(OBJS)\monodll_helpdata.o \ @@ -892,7 +1077,52 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_htmllbox.o \ $(OBJS)\monodll_db.o \ $(OBJS)\monodll_dbtable.o \ - $(OBJS)\monodll_dbgrid.o + $(OBJS)\monodll_debugrpt.o \ + $(OBJS)\monodll_dbgrptg.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_choicbk.o \ + $(OBJS)\monodll_xh_combo.o \ + $(OBJS)\monodll_xh_datectrl.o \ + $(OBJS)\monodll_xh_dlg.o \ + $(OBJS)\monodll_xh_frame.o \ + $(OBJS)\monodll_xh_mdi.o \ + $(OBJS)\monodll_xh_gauge.o \ + $(OBJS)\monodll_xh_gdctl.o \ + $(OBJS)\monodll_xh_html.o \ + $(OBJS)\monodll_xh_listb.o \ + $(OBJS)\monodll_xh_listbk.o \ + $(OBJS)\monodll_xh_listc.o \ + $(OBJS)\monodll_xh_menu.o \ + $(OBJS)\monodll_xh_notbk.o \ + $(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 +1142,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 +1151,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 +1171,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 +1187,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 +1221,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 \ @@ -1056,6 +1286,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 \ @@ -1068,6 +1299,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 \ @@ -1107,7 +1339,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 \ @@ -1117,16 +1348,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 \ @@ -1141,6 +1368,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 \ @@ -1253,6 +1484,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 \ @@ -1265,6 +1497,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 \ @@ -1286,30 +1519,57 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_vscroll.o endif endif +ifeq ($(WXUNIV),0) +____ADVANCED_SRC_FILENAMES_OBJECTS = \ + $(OBJS)\monodll_calctrl.o \ + $(OBJS)\monodll_datectlg.o \ + $(OBJS)\monodll_grid.o \ + $(OBJS)\monodll_gridctrl.o \ + $(OBJS)\monodll_gridsel.o \ + $(OBJS)\monodll_helpext.o \ + $(OBJS)\monodll_laywin.o \ + $(OBJS)\monodll_propdlg.o \ + $(OBJS)\monodll_sashwin.o \ + $(OBJS)\monodll_splash.o \ + $(OBJS)\monodll_tipdlg.o \ + $(OBJS)\monodll_wizard.o \ + $(OBJS)\monodll_taskbarcmn.o \ + $(OBJS)\monodll_sound.o \ + $(OBJS)\monodll_taskbar.o \ + $(OBJS)\monodll_joystick.o \ + $(OBJS)\monodll_datectrl.o +endif +ifeq ($(WXUNIV),1) +____ADVANCED_SRC_FILENAMES_OBJECTS = \ + $(OBJS)\monodll_calctrl.o \ + $(OBJS)\monodll_datectlg.o \ + $(OBJS)\monodll_grid.o \ + $(OBJS)\monodll_gridctrl.o \ + $(OBJS)\monodll_gridsel.o \ + $(OBJS)\monodll_helpext.o \ + $(OBJS)\monodll_laywin.o \ + $(OBJS)\monodll_propdlg.o \ + $(OBJS)\monodll_sashwin.o \ + $(OBJS)\monodll_splash.o \ + $(OBJS)\monodll_tipdlg.o \ + $(OBJS)\monodll_wizard.o \ + $(OBJS)\monodll_taskbarcmn.o \ + $(OBJS)\monodll_sound.o \ + $(OBJS)\monodll_taskbar.o \ + $(OBJS)\monodll_joystick.o +endif ifeq ($(MONOLITHIC),1) ifeq ($(SHARED),0) __monolib___depname = \ - $(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 \ - $(OBJS)\monolib_helpext.o \ - $(OBJS)\monolib_laywin.o \ - $(OBJS)\monolib_sashwin.o \ - $(OBJS)\monolib_splash.o \ - $(OBJS)\monolib_tipdlg.o \ - $(OBJS)\monolib_wizard.o \ - $(OBJS)\monolib_taskbarcmn.o \ - $(OBJS)\monolib_joystick.o \ - $(OBJS)\monolib_taskbar.o \ - $(OBJS)\monolib_wave.o \ + $(____ADVANCED_SRC_FILENAMES_1_OBJECTS) \ + $(OBJS)\monolib_mediactrlcmn.o \ + $(OBJS)\monolib_mediactrl.o \ $(OBJS)\monolib_helpbest.o \ $(OBJS)\monolib_helpctrl.o \ $(OBJS)\monolib_helpdata.o \ @@ -1334,7 +1594,52 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_htmllbox.o \ $(OBJS)\monolib_db.o \ $(OBJS)\monolib_dbtable.o \ - $(OBJS)\monolib_dbgrid.o + $(OBJS)\monolib_debugrpt.o \ + $(OBJS)\monolib_dbgrptg.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_choicbk.o \ + $(OBJS)\monolib_xh_combo.o \ + $(OBJS)\monolib_xh_datectrl.o \ + $(OBJS)\monolib_xh_dlg.o \ + $(OBJS)\monolib_xh_frame.o \ + $(OBJS)\monolib_xh_mdi.o \ + $(OBJS)\monolib_xh_gauge.o \ + $(OBJS)\monolib_xh_gdctl.o \ + $(OBJS)\monolib_xh_html.o \ + $(OBJS)\monolib_xh_listb.o \ + $(OBJS)\monolib_xh_listbk.o \ + $(OBJS)\monolib_xh_listc.o \ + $(OBJS)\monolib_xh_menu.o \ + $(OBJS)\monolib_xh_notbk.o \ + $(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) @@ -1354,7 +1659,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 \ @@ -1364,16 +1668,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 \ @@ -1388,6 +1688,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 \ @@ -1400,10 +1704,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 \ @@ -1435,6 +1738,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 \ @@ -1498,6 +1803,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 \ @@ -1510,6 +1816,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 \ @@ -1549,7 +1856,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 \ @@ -1559,16 +1865,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 \ @@ -1583,6 +1885,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 \ @@ -1695,6 +2001,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 \ @@ -1707,6 +2014,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 \ @@ -1728,35 +2036,74 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_vscroll.o endif endif +ifeq ($(WXUNIV),0) +____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ + $(OBJS)\monolib_calctrl.o \ + $(OBJS)\monolib_datectlg.o \ + $(OBJS)\monolib_grid.o \ + $(OBJS)\monolib_gridctrl.o \ + $(OBJS)\monolib_gridsel.o \ + $(OBJS)\monolib_helpext.o \ + $(OBJS)\monolib_laywin.o \ + $(OBJS)\monolib_propdlg.o \ + $(OBJS)\monolib_sashwin.o \ + $(OBJS)\monolib_splash.o \ + $(OBJS)\monolib_tipdlg.o \ + $(OBJS)\monolib_wizard.o \ + $(OBJS)\monolib_taskbarcmn.o \ + $(OBJS)\monolib_sound.o \ + $(OBJS)\monolib_taskbar.o \ + $(OBJS)\monolib_joystick.o \ + $(OBJS)\monolib_datectrl.o +endif +ifeq ($(WXUNIV),1) +____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ + $(OBJS)\monolib_calctrl.o \ + $(OBJS)\monolib_datectlg.o \ + $(OBJS)\monolib_grid.o \ + $(OBJS)\monolib_gridctrl.o \ + $(OBJS)\monolib_gridsel.o \ + $(OBJS)\monolib_helpext.o \ + $(OBJS)\monolib_laywin.o \ + $(OBJS)\monolib_propdlg.o \ + $(OBJS)\monolib_sashwin.o \ + $(OBJS)\monolib_splash.o \ + $(OBJS)\monolib_tipdlg.o \ + $(OBJS)\monolib_wizard.o \ + $(OBJS)\monolib_taskbarcmn.o \ + $(OBJS)\monolib_sound.o \ + $(OBJS)\monolib_taskbar.o \ + $(OBJS)\monolib_joystick.o +endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) __basedll___depname = \ - $(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 @@ -1778,7 +2125,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 \ @@ -1788,16 +2134,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 \ @@ -1812,6 +2154,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 \ @@ -1824,10 +2170,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 \ @@ -1859,6 +2204,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 \ @@ -1922,6 +2269,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 \ @@ -1934,6 +2282,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 \ @@ -1973,7 +2322,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 \ @@ -1983,16 +2331,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 \ @@ -2007,6 +2351,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 \ @@ -2119,6 +2467,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 \ @@ -2131,6 +2480,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 \ @@ -2156,7 +2506,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 @@ -2178,7 +2528,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 \ @@ -2188,16 +2537,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 \ @@ -2212,6 +2557,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 \ @@ -2224,10 +2573,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 \ @@ -2259,6 +2607,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 \ @@ -2322,6 +2672,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 \ @@ -2334,6 +2685,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 \ @@ -2373,7 +2725,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 \ @@ -2383,16 +2734,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 \ @@ -2407,7 +2754,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_utilsgui.o \ $(OBJS)\corelib_uxtheme.o \ $(OBJS)\corelib_window.o \ - $(OBJS)\corelib_accel.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 \ $(OBJS)\corelib_fdrepdlg.o \ @@ -2519,6 +2870,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 \ @@ -2531,6 +2883,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 \ @@ -2556,15 +2909,109 @@ 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 +ifeq ($(WXUNIV),0) +____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ + $(OBJS)\advdll_calctrl.o \ + $(OBJS)\advdll_datectlg.o \ + $(OBJS)\advdll_grid.o \ + $(OBJS)\advdll_gridctrl.o \ + $(OBJS)\advdll_gridsel.o \ + $(OBJS)\advdll_helpext.o \ + $(OBJS)\advdll_laywin.o \ + $(OBJS)\advdll_propdlg.o \ + $(OBJS)\advdll_sashwin.o \ + $(OBJS)\advdll_splash.o \ + $(OBJS)\advdll_tipdlg.o \ + $(OBJS)\advdll_wizard.o \ + $(OBJS)\advdll_taskbarcmn.o \ + $(OBJS)\advdll_sound.o \ + $(OBJS)\advdll_taskbar.o \ + $(OBJS)\advdll_joystick.o \ + $(OBJS)\advdll_datectrl.o +endif +ifeq ($(WXUNIV),1) +____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ + $(OBJS)\advdll_calctrl.o \ + $(OBJS)\advdll_datectlg.o \ + $(OBJS)\advdll_grid.o \ + $(OBJS)\advdll_gridctrl.o \ + $(OBJS)\advdll_gridsel.o \ + $(OBJS)\advdll_helpext.o \ + $(OBJS)\advdll_laywin.o \ + $(OBJS)\advdll_propdlg.o \ + $(OBJS)\advdll_sashwin.o \ + $(OBJS)\advdll_splash.o \ + $(OBJS)\advdll_tipdlg.o \ + $(OBJS)\advdll_wizard.o \ + $(OBJS)\advdll_taskbarcmn.o \ + $(OBJS)\advdll_sound.o \ + $(OBJS)\advdll_taskbar.o \ + $(OBJS)\advdll_joystick.o endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) ifeq ($(USE_GUI),1) __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 ($(WXUNIV),0) +____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ + $(OBJS)\advlib_calctrl.o \ + $(OBJS)\advlib_datectlg.o \ + $(OBJS)\advlib_grid.o \ + $(OBJS)\advlib_gridctrl.o \ + $(OBJS)\advlib_gridsel.o \ + $(OBJS)\advlib_helpext.o \ + $(OBJS)\advlib_laywin.o \ + $(OBJS)\advlib_propdlg.o \ + $(OBJS)\advlib_sashwin.o \ + $(OBJS)\advlib_splash.o \ + $(OBJS)\advlib_tipdlg.o \ + $(OBJS)\advlib_wizard.o \ + $(OBJS)\advlib_taskbarcmn.o \ + $(OBJS)\advlib_sound.o \ + $(OBJS)\advlib_taskbar.o \ + $(OBJS)\advlib_joystick.o \ + $(OBJS)\advlib_datectrl.o +endif +ifeq ($(WXUNIV),1) +____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ + $(OBJS)\advlib_calctrl.o \ + $(OBJS)\advlib_datectlg.o \ + $(OBJS)\advlib_grid.o \ + $(OBJS)\advlib_gridctrl.o \ + $(OBJS)\advlib_gridsel.o \ + $(OBJS)\advlib_helpext.o \ + $(OBJS)\advlib_laywin.o \ + $(OBJS)\advlib_propdlg.o \ + $(OBJS)\advlib_sashwin.o \ + $(OBJS)\advlib_splash.o \ + $(OBJS)\advlib_tipdlg.o \ + $(OBJS)\advlib_wizard.o \ + $(OBJS)\advlib_taskbarcmn.o \ + $(OBJS)\advlib_sound.o \ + $(OBJS)\advlib_taskbar.o \ + $(OBJS)\advlib_joystick.o +endif +ifeq ($(MONOLITHIC),0) +ifeq ($(SHARED),1) +ifeq ($(USE_GUI),1) +__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 @@ -2572,7 +3019,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 @@ -2580,7 +3027,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 @@ -2589,7 +3036,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 @@ -2599,65 +3046,129 @@ 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) +ifeq ($(USE_GUI),1) +ifeq ($(USE_QA),1) +__qadll___depname = \ + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_gcc$(VENDORTAG).dll +endif +endif +endif +endif +ifeq ($(MONOLITHIC),0) +ifeq ($(SHARED),0) +ifeq ($(USE_GUI),1) +ifeq ($(USE_QA),1) +__qalib___depname = \ + $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.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 +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p_49 = --define __WXUNIVERSAL__ +endif +ifeq ($(BUILD),debug) +ifeq ($(DEBUG_FLAG),default) +__DEBUG_DEFINE_p_49 = --define __WXDEBUG__ +endif +endif +ifeq ($(DEBUG_FLAG),1) +__DEBUG_DEFINE_p_49 = --define __WXDEBUG__ +endif +ifeq ($(USE_EXCEPTIONS),0) +__EXCEPTIONS_DEFINE_p_49 = --define wxNO_EXCEPTIONS +endif +ifeq ($(USE_RTTI),0) +__RTTI_DEFINE_p_49 = --define wxNO_RTTI endif +ifeq ($(USE_THREADS),0) +__THREAD_DEFINE_p_49 = --define wxNO_THREADS endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p_50 = --define _UNICODE endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) @@ -2693,17 +3204,23 @@ endif ifeq ($(BUILD),release) __OPTIMIZEFLAG = -O2 endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONSFLAG = -fno-rtti +ifeq ($(USE_THREADS),0) +__THREADSFLAG = endif -ifeq ($(USE_EXCEPTIONS),1) -__EXCEPTIONSFLAG = +ifeq ($(USE_THREADS),1) +__THREADSFLAG = -mthreads +endif +ifeq ($(USE_RTTI),0) +__RTTIFLAG = -fno-rtti +endif +ifeq ($(USE_RTTI),1) +__RTTIFLAG = endif ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONSFLAG_1_7 = -fno-exceptions +__EXCEPTIONSFLAG = -fno-exceptions endif ifeq ($(USE_EXCEPTIONS),1) -__EXCEPTIONSFLAG_1_7 = +__EXCEPTIONSFLAG = endif ifeq ($(WXUNIV),1) __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -2716,14 +3233,17 @@ endif ifeq ($(DEBUG_FLAG),1) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif -ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p = -D_UNICODE +ifeq ($(USE_EXCEPTIONS),0) +__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS endif -ifeq ($(SHARED),0) -LIBDIRNAME = ..\..\lib\gcc_lib$(CFG) +ifeq ($(USE_RTTI),0) +__RTTI_DEFINE_p = -DwxNO_RTTI endif -ifeq ($(SHARED),1) -LIBDIRNAME = ..\..\lib\gcc_dll$(CFG) +ifeq ($(USE_THREADS),0) +__THREAD_DEFINE_p = -DwxNO_THREADS +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -D_UNICODE endif ifeq ($(WXUNIV),0) __SETUP_H_SUBDIR_FILENAMES = msw @@ -2739,50 +3259,60 @@ $(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) $(__qadll___depname) $(__qalib___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)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_gcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a + -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.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 $@ @@ -2820,14 +3350,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) $(OBJS)\monodll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a + $(CXX) -shared -fPIC -o $@ $(MONODLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif 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 $@ @@ -2836,14 +3366,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) $(OBJS)\basedll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a + $(CXX) -shared -fPIC -o $@ $(BASEDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif 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 $@ @@ -2852,14 +3382,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) $(OBJS)\netdll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(NETDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif 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 $@ @@ -2869,8 +3399,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) $(OBJS)\coredll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(COREDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -2878,7 +3408,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 $@ @@ -2889,8 +3419,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) $(OBJS)\advdll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(ADVDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -2898,7 +3428,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 $@ @@ -2906,11 +3436,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) $(OBJS)\mediadll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(MEDIADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a +endif +endif +endif + +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) $(OBJS)\odbcdll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(ODBCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -2918,7 +3468,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 $@ @@ -2930,8 +3480,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) $(OBJS)\dbgriddll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(DBGRIDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -2941,7 +3491,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 $@ @@ -2952,45 +3502,93 @@ 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) $(OBJS)\htmldll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(HTMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a +endif endif endif 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) +ifeq ($(USE_GUI),1) +ifeq ($(USE_QA),1) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_gcc$(VENDORTAG).dll: $(QADLL_OBJECTS) $(OBJS)\qadll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname) + $(CXX) -shared -fPIC -o $@ $(QADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a +endif +endif +endif +endif + +ifeq ($(MONOLITHIC),0) +ifeq ($(SHARED),0) +ifeq ($(USE_GUI),1) +ifeq ($(USE_QA),1) +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a: $(QALIB_OBJECTS) + if exist $@ del $@ + ar rcu $@ $(QALIB_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) $(OBJS)\xmldll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(XMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif 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) $(OBJS)\xrcdll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__htmldll___depname) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname) + $(CXX) -shared -fPIC -o $@ $(XRCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a +endif +endif +endif + +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) $(OBJS)\gldll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) $(__coredll___depname) + $(CXX) -shared -fPIC -o $@ $(GLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) -lopengl32 -lglu32 endif endif endif @@ -2998,7 +3596,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 $@ @@ -3027,7 +3625,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=5 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @@ -3041,10 +3639,12 @@ build_cfg_file: $(SETUPHDIR) @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE) @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE) @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE) + @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE) @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE) @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE) @echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE) @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE) + @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE) @echo COMPILER=gcc >>$(BUILD_CFG_FILE) @echo CC=$(CC) >>$(BUILD_CFG_FILE) @echo CXX=$(CXX) >>$(BUILD_CFG_FILE) @@ -3092,18 +3692,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) $< @@ -3308,6 +3902,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) $< @@ -3407,9 +4004,15 @@ $(OBJS)\wxexpat_xmltok.o: ../../src/expat/lib/xmltok.c $(OBJS)\monodll_dummy.o: ../../src/msw/dummy.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_version_rc.o: ../../src/msw/version.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) --include-dir ..\../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG) + $(OBJS)\monodll_appbase.o: ../../src/common/appbase.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +$(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) $< @@ -3467,9 +4070,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) $< @@ -3515,6 +4115,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) $< @@ -3542,8 +4148,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) $< @@ -3572,12 +4178,18 @@ $(OBJS)\monodll_basemsw.o: ../../src/msw/basemsw.cpp $(OBJS)\monodll_crashrpt.o: ../../src/msw/crashrpt.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_debughlp.o: ../../src/msw/debughlp.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_dde.o: ../../src/msw/dde.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_dir.o: ../../src/msw/dir.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_dlmsw.o: ../../src/msw/dlmsw.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_mimetype.o: ../../src/msw/mimetype.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -3590,6 +4202,12 @@ $(OBJS)\monodll_registry.o: ../../src/msw/registry.cpp $(OBJS)\monodll_snglinst.o: ../../src/msw/snglinst.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_stackwalk.o: ../../src/msw/stackwalk.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_stdpaths.o: ../../src/msw/stdpaths.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_thread.o: ../../src/msw/thread.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -3650,19 +4268,22 @@ $(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) $< $(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 @@ -3716,6 +4337,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) $< @@ -3785,124 +4409,223 @@ $(OBJS)\monodll_metal.o: ../../src/univ/themes/metal.cpp $(OBJS)\monodll_win32.o: ../../src/univ/themes/win32.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_calctrl.o: ../../src/generic/calctrl.cpp +$(OBJS)\monodll_datectrl.o: ../../src/msw/datectrl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_dcbuffer.o: ../../src/generic/dcbuffer.cpp +$(OBJS)\monodll_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_grid.o: ../../src/generic/grid.cpp +$(OBJS)\monodll_mediactrl.o: ../../src/msw/mediactrl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_gridctrl.o: ../../src/generic/gridctrl.cpp +$(OBJS)\monodll_helpbest.o: ../../src/msw/helpbest.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_gridsel.o: ../../src/generic/gridsel.cpp +$(OBJS)\monodll_helpctrl.o: ../../src/html/helpctrl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_helpext.o: ../../src/generic/helpext.cpp +$(OBJS)\monodll_helpdata.o: ../../src/html/helpdata.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_laywin.o: ../../src/generic/laywin.cpp +$(OBJS)\monodll_helpfrm.o: ../../src/html/helpfrm.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_sashwin.o: ../../src/generic/sashwin.cpp +$(OBJS)\monodll_htmlcell.o: ../../src/html/htmlcell.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_splash.o: ../../src/generic/splash.cpp +$(OBJS)\monodll_htmlfilt.o: ../../src/html/htmlfilt.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_tipdlg.o: ../../src/generic/tipdlg.cpp +$(OBJS)\monodll_htmlpars.o: ../../src/html/htmlpars.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_wizard.o: ../../src/generic/wizard.cpp +$(OBJS)\monodll_htmltag.o: ../../src/html/htmltag.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_taskbarcmn.o: ../../src/common/taskbarcmn.cpp +$(OBJS)\monodll_htmlwin.o: ../../src/html/htmlwin.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_joystick.o: ../../src/msw/joystick.cpp +$(OBJS)\monodll_htmprint.o: ../../src/html/htmprint.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_taskbar.o: ../../src/msw/taskbar.cpp +$(OBJS)\monodll_m_dflist.o: ../../src/html/m_dflist.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_wave.o: ../../src/msw/wave.cpp +$(OBJS)\monodll_m_fonts.o: ../../src/html/m_fonts.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_helpbest.o: ../../src/msw/helpbest.cpp +$(OBJS)\monodll_m_hline.o: ../../src/html/m_hline.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_helpctrl.o: ../../src/html/helpctrl.cpp +$(OBJS)\monodll_m_image.o: ../../src/html/m_image.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_helpdata.o: ../../src/html/helpdata.cpp +$(OBJS)\monodll_m_layout.o: ../../src/html/m_layout.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_helpfrm.o: ../../src/html/helpfrm.cpp +$(OBJS)\monodll_m_links.o: ../../src/html/m_links.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_htmlcell.o: ../../src/html/htmlcell.cpp +$(OBJS)\monodll_m_list.o: ../../src/html/m_list.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_htmlfilt.o: ../../src/html/htmlfilt.cpp +$(OBJS)\monodll_m_pre.o: ../../src/html/m_pre.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_htmlpars.o: ../../src/html/htmlpars.cpp +$(OBJS)\monodll_m_style.o: ../../src/html/m_style.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_htmltag.o: ../../src/html/htmltag.cpp +$(OBJS)\monodll_m_tables.o: ../../src/html/m_tables.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_htmlwin.o: ../../src/html/htmlwin.cpp +$(OBJS)\monodll_winpars.o: ../../src/html/winpars.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_htmprint.o: ../../src/html/htmprint.cpp +$(OBJS)\monodll_htmllbox.o: ../../src/generic/htmllbox.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_m_dflist.o: ../../src/html/m_dflist.cpp +$(OBJS)\monodll_db.o: ../../src/common/db.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_m_fonts.o: ../../src/html/m_fonts.cpp +$(OBJS)\monodll_dbtable.o: ../../src/common/dbtable.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_m_hline.o: ../../src/html/m_hline.cpp +$(OBJS)\monodll_debugrpt.o: ../../src/common/debugrpt.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_m_image.o: ../../src/html/m_image.cpp +$(OBJS)\monodll_dbgrptg.o: ../../src/generic/dbgrptg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_m_layout.o: ../../src/html/m_layout.cpp +$(OBJS)\monodll_dbgrid.o: ../../src/common/dbgrid.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_m_links.o: ../../src/html/m_links.cpp +$(OBJS)\monodll_xh_bmpbt.o: ../../src/xrc/xh_bmpbt.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_m_list.o: ../../src/html/m_list.cpp +$(OBJS)\monodll_xh_bmp.o: ../../src/xrc/xh_bmp.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_m_pre.o: ../../src/html/m_pre.cpp +$(OBJS)\monodll_xh_bttn.o: ../../src/xrc/xh_bttn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_m_style.o: ../../src/html/m_style.cpp +$(OBJS)\monodll_xh_cald.o: ../../src/xrc/xh_cald.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_m_tables.o: ../../src/html/m_tables.cpp +$(OBJS)\monodll_xh_chckb.o: ../../src/xrc/xh_chckb.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_winpars.o: ../../src/html/winpars.cpp +$(OBJS)\monodll_xh_chckl.o: ../../src/xrc/xh_chckl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_htmllbox.o: ../../src/generic/htmllbox.cpp +$(OBJS)\monodll_xh_choic.o: ../../src/xrc/xh_choic.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_db.o: ../../src/common/db.cpp +$(OBJS)\monodll_xh_choicbk.o: ../../src/xrc/xh_choicbk.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_dbtable.o: ../../src/common/dbtable.cpp +$(OBJS)\monodll_xh_combo.o: ../../src/xrc/xh_combo.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_dbgrid.o: ../../src/common/dbgrid.cpp +$(OBJS)\monodll_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_dlg.o: ../../src/xrc/xh_dlg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_frame.o: ../../src/xrc/xh_frame.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_mdi.o: ../../src/xrc/xh_mdi.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_gauge.o: ../../src/xrc/xh_gauge.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(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_listbk.o: ../../src/xrc/xh_listbk.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_xh_listc.o: ../../src/xrc/xh_listc.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< + +$(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 @@ -3986,11 +4709,6 @@ $(OBJS)\monodll_dib.o: ../../src/msw/dib.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dirdlg.o: ../../src/msw/dirdlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monodll_display.o: ../../src/msw/display.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -4032,17 +4750,7 @@ $(OBJS)\monodll_gdiobj.o: ../../src/msw/gdiobj.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_gsockmsw.o: ../../src/msw/gsockmsw.c - $(CC) -c -o $@ $(MONODLL_CFLAGS) $< -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 +$(OBJS)\monodll_gsockmsw.o: ../../src/msw/gsockmsw.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif @@ -4056,11 +4764,6 @@ $(OBJS)\monodll_minifram.o: ../../src/msw/minifram.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_dataobj.o: ../../src/msw/ole/dataobj.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -4081,11 +4784,6 @@ $(OBJS)\monodll_oleutils.o: ../../src/msw/ole/oleutils.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) $(OBJS)\monodll_palette.o: ../../src/msw/palette.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -4156,6 +4854,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 @@ -4301,20 +5019,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 @@ -4511,6 +5215,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) $< @@ -4826,6 +5544,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) $< @@ -4886,6 +5609,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) $< @@ -4981,12 +5709,95 @@ $(OBJS)\monodll_vscroll.o: ../../src/generic/vscroll.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_calctrl.o: ../../src/generic/calctrl.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_datectlg.o: ../../src/generic/datectlg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_grid.o: ../../src/generic/grid.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_gridctrl.o: ../../src/generic/gridctrl.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_gridsel.o: ../../src/generic/gridsel.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_helpext.o: ../../src/generic/helpext.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_laywin.o: ../../src/generic/laywin.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_propdlg.o: ../../src/generic/propdlg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_sashwin.o: ../../src/generic/sashwin.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_splash.o: ../../src/generic/splash.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_tipdlg.o: ../../src/generic/tipdlg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_wizard.o: ../../src/generic/wizard.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_taskbarcmn.o: ../../src/common/taskbarcmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_sound.o: ../../src/msw/sound.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_taskbar.o: ../../src/msw/taskbar.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_joystick.o: ../../src/msw/joystick.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + $(OBJS)\monolib_dummy.o: ../../src/msw/dummy.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< $(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) $< @@ -5044,9 +5855,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) $< @@ -5092,6 +5900,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) $< @@ -5119,8 +5933,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) $< @@ -5149,12 +5963,18 @@ $(OBJS)\monolib_basemsw.o: ../../src/msw/basemsw.cpp $(OBJS)\monolib_crashrpt.o: ../../src/msw/crashrpt.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_debughlp.o: ../../src/msw/debughlp.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_dde.o: ../../src/msw/dde.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_dir.o: ../../src/msw/dir.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_dlmsw.o: ../../src/msw/dlmsw.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_mimetype.o: ../../src/msw/mimetype.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -5167,6 +5987,12 @@ $(OBJS)\monolib_registry.o: ../../src/msw/registry.cpp $(OBJS)\monolib_snglinst.o: ../../src/msw/snglinst.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_stackwalk.o: ../../src/msw/stackwalk.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_stdpaths.o: ../../src/msw/stdpaths.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_thread.o: ../../src/msw/thread.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -5227,19 +6053,22 @@ $(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) $< $(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 @@ -5293,6 +6122,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) $< @@ -5362,49 +6194,13 @@ $(OBJS)\monolib_metal.o: ../../src/univ/themes/metal.cpp $(OBJS)\monolib_win32.o: ../../src/univ/themes/win32.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_calctrl.o: ../../src/generic/calctrl.cpp +$(OBJS)\monolib_datectrl.o: ../../src/msw/datectrl.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_dcbuffer.o: ../../src/generic/dcbuffer.cpp +$(OBJS)\monolib_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_grid.o: ../../src/generic/grid.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_gridctrl.o: ../../src/generic/gridctrl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_gridsel.o: ../../src/generic/gridsel.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_helpext.o: ../../src/generic/helpext.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_laywin.o: ../../src/generic/laywin.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_sashwin.o: ../../src/generic/sashwin.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_splash.o: ../../src/generic/splash.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_tipdlg.o: ../../src/generic/tipdlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_wizard.o: ../../src/generic/wizard.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_taskbarcmn.o: ../../src/common/taskbarcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_joystick.o: ../../src/msw/joystick.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_taskbar.o: ../../src/msw/taskbar.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_wave.o: ../../src/msw/wave.cpp +$(OBJS)\monolib_mediactrl.o: ../../src/msw/mediactrl.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_helpbest.o: ../../src/msw/helpbest.cpp @@ -5479,9 +6275,144 @@ $(OBJS)\monolib_db.o: ../../src/common/db.cpp $(OBJS)\monolib_dbtable.o: ../../src/common/dbtable.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_debugrpt.o: ../../src/common/debugrpt.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_dbgrptg.o: ../../src/generic/dbgrptg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + $(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_choicbk.o: ../../src/xrc/xh_choicbk.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_combo.o: ../../src/xrc/xh_combo.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_dlg.o: ../../src/xrc/xh_dlg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_frame.o: ../../src/xrc/xh_frame.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_mdi.o: ../../src/xrc/xh_mdi.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_listbk.o: ../../src/xrc/xh_listbk.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_xh_listc.o: ../../src/xrc/xh_listc.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +$(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) $< @@ -5563,11 +6494,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) $< @@ -5609,17 +6535,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 @@ -5633,11 +6549,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) $< @@ -5658,11 +6569,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) $< @@ -5733,6 +6639,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 @@ -5878,20 +6804,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 @@ -6088,6 +7000,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) $< @@ -6403,6 +7329,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) $< @@ -6463,6 +7394,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) $< @@ -6558,12 +7494,98 @@ $(OBJS)\monolib_vscroll.o: ../../src/generic/vscroll.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_calctrl.o: ../../src/generic/calctrl.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_datectlg.o: ../../src/generic/datectlg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_grid.o: ../../src/generic/grid.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_gridctrl.o: ../../src/generic/gridctrl.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_gridsel.o: ../../src/generic/gridsel.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_helpext.o: ../../src/generic/helpext.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_laywin.o: ../../src/generic/laywin.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_propdlg.o: ../../src/generic/propdlg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_sashwin.o: ../../src/generic/sashwin.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_splash.o: ../../src/generic/splash.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_tipdlg.o: ../../src/generic/tipdlg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_wizard.o: ../../src/generic/wizard.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_taskbarcmn.o: ../../src/common/taskbarcmn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_sound.o: ../../src/msw/sound.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_taskbar.o: ../../src/msw/taskbar.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_joystick.o: ../../src/msw/joystick.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + $(OBJS)\basedll_dummy.o: ../../src/msw/dummy.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_version_rc.o: ../../src/msw/version.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) --include-dir ..\../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG) + $(OBJS)\basedll_appbase.o: ../../src/common/appbase.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< +$(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) $< @@ -6621,9 +7643,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) $< @@ -6669,6 +7688,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) $< @@ -6696,8 +7721,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) $< @@ -6726,12 +7751,18 @@ $(OBJS)\basedll_basemsw.o: ../../src/msw/basemsw.cpp $(OBJS)\basedll_crashrpt.o: ../../src/msw/crashrpt.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_debughlp.o: ../../src/msw/debughlp.cpp + $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_dde.o: ../../src/msw/dde.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< $(OBJS)\basedll_dir.o: ../../src/msw/dir.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_dlmsw.o: ../../src/msw/dlmsw.cpp + $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_mimetype.o: ../../src/msw/mimetype.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -6744,6 +7775,12 @@ $(OBJS)\basedll_registry.o: ../../src/msw/registry.cpp $(OBJS)\basedll_snglinst.o: ../../src/msw/snglinst.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_stackwalk.o: ../../src/msw/stackwalk.cpp + $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< + +$(OBJS)\basedll_stdpaths.o: ../../src/msw/stdpaths.cpp + $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_thread.o: ../../src/msw/thread.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -6780,6 +7817,9 @@ $(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) $< @@ -6837,9 +7877,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) $< @@ -6885,6 +7922,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) $< @@ -6912,8 +7955,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) $< @@ -6942,12 +7985,18 @@ $(OBJS)\baselib_basemsw.o: ../../src/msw/basemsw.cpp $(OBJS)\baselib_crashrpt.o: ../../src/msw/crashrpt.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_debughlp.o: ../../src/msw/debughlp.cpp + $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_dde.o: ../../src/msw/dde.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< $(OBJS)\baselib_dir.o: ../../src/msw/dir.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_dlmsw.o: ../../src/msw/dlmsw.cpp + $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_mimetype.o: ../../src/msw/mimetype.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6960,6 +8009,12 @@ $(OBJS)\baselib_registry.o: ../../src/msw/registry.cpp $(OBJS)\baselib_snglinst.o: ../../src/msw/snglinst.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_stackwalk.o: ../../src/msw/stackwalk.cpp + $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< + +$(OBJS)\baselib_stdpaths.o: ../../src/msw/stdpaths.cpp + $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_thread.o: ../../src/msw/thread.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6993,6 +8048,9 @@ $(OBJS)\baselib_volume.o: ../../src/msw/volume.cpp $(OBJS)\netdll_dummy.o: ../../src/msw/dummy.cpp $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $< +$(OBJS)\netdll_version_rc.o: ../../src/msw/version.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) --include-dir ..\../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_gcc$(VENDORTAG) + $(OBJS)\netdll_fs_inet.o: ../../src/common/fs_inet.cpp $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $< @@ -7023,8 +8081,11 @@ $(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) $< $(OBJS)\netlib_dummy.o: ../../src/msw/dummy.cpp $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $< @@ -7059,12 +8120,18 @@ $(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) $< $(OBJS)\coredll_dummy.o: ../../src/msw/dummy.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_version_rc.o: ../../src/msw/version.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) --include-dir ..\../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_gcc$(VENDORTAG) + $(OBJS)\coredll_event.o: ../../src/common/event.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7089,13 +8156,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 @@ -7149,6 +8216,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) $< @@ -7293,11 +8363,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) $< @@ -7339,17 +8404,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 @@ -7363,11 +8418,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) $< @@ -7388,11 +8438,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) $< @@ -7444,22 +8489,42 @@ $(OBJS)\coredll_tooltip.o: ../../src/msw/tooltip.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\coredll_toplevel.o: ../../src/msw/toplevel.cpp +$(OBJS)\coredll_toplevel.o: ../../src/msw/toplevel.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_utilsgui.o: ../../src/msw/utilsgui.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_uxtheme.o: ../../src/msw/uxtheme.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< +endif + +ifeq ($(USE_GUI),1) +$(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_utilsgui.o: ../../src/msw/utilsgui.cpp +$(OBJS)\coredll_helpwin.o: ../../src/msw/helpwin.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\coredll_uxtheme.o: ../../src/msw/uxtheme.cpp +$(OBJS)\coredll_automtn.o: ../../src/msw/ole/automtn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) -$(OBJS)\coredll_window.o: ../../src/msw/window.cpp +$(OBJS)\coredll_uuid.o: ../../src/msw/ole/uuid.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif @@ -7608,20 +8673,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 @@ -7818,6 +8869,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) $< @@ -8133,6 +9198,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) $< @@ -8193,6 +9263,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) $< @@ -8315,13 +9390,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 @@ -8375,6 +9450,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) $< @@ -8519,11 +9597,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) $< @@ -8565,17 +9638,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 @@ -8589,11 +9652,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) $< @@ -8614,11 +9672,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) $< @@ -8689,6 +9742,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 @@ -8834,20 +9907,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 @@ -9044,6 +10103,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) $< @@ -9359,6 +10432,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) $< @@ -9419,6 +10497,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) $< @@ -9517,10 +10600,16 @@ endif $(OBJS)\advdll_dummy.o: ../../src/msw/dummy.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< +$(OBJS)\advdll_version_rc.o: ../../src/msw/version.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) --include-dir ..\../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_gcc$(VENDORTAG) + +$(OBJS)\advdll_datectrl.o: ../../src/msw/datectrl.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< + $(OBJS)\advdll_calctrl.o: ../../src/generic/calctrl.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< -$(OBJS)\advdll_dcbuffer.o: ../../src/generic/dcbuffer.cpp +$(OBJS)\advdll_datectlg.o: ../../src/generic/datectlg.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< $(OBJS)\advdll_grid.o: ../../src/generic/grid.cpp @@ -9538,6 +10627,9 @@ $(OBJS)\advdll_helpext.o: ../../src/generic/helpext.cpp $(OBJS)\advdll_laywin.o: ../../src/generic/laywin.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< +$(OBJS)\advdll_propdlg.o: ../../src/generic/propdlg.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< + $(OBJS)\advdll_sashwin.o: ../../src/generic/sashwin.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< @@ -9553,22 +10645,25 @@ $(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 +$(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_wave.o: ../../src/msw/wave.cpp +$(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_datectrl.o: ../../src/msw/datectrl.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< + $(OBJS)\advlib_calctrl.o: ../../src/generic/calctrl.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< -$(OBJS)\advlib_dcbuffer.o: ../../src/generic/dcbuffer.cpp +$(OBJS)\advlib_datectlg.o: ../../src/generic/datectlg.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< $(OBJS)\advlib_grid.o: ../../src/generic/grid.cpp @@ -9586,6 +10681,9 @@ $(OBJS)\advlib_helpext.o: ../../src/generic/helpext.cpp $(OBJS)\advlib_laywin.o: ../../src/generic/laywin.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< +$(OBJS)\advlib_propdlg.o: ../../src/generic/propdlg.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< + $(OBJS)\advlib_sashwin.o: ../../src/generic/sashwin.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< @@ -9601,18 +10699,42 @@ $(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 +$(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_wave.o: ../../src/msw/wave.cpp +$(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_version_rc.o: ../../src/msw/version.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) --include-dir ..\../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG) + +$(OBJS)\mediadll_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp + $(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $< + +$(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) $< +$(OBJS)\odbcdll_version_rc.o: ../../src/msw/version.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) --include-dir ..\../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_gcc$(VENDORTAG) + $(OBJS)\odbcdll_db.o: ../../src/common/db.cpp $(CXX) -c -o $@ $(ODBCDLL_CXXFLAGS) $< @@ -9631,6 +10753,9 @@ $(OBJS)\odbclib_dbtable.o: ../../src/common/dbtable.cpp $(OBJS)\dbgriddll_dummy.o: ../../src/msw/dummy.cpp $(CXX) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $< +$(OBJS)\dbgriddll_version_rc.o: ../../src/msw/version.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) --include-dir ..\../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_gcc$(VENDORTAG) + $(OBJS)\dbgriddll_dbgrid.o: ../../src/common/dbgrid.cpp $(CXX) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $< @@ -9643,6 +10768,9 @@ $(OBJS)\dbgridlib_dbgrid.o: ../../src/common/dbgrid.cpp $(OBJS)\htmldll_dummy.o: ../../src/msw/dummy.cpp $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $< +$(OBJS)\htmldll_version_rc.o: ../../src/msw/version.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) --include-dir ..\../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_gcc$(VENDORTAG) + $(OBJS)\htmldll_helpbest.o: ../../src/msw/helpbest.cpp $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $< @@ -9778,9 +10906,33 @@ $(OBJS)\htmllib_winpars.o: ../../src/html/winpars.cpp $(OBJS)\htmllib_htmllbox.o: ../../src/generic/htmllbox.cpp $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $< +$(OBJS)\qadll_dummy.o: ../../src/msw/dummy.cpp + $(CXX) -c -o $@ $(QADLL_CXXFLAGS) $< + +$(OBJS)\qadll_version_rc.o: ../../src/msw/version.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) --include-dir ..\../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_gcc$(VENDORTAG) + +$(OBJS)\qadll_debugrpt.o: ../../src/common/debugrpt.cpp + $(CXX) -c -o $@ $(QADLL_CXXFLAGS) $< + +$(OBJS)\qadll_dbgrptg.o: ../../src/generic/dbgrptg.cpp + $(CXX) -c -o $@ $(QADLL_CXXFLAGS) $< + +$(OBJS)\qalib_dummy.o: ../../src/msw/dummy.cpp + $(CXX) -c -o $@ $(QALIB_CXXFLAGS) $< + +$(OBJS)\qalib_debugrpt.o: ../../src/common/debugrpt.cpp + $(CXX) -c -o $@ $(QALIB_CXXFLAGS) $< + +$(OBJS)\qalib_dbgrptg.o: ../../src/generic/dbgrptg.cpp + $(CXX) -c -o $@ $(QALIB_CXXFLAGS) $< + $(OBJS)\xmldll_dummy.o: ../../src/msw/dummy.cpp $(CXX) -c -o $@ $(XMLDLL_CXXFLAGS) $< +$(OBJS)\xmldll_version_rc.o: ../../src/msw/version.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) --include-dir ..\../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_gcc$(VENDORTAG) + $(OBJS)\xmldll_xml.o: ../../src/xml/xml.cpp $(CXX) -c -o $@ $(XMLDLL_CXXFLAGS) $< @@ -9796,9 +10948,279 @@ $(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_version_rc.o: ../../src/msw/version.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) --include-dir ..\../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_gcc$(VENDORTAG) + +$(OBJS)\xrcdll_xh_bmpbt.o: ../../src/xrc/xh_bmpbt.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(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_choicbk.o: ../../src/xrc/xh_choicbk.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_combo.o: ../../src/xrc/xh_combo.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_dlg.o: ../../src/xrc/xh_dlg.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_frame.o: ../../src/xrc/xh_frame.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_mdi.o: ../../src/xrc/xh_mdi.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_listbk.o: ../../src/xrc/xh_listbk.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(OBJS)\xrcdll_xh_listc.o: ../../src/xrc/xh_listc.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +$(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_choicbk.o: ../../src/xrc/xh_choicbk.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_combo.o: ../../src/xrc/xh_combo.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_dlg.o: ../../src/xrc/xh_dlg.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_frame.o: ../../src/xrc/xh_frame.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_mdi.o: ../../src/xrc/xh_mdi.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_listbk.o: ../../src/xrc/xh_listbk.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(OBJS)\xrclib_xh_listc.o: ../../src/xrc/xh_listc.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +$(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) $< +$(OBJS)\gldll_version_rc.o: ../../src/msw/version.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_49) $(__DEBUG_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) $(__UNICODE_DEFINE_p_50) --include-dir ..\../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG) + $(OBJS)\gldll_glcanvas.o: ../../src/msw/glcanvas.cpp $(CXX) -c -o $@ $(GLDLL_CXXFLAGS) $< @@ -9809,3 +11231,5 @@ $(OBJS)\gllib_glcanvas.o: ../../src/msw/glcanvas.cpp $(CXX) -c -o $@ $(GLLIB_CXXFLAGS) $< .PHONY: all clean setup_h samples build_cfg_file + +