X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec08d395bd37d7446787f5539b40a8ed5283654c..9c54e4ae1f401a9c337b97b588e5a356d79cbe82:/build/msw/makefile.gcc diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 0b15cc1969..483798a2f8 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -12,11 +12,12 @@ include config.gcc ### Variables: ### -ADVDLL_CXXFLAGS = $(CPPFLAGS) $(__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 $(CXXFLAGS) +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_14) \ + $(CPPFLAGS) $(CXXFLAGS) ADVDLL_OBJECTS = \ $(OBJS)\advdll_dummy.o \ $(OBJS)\advdll_calctrl.o \ @@ -34,11 +35,11 @@ ADVDLL_OBJECTS = \ $(OBJS)\advdll_joystick.o \ $(OBJS)\advdll_taskbar.o \ $(OBJS)\advdll_wave.o -ADVLIB_CXXFLAGS = $(CPPFLAGS) $(__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 $(CXXFLAGS) +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_14) $(CPPFLAGS) $(CXXFLAGS) ADVLIB_OBJECTS = \ $(OBJS)\advlib_dummy.o \ $(OBJS)\advlib_calctrl.o \ @@ -56,18 +57,17 @@ ADVLIB_OBJECTS = \ $(OBJS)\advlib_joystick.o \ $(OBJS)\advlib_taskbar.o \ $(OBJS)\advlib_wave.o -BASEDLL_CFLAGS = $(CPPFLAGS) $(__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 \ - $(CFLAGS) -BASEDLL_CXXFLAGS = $(CPPFLAGS) $(__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 \ - $(CXXFLAGS) +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_14) $(CPPFLAGS) $(CXXFLAGS) BASEDLL_OBJECTS = \ $(OBJS)\basedll_dummy.o \ $(OBJS)\basedll_appbase.o \ @@ -90,6 +90,7 @@ 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 \ @@ -140,16 +141,17 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_main.o \ $(OBJS)\basedll_mslu.o \ $(OBJS)\basedll_volume.o -BASELIB_CFLAGS = $(CPPFLAGS) $(__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 $(CFLAGS) -BASELIB_CXXFLAGS = $(CPPFLAGS) $(__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 $(CXXFLAGS) +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_14) \ + $(CPPFLAGS) $(CXXFLAGS) BASELIB_OBJECTS = \ $(OBJS)\baselib_dummy.o \ $(OBJS)\baselib_appbase.o \ @@ -172,6 +174,7 @@ 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 \ @@ -222,18 +225,18 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_main.o \ $(OBJS)\baselib_mslu.o \ $(OBJS)\baselib_volume.o -COREDLL_CFLAGS = $(CPPFLAGS) $(__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 \ - $(CFLAGS) -COREDLL_CXXFLAGS = $(CPPFLAGS) $(__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 \ - $(CXXFLAGS) +BUILD_CFG_FILE = $(SETUPHDIR)\build.cfg +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_14) $(CPPFLAGS) $(CXXFLAGS) COREDLL_OBJECTS = \ $(OBJS)\coredll_dummy.o \ $(OBJS)\coredll_event.o \ @@ -244,16 +247,17 @@ COREDLL_OBJECTS = \ $(OBJS)\coredll_mslu.o \ $(OBJS)\coredll_volume.o \ $(____CORE_SRC_FILENAMES_2_OBJECTS) -CORELIB_CFLAGS = $(CPPFLAGS) $(__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 $(CFLAGS) -CORELIB_CXXFLAGS = $(CPPFLAGS) $(__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 $(CXXFLAGS) +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_14) $(CPPFLAGS) \ + $(CXXFLAGS) CORELIB_OBJECTS = \ $(OBJS)\corelib_dummy.o \ $(OBJS)\corelib_event.o \ @@ -264,43 +268,47 @@ CORELIB_OBJECTS = \ $(OBJS)\corelib_mslu.o \ $(OBJS)\corelib_volume.o \ $(____CORE_SRC_FILENAMES_3_OBJECTS) -DBGRIDDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ +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 $(CXXFLAGS) + -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_DBGRID $(__EXCEPTIONSFLAG) \ + $(__EXCEPTIONSFLAG_14) $(CPPFLAGS) $(CXXFLAGS) DBGRIDDLL_OBJECTS = \ $(OBJS)\dbgriddll_dummy.o \ $(OBJS)\dbgriddll_dbgrid.o -DBGRIDLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ +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 $(CXXFLAGS) + -I..\..\src\expat\lib $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_14) \ + $(CPPFLAGS) $(CXXFLAGS) DBGRIDLIB_OBJECTS = \ $(OBJS)\dbgridlib_dummy.o \ $(OBJS)\dbgridlib_dbgrid.o -GLDLL_CXXFLAGS = $(CPPFLAGS) $(__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 $(CXXFLAGS) +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_14) \ + $(CPPFLAGS) $(CXXFLAGS) GLDLL_OBJECTS = \ $(OBJS)\gldll_dummy.o \ $(OBJS)\gldll_glcanvas.o -GLLIB_CXXFLAGS = $(CPPFLAGS) $(__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 $(CXXFLAGS) +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_14) $(CPPFLAGS) $(CXXFLAGS) GLLIB_OBJECTS = \ $(OBJS)\gllib_dummy.o \ $(OBJS)\gllib_glcanvas.o -HTMLDLL_CXXFLAGS = $(CPPFLAGS) $(__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 $(CXXFLAGS) +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_14) \ + $(CPPFLAGS) $(CXXFLAGS) HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_dummy.o \ $(OBJS)\htmldll_helpbest.o \ @@ -325,11 +333,11 @@ HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_m_tables.o \ $(OBJS)\htmldll_winpars.o \ $(OBJS)\htmldll_htmllbox.o -HTMLLIB_CXXFLAGS = $(CPPFLAGS) $(__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 $(CXXFLAGS) +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_14) $(CPPFLAGS) $(CXXFLAGS) HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_dummy.o \ $(OBJS)\htmllib_helpbest.o \ @@ -358,20 +366,22 @@ MAKEARGS = CPPFLAGS="$(CPPFLAGS)" DEBUG_FLAG="$(DEBUG_FLAG)" \ LDFLAGS="$(LDFLAGS)" CC="$(CC)" USE_GUI="$(USE_GUI)" \ MONOLITHIC="$(MONOLITHIC)" CXXFLAGS="$(CXXFLAGS)" \ GCC_VERSION="$(GCC_VERSION)" USE_HTML="$(USE_HTML)" BUILD="$(BUILD)" \ - DEBUG_INFO="$(DEBUG_INFO)" VENDOR="$(VENDOR)" UNICODE="$(UNICODE)" \ - OFFICIAL_BUILD="$(OFFICIAL_BUILD)" MSLU="$(MSLU)" WXUNIV="$(WXUNIV)" \ - RUNTIME_LIBS="$(RUNTIME_LIBS)" CXX="$(CXX)" CFG="$(CFG)" CFLAGS="$(CFLAGS)" \ - SHARED="$(SHARED)" USE_ODBC="$(USE_ODBC)" USE_OPENGL="$(USE_OPENGL)" -MONODLL_CFLAGS = $(CPPFLAGS) $(__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 $(CFLAGS) -MONODLL_CXXFLAGS = $(CPPFLAGS) $(__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 $(CXXFLAGS) + DEBUG_INFO="$(DEBUG_INFO)" USE_EXCEPTIONS="$(USE_EXCEPTIONS)" \ + VENDOR="$(VENDOR)" UNICODE="$(UNICODE)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \ + MSLU="$(MSLU)" WXUNIV="$(WXUNIV)" RUNTIME_LIBS="$(RUNTIME_LIBS)" \ + CXX="$(CXX)" CFG="$(CFG)" CFLAGS="$(CFLAGS)" SHARED="$(SHARED)" \ + USE_ODBC="$(USE_ODBC)" USE_OPENGL="$(USE_OPENGL)" +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_14) \ + $(CPPFLAGS) $(CXXFLAGS) MONODLL_OBJECTS = \ $(OBJS)\monodll_dummy.o \ $(OBJS)\monodll_appbase.o \ @@ -394,6 +404,7 @@ 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 \ @@ -458,16 +469,17 @@ MONODLL_OBJECTS = \ $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \ $(OBJS)\monodll_xml.o \ $(OBJS)\monodll_xtixml.o -MONOLIB_CFLAGS = $(CPPFLAGS) $(__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 $(CFLAGS) -MONOLIB_CXXFLAGS = $(CPPFLAGS) $(__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 $(CXXFLAGS) +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_14) $(CPPFLAGS) \ + $(CXXFLAGS) MONOLIB_OBJECTS = \ $(OBJS)\monolib_dummy.o \ $(OBJS)\monolib_appbase.o \ @@ -490,6 +502,7 @@ 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 \ @@ -554,17 +567,17 @@ MONOLIB_OBJECTS = \ $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \ $(OBJS)\monolib_xml.o \ $(OBJS)\monolib_xtixml.o -NETDLL_CFLAGS = $(CPPFLAGS) $(__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 $(CFLAGS) -NETDLL_CXXFLAGS = $(CPPFLAGS) $(__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 \ - $(CXXFLAGS) +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_14) $(CPPFLAGS) $(CXXFLAGS) NETDLL_OBJECTS = \ $(OBJS)\netdll_dummy.o \ $(OBJS)\netdll_fs_inet.o \ @@ -578,16 +591,17 @@ NETDLL_OBJECTS = \ $(OBJS)\netdll_socket.o \ $(OBJS)\netdll_url.o \ $(OBJS)\netdll_gsocket.o -NETLIB_CFLAGS = $(CPPFLAGS) $(__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 $(CFLAGS) -NETLIB_CXXFLAGS = $(CPPFLAGS) $(__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 $(CXXFLAGS) +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_14) $(CPPFLAGS) \ + $(CXXFLAGS) NETLIB_OBJECTS = \ $(OBJS)\netlib_dummy.o \ $(OBJS)\netlib_fs_inet.o \ @@ -603,36 +617,36 @@ NETLIB_OBJECTS = \ $(OBJS)\netlib_gsocket.o OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -ODBCDLL_CXXFLAGS = $(CPPFLAGS) $(__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 \ - $(CXXFLAGS) +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_14) $(CPPFLAGS) $(CXXFLAGS) ODBCDLL_OBJECTS = \ $(OBJS)\odbcdll_dummy.o \ $(OBJS)\odbcdll_db.o \ $(OBJS)\odbcdll_dbtable.o -ODBCLIB_CXXFLAGS = $(CPPFLAGS) $(__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 $(CXXFLAGS) +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_14) $(CPPFLAGS) \ + $(CXXFLAGS) ODBCLIB_OBJECTS = \ $(OBJS)\odbclib_dummy.o \ $(OBJS)\odbclib_db.o \ $(OBJS)\odbclib_dbtable.o SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXEXPAT_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H $(____LIBDIRNAME_FILENAMES_6_p) -DCOMPILED_FROM_DSP \ - $(CFLAGS) +WXEXPAT_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + $(____LIBDIRNAME_FILENAMES_6_p) -DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS) WXEXPAT_OBJECTS = \ $(OBJS)\wxexpat_xmlparse.o \ $(OBJS)\wxexpat_xmlrole.o \ $(OBJS)\wxexpat_xmltok.o -WXJPEG_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -I$(SETUPHDIR) $(CFLAGS) +WXJPEG_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + -I$(SETUPHDIR) $(CPPFLAGS) $(CFLAGS) WXJPEG_OBJECTS = \ $(OBJS)\wxjpeg_jcomapi.o \ $(OBJS)\wxjpeg_jutils.o \ @@ -680,8 +694,8 @@ WXJPEG_OBJECTS = \ $(OBJS)\wxjpeg_jquant1.o \ $(OBJS)\wxjpeg_jquant2.o \ $(OBJS)\wxjpeg_jdmerge.o -WXPNG_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -I..\..\src\zlib $(CFLAGS) +WXPNG_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + -I..\..\src\zlib $(CPPFLAGS) $(CFLAGS) WXPNG_OBJECTS = \ $(OBJS)\wxpng_png.o \ $(OBJS)\wxpng_pngerror.o \ @@ -700,15 +714,15 @@ WXPNG_OBJECTS = \ $(OBJS)\wxpng_pngwrite.o \ $(OBJS)\wxpng_pngwtran.o \ $(OBJS)\wxpng_pngwutil.o -WXREGEX_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H $(CFLAGS) +WXREGEX_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + $(CPPFLAGS) $(CFLAGS) WXREGEX_OBJECTS = \ $(OBJS)\wxregex_regcomp.o \ $(OBJS)\wxregex_regexec.o \ $(OBJS)\wxregex_regerror.o \ $(OBJS)\wxregex_regfree.o -WXTIFF_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H $(CFLAGS) +WXTIFF_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + $(CPPFLAGS) $(CFLAGS) WXTIFF_OBJECTS = \ $(OBJS)\wxtiff_tif_win32.o \ $(OBJS)\wxtiff_tif_aux.o \ @@ -743,8 +757,8 @@ WXTIFF_OBJECTS = \ $(OBJS)\wxtiff_tif_warning.o \ $(OBJS)\wxtiff_tif_write.o \ $(OBJS)\wxtiff_tif_zip.o -WXZLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H $(CFLAGS) +WXZLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + $(CPPFLAGS) $(CFLAGS) WXZLIB_OBJECTS = \ $(OBJS)\wxzlib_adler32.o \ $(OBJS)\wxzlib_compress.o \ @@ -760,21 +774,22 @@ WXZLIB_OBJECTS = \ $(OBJS)\wxzlib_infcodes.o \ $(OBJS)\wxzlib_infutil.o \ $(OBJS)\wxzlib_inffast.o -XMLDLL_CXXFLAGS = $(CPPFLAGS) $(__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 \ - $(CXXFLAGS) +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_14) $(CPPFLAGS) $(CXXFLAGS) XMLDLL_OBJECTS = \ $(OBJS)\xmldll_dummy.o \ $(OBJS)\xmldll_xml.o \ $(OBJS)\xmldll_xtixml.o -XMLLIB_CXXFLAGS = $(CPPFLAGS) $(__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 $(CXXFLAGS) +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_14) $(CPPFLAGS) \ + $(CXXFLAGS) XMLLIB_OBJECTS = \ $(OBJS)\xmllib_dummy.o \ $(OBJS)\xmllib_xml.o \ @@ -844,6 +859,18 @@ endif ifeq ($(DEBUG_FLAG),1) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif +ifeq ($(USE_EXCEPTIONS),0) +__EXCEPTIONSFLAG = -fno-rtti +endif +ifeq ($(USE_EXCEPTIONS),1) +__EXCEPTIONSFLAG = +endif +ifeq ($(USE_EXCEPTIONS),0) +__EXCEPTIONSFLAG_14 = -fno-exceptions +endif +ifeq ($(USE_EXCEPTIONS),1) +__EXCEPTIONSFLAG_14 = +endif ifeq ($(USE_GUI),1) __LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) endif @@ -938,6 +965,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_uxtheme.o \ $(OBJS)\monolib_window.o \ $(OBJS)\monolib_statusbr.o \ + $(OBJS)\monolib_prntdlgg.o \ $(OBJS)\monolib_accel.o \ $(OBJS)\monolib_bmpbuttn.o \ $(OBJS)\monolib_button.o \ @@ -1013,6 +1041,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_fontmap.o \ $(OBJS)\monolib_framecmn.o \ $(OBJS)\monolib_gaugecmn.o \ + $(OBJS)\monolib_gbsizer.o \ $(OBJS)\monolib_gdicmn.o \ $(OBJS)\monolib_geometry.o \ $(OBJS)\monolib_gifdecod.o \ @@ -1209,6 +1238,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_fontmap.o \ $(OBJS)\monolib_framecmn.o \ $(OBJS)\monolib_gaugecmn.o \ + $(OBJS)\monolib_gbsizer.o \ $(OBJS)\monolib_gdicmn.o \ $(OBJS)\monolib_geometry.o \ $(OBJS)\monolib_gifdecod.o \ @@ -1327,6 +1357,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_uxtheme.o \ $(OBJS)\coredll_window.o \ $(OBJS)\coredll_statusbr.o \ + $(OBJS)\coredll_prntdlgg.o \ $(OBJS)\coredll_accel.o \ $(OBJS)\coredll_bmpbuttn.o \ $(OBJS)\coredll_button.o \ @@ -1402,6 +1433,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_fontmap.o \ $(OBJS)\coredll_framecmn.o \ $(OBJS)\coredll_gaugecmn.o \ + $(OBJS)\coredll_gbsizer.o \ $(OBJS)\coredll_gdicmn.o \ $(OBJS)\coredll_geometry.o \ $(OBJS)\coredll_gifdecod.o \ @@ -1598,6 +1630,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_fontmap.o \ $(OBJS)\coredll_framecmn.o \ $(OBJS)\coredll_gaugecmn.o \ + $(OBJS)\coredll_gbsizer.o \ $(OBJS)\coredll_gdicmn.o \ $(OBJS)\coredll_geometry.o \ $(OBJS)\coredll_gifdecod.o \ @@ -1716,6 +1749,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_uxtheme.o \ $(OBJS)\corelib_window.o \ $(OBJS)\corelib_statusbr.o \ + $(OBJS)\corelib_prntdlgg.o \ $(OBJS)\corelib_accel.o \ $(OBJS)\corelib_bmpbuttn.o \ $(OBJS)\corelib_button.o \ @@ -1791,6 +1825,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_fontmap.o \ $(OBJS)\corelib_framecmn.o \ $(OBJS)\corelib_gaugecmn.o \ + $(OBJS)\corelib_gbsizer.o \ $(OBJS)\corelib_gdicmn.o \ $(OBJS)\corelib_geometry.o \ $(OBJS)\corelib_gifdecod.o \ @@ -1987,6 +2022,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_fontmap.o \ $(OBJS)\corelib_framecmn.o \ $(OBJS)\corelib_gaugecmn.o \ + $(OBJS)\corelib_gbsizer.o \ $(OBJS)\corelib_gdicmn.o \ $(OBJS)\corelib_geometry.o \ $(OBJS)\corelib_gifdecod.o \ @@ -2105,6 +2141,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_uxtheme.o \ $(OBJS)\monodll_window.o \ $(OBJS)\monodll_statusbr.o \ + $(OBJS)\monodll_prntdlgg.o \ $(OBJS)\monodll_accel.o \ $(OBJS)\monodll_bmpbuttn.o \ $(OBJS)\monodll_button.o \ @@ -2180,6 +2217,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_fontmap.o \ $(OBJS)\monodll_framecmn.o \ $(OBJS)\monodll_gaugecmn.o \ + $(OBJS)\monodll_gbsizer.o \ $(OBJS)\monodll_gdicmn.o \ $(OBJS)\monodll_geometry.o \ $(OBJS)\monodll_gifdecod.o \ @@ -2376,6 +2414,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_fontmap.o \ $(OBJS)\monodll_framecmn.o \ $(OBJS)\monodll_gaugecmn.o \ + $(OBJS)\monodll_gbsizer.o \ $(OBJS)\monodll_gdicmn.o \ $(OBJS)\monodll_geometry.o \ $(OBJS)\monodll_gifdecod.o \ @@ -2700,7 +2739,7 @@ $(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) +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 $(OBJS)\advdll_calctrl.o: ../../src/generic/calctrl.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< @@ -2879,6 +2918,9 @@ $(OBJS)\basedll_fs_mem.o: ../../src/common/fs_mem.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) $< @@ -3092,6 +3134,9 @@ $(OBJS)\baselib_fs_mem.o: ../../src/common/fs_mem.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) $< @@ -3723,6 +3768,11 @@ $(OBJS)\coredll_gaugecmn.o: ../../src/common/gaugecmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_gbsizer.o: ../../src/common/gbsizer.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_gdicmn.o: ../../src/common/gdicmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -4056,8 +4106,10 @@ $(OBJS)\coredll_prntbase.o: ../../src/common/prntbase.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) $(OBJS)\coredll_prntdlgg.o: ../../src/generic/prntdlgg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< +endif ifeq ($(USE_GUI),1) $(OBJS)\coredll_progdlgg.o: ../../src/generic/progdlgg.cpp @@ -4942,6 +4994,11 @@ $(OBJS)\corelib_gaugecmn.o: ../../src/common/gaugecmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_gbsizer.o: ../../src/common/gbsizer.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_gdicmn.o: ../../src/common/gdicmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -5275,8 +5332,10 @@ $(OBJS)\corelib_prntbase.o: ../../src/common/prntbase.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) $(OBJS)\corelib_prntdlgg.o: ../../src/generic/prntdlgg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< +endif ifeq ($(USE_GUI),1) $(OBJS)\corelib_progdlgg.o: ../../src/generic/progdlgg.cpp @@ -6416,6 +6475,11 @@ $(OBJS)\monodll_gaugecmn.o: ../../src/common/gaugecmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_gbsizer.o: ../../src/common/gbsizer.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_gdicmn.o: ../../src/common/gdicmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -6461,6 +6525,9 @@ endif $(OBJS)\monodll_gtk.o: ../../src/univ/themes/gtk.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) $< @@ -6878,8 +6945,10 @@ $(OBJS)\monodll_prntbase.o: ../../src/common/prntbase.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) $(OBJS)\monodll_prntdlgg.o: ../../src/generic/prntdlgg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< +endif $(OBJS)\monodll_process.o: ../../src/common/process.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -7983,6 +8052,11 @@ $(OBJS)\monolib_gaugecmn.o: ../../src/common/gaugecmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_gbsizer.o: ../../src/common/gbsizer.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_gdicmn.o: ../../src/common/gdicmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -8028,6 +8102,9 @@ endif $(OBJS)\monolib_gtk.o: ../../src/univ/themes/gtk.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) $< @@ -8445,8 +8522,10 @@ $(OBJS)\monolib_prntbase.o: ../../src/common/prntbase.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< endif +ifeq ($(USE_GUI),1) $(OBJS)\monolib_prntdlgg.o: ../../src/generic/prntdlgg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +endif $(OBJS)\monolib_process.o: ../../src/common/process.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -9453,6 +9532,35 @@ $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a: $(BASELIB_OBJECTS) endif endif +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 BUILD=$(BUILD) >>$(BUILD_CFG_FILE) + @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) + @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) + @echo UNICODE=$(UNICODE) >>$(BUILD_CFG_FILE) + @echo WXUNIV=$(WXUNIV) >>$(BUILD_CFG_FILE) + @echo CFG=$(CFG) >>$(BUILD_CFG_FILE) + @echo VENDOR=$(VENDOR) >>$(BUILD_CFG_FILE) + @echo OFFICIAL_BUILD=$(OFFICIAL_BUILD) >>$(BUILD_CFG_FILE) + @echo DEBUG_FLAG=$(DEBUG_FLAG) >>$(BUILD_CFG_FILE) + @echo DEBUG_INFO=$(DEBUG_INFO) >>$(BUILD_CFG_FILE) + @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE) + @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE) + @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(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 COMPILER=gcc >>$(BUILD_CFG_FILE) + @echo CC=$(CC) >>$(BUILD_CFG_FILE) + @echo CXX=$(CXX) >>$(BUILD_CFG_FILE) + @echo CFLAGS=$(CFLAGS) >>$(BUILD_CFG_FILE) + @echo CPPFLAGS=$(CPPFLAGS) >>$(BUILD_CFG_FILE) + @echo CXXFLAGS=$(CXXFLAGS) >>$(BUILD_CFG_FILE) + @echo LDFLAGS=$(LDFLAGS) >>$(BUILD_CFG_FILE) + clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a del $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a @@ -9700,4 +9808,4 @@ $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.a: $(XMLLIB_OBJECTS) endif endif -.PHONY: all clean samples setup_h +.PHONY: all build_cfg_file clean samples setup_h