From 66a967448dcb70a19cc58bc8e10bcb6cbc60e04f Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 27 Jul 2003 23:00:22 +0000 Subject: [PATCH] separated wxBase and wxNet git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 435 +++++++++++++++++++++++++---------------- autoconf_inc.m4 | 48 ++--- build/makefile.bcc | 319 +++++++++++++++++------------- build/makefile.gcc | 321 +++++++++++++++++++------------ build/makefile.vc | 469 ++++++++++++++++++++++++++------------------- build/makefile.wat | 339 +++++++++++++++++++------------- configure | 50 ++--- 7 files changed, 1171 insertions(+), 810 deletions(-) diff --git a/Makefile.in b/Makefile.in index 4f2bc12a70..39dc4096f3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -80,12 +80,9 @@ BASEDLL_OBJECTS = \ basedll_filename.o \ basedll_filesys.o \ basedll_fmapbase.o \ - basedll_fs_inet.o \ basedll_fs_zip.o \ - basedll_ftp.o \ basedll_hash.o \ basedll_hashmap.o \ - basedll_http.o \ basedll_init.o \ basedll_intl.o \ basedll_ipcbase.o \ @@ -98,13 +95,7 @@ BASEDLL_OBJECTS = \ basedll_mstream.o \ basedll_object.o \ basedll_process.o \ - basedll_protocol.o \ basedll_regex.o \ - basedll_sckaddr.o \ - basedll_sckfile.o \ - basedll_sckipc.o \ - basedll_sckstrm.o \ - basedll_socket.o \ basedll_stopwatch.o \ basedll_strconv.o \ basedll_stream.o \ @@ -115,7 +106,6 @@ BASEDLL_OBJECTS = \ basedll_tokenzr.o \ basedll_txtstrm.o \ basedll_unzip.o \ - basedll_url.o \ basedll_variant.o \ basedll_wfstream.o \ basedll_wxchar.o \ @@ -157,12 +147,9 @@ BASELIB_OBJECTS = \ baselib_filename.o \ baselib_filesys.o \ baselib_fmapbase.o \ - baselib_fs_inet.o \ baselib_fs_zip.o \ - baselib_ftp.o \ baselib_hash.o \ baselib_hashmap.o \ - baselib_http.o \ baselib_init.o \ baselib_intl.o \ baselib_ipcbase.o \ @@ -175,13 +162,7 @@ BASELIB_OBJECTS = \ baselib_mstream.o \ baselib_object.o \ baselib_process.o \ - baselib_protocol.o \ baselib_regex.o \ - baselib_sckaddr.o \ - baselib_sckfile.o \ - baselib_sckipc.o \ - baselib_sckstrm.o \ - baselib_socket.o \ baselib_stopwatch.o \ baselib_strconv.o \ baselib_stream.o \ @@ -192,7 +173,6 @@ BASELIB_OBJECTS = \ baselib_tokenzr.o \ baselib_txtstrm.o \ baselib_unzip.o \ - baselib_url.o \ baselib_variant.o \ baselib_wfstream.o \ baselib_wxchar.o \ @@ -331,12 +311,9 @@ MONODLL_OBJECTS = \ monodll_filename.o \ monodll_filesys.o \ monodll_fmapbase.o \ - monodll_fs_inet.o \ monodll_fs_zip.o \ - monodll_ftp.o \ monodll_hash.o \ monodll_hashmap.o \ - monodll_http.o \ monodll_init.o \ monodll_intl.o \ monodll_ipcbase.o \ @@ -349,13 +326,7 @@ MONODLL_OBJECTS = \ monodll_mstream.o \ monodll_object.o \ monodll_process.o \ - monodll_protocol.o \ monodll_regex.o \ - monodll_sckaddr.o \ - monodll_sckfile.o \ - monodll_sckipc.o \ - monodll_sckstrm.o \ - monodll_socket.o \ monodll_stopwatch.o \ monodll_strconv.o \ monodll_stream.o \ @@ -366,7 +337,6 @@ MONODLL_OBJECTS = \ monodll_tokenzr.o \ monodll_txtstrm.o \ monodll_unzip.o \ - monodll_url.o \ monodll_variant.o \ monodll_wfstream.o \ monodll_wxchar.o \ @@ -378,6 +348,17 @@ MONODLL_OBJECTS = \ monodll_msgout.o \ monodll_utilscmn.o \ $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS) \ + monodll_fs_inet.o \ + monodll_ftp.o \ + monodll_http.o \ + monodll_protocol.o \ + monodll_url.o \ + monodll_sckfile.o \ + monodll_sckaddr.o \ + monodll_sckipc.o \ + monodll_sckstrm.o \ + monodll_socket.o \ + $(__NET_PLATFORM_SRC_OBJECTS) \ $(__MONOLIB_GUI_SRC_OBJECTS) \ monodll_xml.o MONOLIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @@ -410,12 +391,9 @@ MONOLIB_OBJECTS = \ monolib_filename.o \ monolib_filesys.o \ monolib_fmapbase.o \ - monolib_fs_inet.o \ monolib_fs_zip.o \ - monolib_ftp.o \ monolib_hash.o \ monolib_hashmap.o \ - monolib_http.o \ monolib_init.o \ monolib_intl.o \ monolib_ipcbase.o \ @@ -428,13 +406,7 @@ MONOLIB_OBJECTS = \ monolib_mstream.o \ monolib_object.o \ monolib_process.o \ - monolib_protocol.o \ monolib_regex.o \ - monolib_sckaddr.o \ - monolib_sckfile.o \ - monolib_sckipc.o \ - monolib_sckstrm.o \ - monolib_socket.o \ monolib_stopwatch.o \ monolib_strconv.o \ monolib_stream.o \ @@ -445,7 +417,6 @@ MONOLIB_OBJECTS = \ monolib_tokenzr.o \ monolib_txtstrm.o \ monolib_unzip.o \ - monolib_url.o \ monolib_variant.o \ monolib_wfstream.o \ monolib_wxchar.o \ @@ -457,8 +428,59 @@ MONOLIB_OBJECTS = \ monolib_msgout.o \ monolib_utilscmn.o \ $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1) \ + monolib_fs_inet.o \ + monolib_ftp.o \ + monolib_http.o \ + monolib_protocol.o \ + monolib_url.o \ + monolib_sckfile.o \ + monolib_sckaddr.o \ + monolib_sckipc.o \ + monolib_sckstrm.o \ + monolib_socket.o \ + $(__NET_PLATFORM_SRC_OBJECTS_1) \ $(__MONOLIB_GUI_SRC_OBJECTS_1) \ monolib_xml.o +NETDLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS) $(PIC_FLAG) +NETDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DWXUSINGDLL -DWXMAKINGDLL_NET $(CXXFLAGS) $(PIC_FLAG) +NETDLL_OBJECTS = \ + netdll_fs_inet.o \ + netdll_ftp.o \ + netdll_http.o \ + netdll_protocol.o \ + netdll_url.o \ + netdll_sckfile.o \ + netdll_sckaddr.o \ + netdll_sckipc.o \ + netdll_sckstrm.o \ + netdll_socket.o \ + $(__NET_PLATFORM_SRC_OBJECTS_2) +NETLIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS) +NETLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DWXUSINGDLL -DWXMAKINGDLL_NET $(CXXFLAGS) +NETLIB_OBJECTS = \ + netlib_fs_inet.o \ + netlib_ftp.o \ + netlib_http.o \ + netlib_protocol.o \ + netlib_url.o \ + netlib_sckfile.o \ + netlib_sckaddr.o \ + netlib_sckipc.o \ + netlib_sckstrm.o \ + netlib_socket.o \ + $(__NET_PLATFORM_SRC_OBJECTS_3) WXEXPAT_CFLAGS = $(CPPFLAGS) -I./src/expat $(CFLAGS) WXEXPAT_OBJECTS = \ wxexpat_xmlparse.o \ @@ -1045,8 +1067,7 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS = \ wx/generic/accel.h \ wx/generic/listctrl.h @COND_USE_GUI_1_WXUNIV_1@ALL_GUI_HEADERS = $(COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS) -@COND_PLATFORM_UNIX_1@BASE_PLATFORM_HDR = \ -@COND_PLATFORM_UNIX_1@ wx/unix/gsockunx.h wx/unix/mimetype.h +@COND_PLATFORM_UNIX_1@BASE_PLATFORM_HDR = wx/unix/mimetype.h COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR = \ wx/msw/dde.h \ wx/msw/gccpriv.h \ @@ -1635,6 +1656,10 @@ COND_TOOLKIT_X11_LOWLEVEL_HDR = \ wx/x11/window.h \ src/generic/timer.h @COND_TOOLKIT_X11@LOWLEVEL_HDR = $(COND_TOOLKIT_X11_LOWLEVEL_HDR) +@COND_PLATFORM_UNIX_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h +@COND_PLATFORM_WIN32_1@NET_PLATFORM_HDR = wx/msw/gsockmsw.h +@COND_TOOLKIT_COCOA@NET_PLATFORM_HDR = wx/unix/gsockunx.h +@COND_TOOLKIT_MAC@NET_PLATFORM_HDR = wx/mac/gsockmac.h @COND_TOOLKIT_GTK@OPENGL_HDR = wx/gtk/glcanvas.h @COND_TOOLKIT_MAC@OPENGL_HDR = wx/mac/glcanvas.h @COND_TOOLKIT_MOTIF@OPENGL_HDR = wx/motif/glcanvas.h @@ -1694,7 +1719,6 @@ COND_TOOLKIT_X11_LOWLEVEL_HDR = \ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS = \ monodll_baseunix.o \ monodll_dir.o \ - monodll_gsocket.o \ monodll_mimetype.o \ monodll_snglinst.o \ monodll_threadpsx.o @@ -1702,7 +1726,6 @@ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS = \ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS = \ monodll_baseunix.o \ monodll_dir.o \ - monodll_gsocket.o \ monodll_mimetype.o \ monodll_snglinst.o \ monodll_threadpsx.o @@ -1710,7 +1733,6 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS = \ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS = \ monodll_baseunix.o \ monodll_dirmac.o \ - monodll_gsocket.o \ monodll_mimetmac.o \ monodll_utils.o \ monodll_utilsexc.o @@ -1718,7 +1740,6 @@ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS = \ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_1 = \ monolib_baseunix.o \ monolib_dir.o \ - monolib_gsocket.o \ monolib_mimetype.o \ monolib_snglinst.o \ monolib_threadpsx.o @@ -1726,7 +1747,6 @@ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_1 = \ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1 = \ monolib_baseunix.o \ monolib_dir.o \ - monolib_gsocket.o \ monolib_mimetype.o \ monolib_snglinst.o \ monolib_threadpsx.o @@ -1734,7 +1754,6 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1 = \ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1 = \ monolib_baseunix.o \ monolib_dirmac.o \ - monolib_gsocket.o \ monolib_mimetmac.o \ monolib_utils.o \ monolib_utilsexc.o @@ -1742,7 +1761,6 @@ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1 = \ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_2 = \ basedll_baseunix.o \ basedll_dir.o \ - basedll_gsocket.o \ basedll_mimetype.o \ basedll_snglinst.o \ basedll_threadpsx.o @@ -1750,7 +1768,6 @@ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_2 = \ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2 = \ basedll_baseunix.o \ basedll_dir.o \ - basedll_gsocket.o \ basedll_mimetype.o \ basedll_snglinst.o \ basedll_threadpsx.o @@ -1758,7 +1775,6 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2 = \ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2 = \ basedll_baseunix.o \ basedll_dirmac.o \ - basedll_gsocket.o \ basedll_mimetmac.o \ basedll_utils.o \ basedll_utilsexc.o @@ -1766,7 +1782,6 @@ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2 = \ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_3 = \ baselib_baseunix.o \ baselib_dir.o \ - baselib_gsocket.o \ baselib_mimetype.o \ baselib_snglinst.o \ baselib_threadpsx.o @@ -1774,7 +1789,6 @@ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_3 = \ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3 = \ baselib_baseunix.o \ baselib_dir.o \ - baselib_gsocket.o \ baselib_mimetype.o \ baselib_snglinst.o \ baselib_threadpsx.o @@ -1782,7 +1796,6 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3 = \ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3 = \ baselib_baseunix.o \ baselib_dirmac.o \ - baselib_gsocket.o \ baselib_mimetmac.o \ baselib_utils.o \ baselib_utilsexc.o @@ -1792,14 +1805,11 @@ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3 = \ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS = \ monodll_baseunix.o \ monodll_dir.o \ - monodll_gsocket.o \ monodll_mimetype.o \ monodll_snglinst.o \ monodll_threadpsx.o @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS) COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \ - monodll_gsocket.o \ - monodll_gsockmsw.o \ monodll_basemsw.o \ monodll_dde.o \ monodll_dir.o \ @@ -1817,14 +1827,11 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ monolib_baseunix.o \ monolib_dir.o \ - monolib_gsocket.o \ monolib_mimetype.o \ monolib_snglinst.o \ monolib_threadpsx.o @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1) COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ - monolib_gsocket.o \ - monolib_gsockmsw.o \ monolib_basemsw.o \ monolib_dde.o \ monolib_dir.o \ @@ -1842,14 +1849,11 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ basedll_baseunix.o \ basedll_dir.o \ - basedll_gsocket.o \ basedll_mimetype.o \ basedll_snglinst.o \ basedll_threadpsx.o @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2) COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ - basedll_gsocket.o \ - basedll_gsockmsw.o \ basedll_basemsw.o \ basedll_dde.o \ basedll_dir.o \ @@ -1867,14 +1871,11 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ baselib_baseunix.o \ baselib_dir.o \ - baselib_gsocket.o \ baselib_mimetype.o \ baselib_snglinst.o \ baselib_threadpsx.o @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3) COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ - baselib_gsocket.o \ - baselib_gsockmsw.o \ baselib_basemsw.o \ baselib_dde.o \ baselib_dir.o \ @@ -5301,6 +5302,38 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ monolib_htmprint.o \ monolib_htmllbox.o @COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS_1 = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1) +@COND_TOOLKIT_COCOA@__NET_MACOSX_SRC_OBJECTS = monodll_gsocket.o +@COND_TOOLKIT_GTK@__NET_MACOSX_SRC_OBJECTS = monodll_gsocket.o +@COND_TOOLKIT_MAC@__NET_MACOSX_SRC_OBJECTS = monodll_gsocket.o +@COND_TOOLKIT_COCOA@__NET_MACOSX_SRC_OBJECTS_1 = monolib_gsocket.o +@COND_TOOLKIT_GTK@__NET_MACOSX_SRC_OBJECTS_1 = monolib_gsocket.o +@COND_TOOLKIT_MAC@__NET_MACOSX_SRC_OBJECTS_1 = monolib_gsocket.o +@COND_TOOLKIT_COCOA@__NET_MACOSX_SRC_OBJECTS_2 = netdll_gsocket.o +@COND_TOOLKIT_GTK@__NET_MACOSX_SRC_OBJECTS_2 = netdll_gsocket.o +@COND_TOOLKIT_MAC@__NET_MACOSX_SRC_OBJECTS_2 = netdll_gsocket.o +@COND_TOOLKIT_COCOA@__NET_MACOSX_SRC_OBJECTS_3 = netlib_gsocket.o +@COND_TOOLKIT_GTK@__NET_MACOSX_SRC_OBJECTS_3 = netlib_gsocket.o +@COND_TOOLKIT_MAC@__NET_MACOSX_SRC_OBJECTS_3 = netlib_gsocket.o +@COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS \ +@COND_PLATFORM_MACOSX_1@ = $(__NET_MACOSX_SRC_OBJECTS) +@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o +@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS = \ +@COND_PLATFORM_WIN32_1@ monodll_gsocket.o monodll_gsockmsw.o +@COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_1 \ +@COND_PLATFORM_MACOSX_1@ = $(__NET_MACOSX_SRC_OBJECTS_1) +@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o +@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_1 \ +@COND_PLATFORM_WIN32_1@ = monolib_gsocket.o monolib_gsockmsw.o +@COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_2 \ +@COND_PLATFORM_MACOSX_1@ = $(__NET_MACOSX_SRC_OBJECTS_2) +@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o +@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_2 \ +@COND_PLATFORM_WIN32_1@ = netdll_gsocket.o netdll_gsockmsw.o +@COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_3 \ +@COND_PLATFORM_MACOSX_1@ = $(__NET_MACOSX_SRC_OBJECTS_3) +@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o +@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_3 \ +@COND_PLATFORM_WIN32_1@ = netlib_gsocket.o netlib_gsockmsw.o @COND_TOOLKIT_GTK@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o @COND_TOOLKIT_MAC@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o @COND_TOOLKIT_MOTIF@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o @@ -5509,6 +5542,8 @@ COND_MONOLITHIC_0_SHARED_0_USE_HTML_1___htmllib___depname = \ @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@ = install_htmllib @COND_MONOLITHIC_1_SHARED_1@__install_monodll___depname = install_monodll @COND_MONOLITHIC_1_SHARED_0@__install_monolib___depname = install_monolib +@COND_MONOLITHIC_0_SHARED_1@__install_netdll___depname = install_netdll +@COND_MONOLITHIC_0_SHARED_0@__install_netlib___depname = install_netlib @COND_WXUSE_EXPAT_BUILTIN@__install_wxexpat___depname = install_wxexpat @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__install_wxjpeg___depname \ @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = install_wxjpeg @@ -5561,6 +5596,44 @@ COND_USE_SOVERSOLARIS_1___monodll___soname_flags = \ COND_MONOLITHIC_1_SHARED_0___monolib___depname = \ $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a @COND_MONOLITHIC_1_SHARED_0@__monolib___depname = $(COND_MONOLITHIC_1_SHARED_0___monolib___depname) +COND_MONOLITHIC_0_SHARED_1___netdll___depname = \ + $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) +@COND_MONOLITHIC_0_SHARED_1@__netdll___depname = $(COND_MONOLITHIC_0_SHARED_1___netdll___depname) +COND_PLATFORM_WIN32_1___netdll___importlib = \ + -Wl,--out-implib,$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__netdll___importlib = $(COND_PLATFORM_WIN32_1___netdll___importlib) +COND_PLATFORM_MACOSX_1___netdll___macinstnamecmd = -install_name \ + $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) +@COND_PLATFORM_MACOSX_1@__netdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___netdll___macinstnamecmd) +COND_USE_SOSYMLINKS_1___netdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ + libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ + libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) +@COND_USE_SOSYMLINKS_1@__netdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___netdll___so_symlinks_cmd) +COND_USE_SOSYMLINKS_1___netdll___so_symlinks_inst_cmd = rm -f \ + libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ + libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOSYMLINKS_1@__netdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___netdll___so_symlinks_inst_cmd) +COND_USE_SOVERLINUX_1___netdll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) +@COND_USE_SOVERLINUX_1@__netdll___soname_flags = $(COND_USE_SOVERLINUX_1___netdll___soname_flags) +COND_USE_SOVERSOLARIS_1___netdll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) +@COND_USE_SOVERSOLARIS_1@__netdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___netdll___soname_flags) +COND_MONOLITHIC_0_SHARED_0___netlib___depname = \ + $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX).a +@COND_MONOLITHIC_0_SHARED_0@__netlib___depname = $(COND_MONOLITHIC_0_SHARED_0___netlib___depname) @COND_WXUSE_EXPAT_BUILTIN@__wxexpat___depname = \ @COND_WXUSE_EXPAT_BUILTIN@ $(LIBDIRNAME)/libwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__wxjpeg___depname \ @@ -5629,9 +5702,9 @@ COND_MONOLITHIC_0_SHARED_0___xmllib___depname = \ ### Targets: ### -all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__coredll___depname) $(__corelib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) $(__macos_res___depname) +all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) $(__macos_res___depname) -@COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(BASEDLL_OBJECTS) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) +@COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_0_SHARED_1@ $(SHARED_LD_CXX) $@ $(BASEDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__basedll___macinstnamecmd) $(__basedll___importlib) $(__basedll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) @COND_MONOLITHIC_0_SHARED_1@ $(__basedll___so_symlinks_cmd) @@ -5737,45 +5810,18 @@ basedll_filesys.o: $(srcdir)/src/common/filesys.cpp basedll_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< -basedll_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< - basedll_fs_mem.o: $(srcdir)/src/common/fs_mem.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< basedll_fs_zip.o: $(srcdir)/src/common/fs_zip.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< -basedll_ftp.o: $(srcdir)/src/common/ftp.cpp - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< - -@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@basedll_gsocket.o: $(srcdir)/src/mac/gsocket.c -@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $< - -@COND_PLATFORM_UNIX_1@basedll_gsocket.o: $(srcdir)/src/unix/gsocket.c -@COND_PLATFORM_UNIX_1@ $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $< - -@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@basedll_gsocket.o: $(srcdir)/src/unix/gsocket.c -@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $< - -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@basedll_gsocket.o: $(srcdir)/src/unix/gsocket.c -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $< - -@COND_PLATFORM_WIN32_1@basedll_gsocket.o: $(srcdir)/src/msw/gsocket.c -@COND_PLATFORM_WIN32_1@ $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $< - -basedll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c - $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $< - basedll_hash.o: $(srcdir)/src/common/hash.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< basedll_hashmap.o: $(srcdir)/src/common/hashmap.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< -basedll_http.o: $(srcdir)/src/common/http.cpp - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< - basedll_init.o: $(srcdir)/src/common/init.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -5836,9 +5882,6 @@ basedll_object.o: $(srcdir)/src/common/object.cpp basedll_process.o: $(srcdir)/src/common/process.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< -basedll_protocol.o: $(srcdir)/src/common/protocol.cpp - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< - basedll_regconf.o: $(srcdir)/src/msw/regconf.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -5848,18 +5891,6 @@ basedll_regex.o: $(srcdir)/src/common/regex.cpp basedll_registry.o: $(srcdir)/src/msw/registry.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< -basedll_sckaddr.o: $(srcdir)/src/common/sckaddr.cpp - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< - -basedll_sckfile.o: $(srcdir)/src/common/sckfile.cpp - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< - -basedll_sckipc.o: $(srcdir)/src/common/sckipc.cpp - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< - -basedll_sckstrm.o: $(srcdir)/src/common/sckstrm.cpp - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< - @COND_PLATFORM_WIN32_1@basedll_snglinst.o: $(srcdir)/src/msw/snglinst.cpp @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -5872,9 +5903,6 @@ basedll_sckstrm.o: $(srcdir)/src/common/sckstrm.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@basedll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< -basedll_socket.o: $(srcdir)/src/common/socket.cpp - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< - basedll_stopwatch.o: $(srcdir)/src/common/stopwatch.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -5917,9 +5945,6 @@ basedll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp basedll_unzip.o: $(srcdir)/src/common/unzip.c $(CCC) -c -o $@ $(BASEDLL_CFLAGS) $< -basedll_url.o: $(srcdir)/src/common/url.cpp - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< - @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@basedll_utils.o: $(srcdir)/src/mac/utils.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -6066,45 +6091,18 @@ baselib_filesys.o: $(srcdir)/src/common/filesys.cpp baselib_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< -baselib_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< - baselib_fs_mem.o: $(srcdir)/src/common/fs_mem.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< baselib_fs_zip.o: $(srcdir)/src/common/fs_zip.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< -baselib_ftp.o: $(srcdir)/src/common/ftp.cpp - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< - -@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@baselib_gsocket.o: $(srcdir)/src/mac/gsocket.c -@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CCC) -c -o $@ $(BASELIB_CFLAGS) $< - -@COND_PLATFORM_UNIX_1@baselib_gsocket.o: $(srcdir)/src/unix/gsocket.c -@COND_PLATFORM_UNIX_1@ $(CCC) -c -o $@ $(BASELIB_CFLAGS) $< - -@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@baselib_gsocket.o: $(srcdir)/src/unix/gsocket.c -@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CCC) -c -o $@ $(BASELIB_CFLAGS) $< - -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@baselib_gsocket.o: $(srcdir)/src/unix/gsocket.c -@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CCC) -c -o $@ $(BASELIB_CFLAGS) $< - -@COND_PLATFORM_WIN32_1@baselib_gsocket.o: $(srcdir)/src/msw/gsocket.c -@COND_PLATFORM_WIN32_1@ $(CCC) -c -o $@ $(BASELIB_CFLAGS) $< - -baselib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c - $(CCC) -c -o $@ $(BASELIB_CFLAGS) $< - baselib_hash.o: $(srcdir)/src/common/hash.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< baselib_hashmap.o: $(srcdir)/src/common/hashmap.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< -baselib_http.o: $(srcdir)/src/common/http.cpp - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< - baselib_init.o: $(srcdir)/src/common/init.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6165,9 +6163,6 @@ baselib_object.o: $(srcdir)/src/common/object.cpp baselib_process.o: $(srcdir)/src/common/process.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< -baselib_protocol.o: $(srcdir)/src/common/protocol.cpp - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< - baselib_regconf.o: $(srcdir)/src/msw/regconf.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6177,18 +6172,6 @@ baselib_regex.o: $(srcdir)/src/common/regex.cpp baselib_registry.o: $(srcdir)/src/msw/registry.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< -baselib_sckaddr.o: $(srcdir)/src/common/sckaddr.cpp - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< - -baselib_sckfile.o: $(srcdir)/src/common/sckfile.cpp - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< - -baselib_sckipc.o: $(srcdir)/src/common/sckipc.cpp - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< - -baselib_sckstrm.o: $(srcdir)/src/common/sckstrm.cpp - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< - @COND_PLATFORM_WIN32_1@baselib_snglinst.o: $(srcdir)/src/msw/snglinst.cpp @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6201,9 +6184,6 @@ baselib_sckstrm.o: $(srcdir)/src/common/sckstrm.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@baselib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< -baselib_socket.o: $(srcdir)/src/common/socket.cpp - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< - baselib_stopwatch.o: $(srcdir)/src/common/stopwatch.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6246,9 +6226,6 @@ baselib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp baselib_unzip.o: $(srcdir)/src/common/unzip.c $(CCC) -c -o $@ $(BASELIB_CFLAGS) $< -baselib_url.o: $(srcdir)/src/common/url.cpp - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< - @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@baselib_utils.o: $(srcdir)/src/mac/utils.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -6290,7 +6267,7 @@ baselib_zstream.o: $(srcdir)/src/common/zstream.cpp clean: rm -rf ./.deps - rm -f -f ./*.o + rm -f ./*.o rm -f $(LIBDIRNAME)/libwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX).a rm -f $(LIBDIRNAME)/libwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX).a rm -f $(LIBDIRNAME)/libwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX).a @@ -6306,6 +6283,10 @@ clean: rm -f $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) rm -f $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) rm -f $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a + rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) + rm -f $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX).a rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @@ -10789,13 +10770,13 @@ htmllib_m_tables.o: $(srcdir)/src/html/m_tables.cpp htmllib_winpars.o: $(srcdir)/src/html/winpars.cpp $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $< -install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig $(__macos_res_install___depname) +install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig $(__macos_res_install___depname) $(INSTALL_DIR) $(datadir)/aclocal (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(datadir)/aclocal) $(INSTALL_DIR) $(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx) $(INSTALL_DIR) $(includedir) - for f in wx/apptrait.h wx/beforestd.h wx/containr.h wx/msgout.h wx/types.h wx/init.h wx/arrimpl.cpp wx/listimpl.cpp wx/app.h wx/buffer.h wx/build.h wx/chkconf.h wx/clntdata.h wx/cmdline.h wx/confbase.h wx/config.h wx/datetime.h wx/datetime.inl wx/datstrm.h wx/db.h wx/dbkeyg.h wx/dbtable.h wx/dde.h wx/debug.h wx/defs.h wx/dir.h wx/dynarray.h wx/arrstr.h wx/dynlib.h wx/dynload.h wx/encconv.h wx/event.h wx/features.h wx/ffile.h wx/file.h wx/fileconf.h wx/filefn.h wx/filename.h wx/filesys.h wx/fontenc.h wx/fontmap.h wx/fs_inet.h wx/fs_zip.h wx/fs_mem.h wx/gsocket.h wx/hash.h wx/hashmap.h wx/iconloc.h wx/intl.h wx/iosfwrap.h wx/ioswrap.h wx/ipc.h wx/ipcbase.h wx/isql.h wx/isqlext.h wx/list.h wx/log.h wx/longlong.h wx/math.h wx/memory.h wx/memconf.h wx/memtext.h wx/mimetype.h wx/module.h wx/msgout.h wx/mstream.h wx/object.h wx/platform.h wx/process.h wx/regex.h wx/sckaddr.h wx/sckipc.h wx/sckstrm.h wx/socket.h wx/snglinst.h wx/stopwatch.h wx/strconv.h wx/stream.h wx/string.h wx/sysopt.h wx/textbuf.h wx/textfile.h wx/thread.h wx/thrimpl.cpp wx/tokenzr.h wx/txtstrm.h wx/url.h wx/utils.h wx/variant.h wx/vector.h wx/version.h wx/volume.h wx/wfstream.h wx/wx.h wx/wxchar.h wx/wxprec.h wx/zipstrm.h wx/zstream.h wx/protocol/protocol.h wx/protocol/http.h $(BASE_PLATFORM_HDR) $(ALL_GUI_HEADERS) wx/wxhtml.h wx/html/forcelnk.h wx/html/helpctrl.h wx/html/helpdata.h wx/html/helpfrm.h wx/html/htmlcell.h wx/html/htmldefs.h wx/html/htmlfilt.h wx/html/htmlpars.h wx/html/htmlproc.h wx/html/htmltag.h wx/html/htmlwin.h wx/html/htmprint.h wx/html/m_templ.h wx/html/winpars.h wx/htmllbox.h wx/xml/xml.h $(OPENGL_HDR); do \ + for f in wx/apptrait.h wx/beforestd.h wx/containr.h wx/msgout.h wx/types.h wx/init.h wx/arrimpl.cpp wx/listimpl.cpp wx/app.h wx/buffer.h wx/build.h wx/chkconf.h wx/clntdata.h wx/cmdline.h wx/confbase.h wx/config.h wx/datetime.h wx/datetime.inl wx/datstrm.h wx/db.h wx/dbkeyg.h wx/dbtable.h wx/dde.h wx/debug.h wx/defs.h wx/dir.h wx/dynarray.h wx/arrstr.h wx/dynlib.h wx/dynload.h wx/encconv.h wx/event.h wx/features.h wx/ffile.h wx/file.h wx/fileconf.h wx/filefn.h wx/filename.h wx/filesys.h wx/fontenc.h wx/fontmap.h wx/fs_zip.h wx/fs_mem.h wx/hash.h wx/hashmap.h wx/iconloc.h wx/intl.h wx/iosfwrap.h wx/ioswrap.h wx/ipc.h wx/ipcbase.h wx/isql.h wx/isqlext.h wx/list.h wx/log.h wx/longlong.h wx/math.h wx/memory.h wx/memconf.h wx/memtext.h wx/mimetype.h wx/module.h wx/msgout.h wx/mstream.h wx/object.h wx/platform.h wx/process.h wx/regex.h wx/snglinst.h wx/stopwatch.h wx/strconv.h wx/stream.h wx/string.h wx/sysopt.h wx/textbuf.h wx/textfile.h wx/thread.h wx/thrimpl.cpp wx/tokenzr.h wx/txtstrm.h wx/utils.h wx/variant.h wx/vector.h wx/version.h wx/volume.h wx/wfstream.h wx/wx.h wx/wxchar.h wx/wxprec.h wx/zipstrm.h wx/zstream.h $(BASE_PLATFORM_HDR) wx/fs_inet.h wx/url.h wx/protocol/protocol.h wx/protocol/http.h wx/protocol/ftp.h wx/protocol/file.h wx/gsocket.h wx/sckaddr.h wx/sckipc.h wx/sckstrm.h wx/socket.h $(NET_PLATFORM_HDR) $(ALL_GUI_HEADERS) wx/wxhtml.h wx/html/forcelnk.h wx/html/helpctrl.h wx/html/helpdata.h wx/html/helpfrm.h wx/html/htmlcell.h wx/html/htmldefs.h wx/html/htmlfilt.h wx/html/htmlpars.h wx/html/htmlproc.h wx/html/htmltag.h wx/html/htmlwin.h wx/html/htmprint.h wx/html/m_templ.h wx/html/winpars.h wx/htmllbox.h wx/xml/xml.h $(OPENGL_HDR); do \ if test ! -d $(includedir)/`dirname $$f` ; then \ $(INSTALL_DIR) $(includedir)/`dirname $$f`; \ fi; \ @@ -10813,6 +10794,7 @@ install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__in install-strip: install $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) @@ -10873,6 +10855,16 @@ install-wxconfig: @COND_MONOLITHIC_1_SHARED_0@ $(INSTALL_DIR) $(libdir) @COND_MONOLITHIC_1_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a $(libdir) +@COND_MONOLITHIC_0_SHARED_1@install_netdll: +@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DIR) $(libdir) +@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) +@COND_MONOLITHIC_0_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir) +@COND_MONOLITHIC_0_SHARED_1@ (cd $(libdir) ; $(__netdll___so_symlinks_inst_cmd)) + +@COND_MONOLITHIC_0_SHARED_0@install_netlib: +@COND_MONOLITHIC_0_SHARED_0@ $(INSTALL_DIR) $(libdir) +@COND_MONOLITHIC_0_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX).a $(libdir) + @COND_WXUSE_EXPAT_BUILTIN@install_wxexpat: @COND_WXUSE_EXPAT_BUILTIN@ $(INSTALL_DIR) $(libdir) @COND_WXUSE_EXPAT_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/libwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir) @@ -15932,6 +15924,111 @@ monolib_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp monolib_zstream.o: $(srcdir)/src/common/zstream.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname) +@COND_MONOLITHIC_0_SHARED_1@ $(SHARED_LD_CXX) $@ $(NETDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__netdll___macinstnamecmd) $(__netdll___importlib) $(__netdll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_MONOLITHIC_0_SHARED_1@ $(__netdll___so_symlinks_cmd) + +netdll_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp + $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $< + +netdll_ftp.o: $(srcdir)/src/common/ftp.cpp + $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $< + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@netdll_gsocket.o: $(srcdir)/src/mac/gsocket.c +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CCC) -c -o $@ $(NETDLL_CFLAGS) $< + +@COND_PLATFORM_UNIX_1@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.c +@COND_PLATFORM_UNIX_1@ $(CCC) -c -o $@ $(NETDLL_CFLAGS) $< + +@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.c +@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CCC) -c -o $@ $(NETDLL_CFLAGS) $< + +@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.c +@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CCC) -c -o $@ $(NETDLL_CFLAGS) $< + +@COND_PLATFORM_WIN32_1@netdll_gsocket.o: $(srcdir)/src/msw/gsocket.c +@COND_PLATFORM_WIN32_1@ $(CCC) -c -o $@ $(NETDLL_CFLAGS) $< + +netdll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c + $(CCC) -c -o $@ $(NETDLL_CFLAGS) $< + +netdll_http.o: $(srcdir)/src/common/http.cpp + $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $< + +netdll_protocol.o: $(srcdir)/src/common/protocol.cpp + $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $< + +netdll_sckaddr.o: $(srcdir)/src/common/sckaddr.cpp + $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $< + +netdll_sckfile.o: $(srcdir)/src/common/sckfile.cpp + $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $< + +netdll_sckipc.o: $(srcdir)/src/common/sckipc.cpp + $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $< + +netdll_sckstrm.o: $(srcdir)/src/common/sckstrm.cpp + $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $< + +netdll_socket.o: $(srcdir)/src/common/socket.cpp + $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $< + +netdll_url.o: $(srcdir)/src/common/url.cpp + $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $< + +@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX).a: $(NETLIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0@ rm -f $@ +@COND_MONOLITHIC_0_SHARED_0@ $(AR) rcu $@ $(NETLIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0@ $(RANLIB) $@ + +netlib_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp + $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $< + +netlib_ftp.o: $(srcdir)/src/common/ftp.cpp + $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $< + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@netlib_gsocket.o: $(srcdir)/src/mac/gsocket.c +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@ $(CCC) -c -o $@ $(NETLIB_CFLAGS) $< + +@COND_PLATFORM_UNIX_1@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.c +@COND_PLATFORM_UNIX_1@ $(CCC) -c -o $@ $(NETLIB_CFLAGS) $< + +@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.c +@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CCC) -c -o $@ $(NETLIB_CFLAGS) $< + +@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.c +@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CCC) -c -o $@ $(NETLIB_CFLAGS) $< + +@COND_PLATFORM_WIN32_1@netlib_gsocket.o: $(srcdir)/src/msw/gsocket.c +@COND_PLATFORM_WIN32_1@ $(CCC) -c -o $@ $(NETLIB_CFLAGS) $< + +netlib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c + $(CCC) -c -o $@ $(NETLIB_CFLAGS) $< + +netlib_http.o: $(srcdir)/src/common/http.cpp + $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $< + +netlib_protocol.o: $(srcdir)/src/common/protocol.cpp + $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $< + +netlib_sckaddr.o: $(srcdir)/src/common/sckaddr.cpp + $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $< + +netlib_sckfile.o: $(srcdir)/src/common/sckfile.cpp + $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $< + +netlib_sckipc.o: $(srcdir)/src/common/sckipc.cpp + $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $< + +netlib_sckstrm.o: $(srcdir)/src/common/sckstrm.cpp + $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $< + +netlib_socket.o: $(srcdir)/src/common/socket.cpp + $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $< + +netlib_url.o: $(srcdir)/src/common/url.cpp + $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $< + uninstall: @COND_WXUSE_EXPAT_BUILTIN@$(LIBDIRNAME)/libwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a: $(WXEXPAT_OBJECTS) @@ -16371,7 +16468,7 @@ wxzlib_uncompr.o: $(srcdir)/src/zlib/uncompr.c wxzlib_zutil.o: $(srcdir)/src/zlib/zutil.c $(CCC) -c -o $@ $(WXZLIB_CFLAGS) $< -@COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(XMLDLL_OBJECTS) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__basedll___depname) +@COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname) @COND_MONOLITHIC_0_SHARED_1@ $(SHARED_LD_CXX) $@ $(XMLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__xmldll___macinstnamecmd) $(__xmldll___importlib) $(__xmldll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(EXTRALIBS_XML) @COND_MONOLITHIC_0_SHARED_1@ $(__xmldll___so_symlinks_cmd) @@ -16390,4 +16487,4 @@ xmllib_xml.o: $(srcdir)/src/xml/xml.cpp # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install install_basedll install_baselib install_coredll install_corelib install_gldll install_gllib install_htmldll install_htmllib install_monodll install_monolib install_wxexpat install_wxjpeg install_wxodbc install_wxpng install_wxregex install_wxtiff install_wxzlib install_xmldll install_xmllib uninstall +.PHONY: all clean distclean install install_basedll install_baselib install_coredll install_corelib install_gldll install_gllib install_htmldll install_htmllib install_monodll install_monolib install_netdll install_netlib install_wxexpat install_wxjpeg install_wxodbc install_wxpng install_wxregex install_wxtiff install_wxzlib install_xmldll install_xmllib uninstall diff --git a/autoconf_inc.m4 b/autoconf_inc.m4 index 131df53e70..d48569990a 100644 --- a/autoconf_inc.m4 +++ b/autoconf_inc.m4 @@ -334,6 +334,24 @@ dnl ### begin block COND_USE_GUI_1_WXUNIV_1 ### COND_USE_GUI_1_WXUNIV_1="" fi AC_SUBST(COND_USE_GUI_1_WXUNIV_1) +dnl ### begin block COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN ### + COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#" + if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then + COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="" + fi + AC_SUBST(COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN) +dnl ### begin block COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN ### + COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#" + if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then + COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="" + fi + AC_SUBST(COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN) +dnl ### begin block COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN ### + COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#" + if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then + COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="" + fi + AC_SUBST(COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN) dnl ### begin block COND_USE_SOSYMLINKS_1 ### COND_USE_SOSYMLINKS_1="#" if test "x$USE_SOSYMLINKS" = "x1" ; then @@ -364,6 +382,12 @@ dnl ### begin block COND_WXUNIV_1 ### COND_WXUNIV_1="" fi AC_SUBST(COND_WXUNIV_1) +dnl ### begin block COND_WXUSE_EXPAT_BUILTIN ### + COND_WXUSE_EXPAT_BUILTIN="#" + if test "x$wxUSE_EXPAT" = "xbuiltin" ; then + COND_WXUSE_EXPAT_BUILTIN="" + fi + AC_SUBST(COND_WXUSE_EXPAT_BUILTIN) dnl ### begin block COND_WXUSE_LIBJPEG_BUILTIN ### COND_WXUSE_LIBJPEG_BUILTIN="#" if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then @@ -418,27 +442,3 @@ dnl ### begin block COND_SHARED_0 ### COND_SHARED_0="" fi AC_SUBST(COND_SHARED_0) -dnl ### begin block COND_WXUSE_EXPAT_BUILTIN ### - COND_WXUSE_EXPAT_BUILTIN="#" - if test "x$wxUSE_EXPAT" = "xbuiltin" ; then - COND_WXUSE_EXPAT_BUILTIN="" - fi - AC_SUBST(COND_WXUSE_EXPAT_BUILTIN) -dnl ### begin block COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN ### - COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#" - if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then - COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="" - fi - AC_SUBST(COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN) -dnl ### begin block COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN ### - COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#" - if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then - COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="" - fi - AC_SUBST(COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN) -dnl ### begin block COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN ### - COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#" - if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then - COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="" - fi - AC_SUBST(COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN) diff --git a/build/makefile.bcc b/build/makefile.bcc index cd7fe082a0..a7e55a943e 100644 --- a/build/makefile.bcc +++ b/build/makefile.bcc @@ -54,12 +54,9 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_filename.obj \ $(OBJS)\basedll_filesys.obj \ $(OBJS)\basedll_fmapbase.obj \ - $(OBJS)\basedll_fs_inet.obj \ $(OBJS)\basedll_fs_zip.obj \ - $(OBJS)\basedll_ftp.obj \ $(OBJS)\basedll_hash.obj \ $(OBJS)\basedll_hashmap.obj \ - $(OBJS)\basedll_http.obj \ $(OBJS)\basedll_init.obj \ $(OBJS)\basedll_intl.obj \ $(OBJS)\basedll_ipcbase.obj \ @@ -72,13 +69,7 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_mstream.obj \ $(OBJS)\basedll_object.obj \ $(OBJS)\basedll_process.obj \ - $(OBJS)\basedll_protocol.obj \ $(OBJS)\basedll_regex.obj \ - $(OBJS)\basedll_sckaddr.obj \ - $(OBJS)\basedll_sckfile.obj \ - $(OBJS)\basedll_sckipc.obj \ - $(OBJS)\basedll_sckstrm.obj \ - $(OBJS)\basedll_socket.obj \ $(OBJS)\basedll_stopwatch.obj \ $(OBJS)\basedll_strconv.obj \ $(OBJS)\basedll_stream.obj \ @@ -89,14 +80,11 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_tokenzr.obj \ $(OBJS)\basedll_txtstrm.obj \ $(OBJS)\basedll_unzip.obj \ - $(OBJS)\basedll_url.obj \ $(OBJS)\basedll_variant.obj \ $(OBJS)\basedll_wfstream.obj \ $(OBJS)\basedll_wxchar.obj \ $(OBJS)\basedll_zipstrm.obj \ $(OBJS)\basedll_zstream.obj \ - $(OBJS)\basedll_gsocket.obj \ - $(OBJS)\basedll_gsockmsw.obj \ $(OBJS)\basedll_basemsw.obj \ $(OBJS)\basedll_dde.obj \ $(OBJS)\basedll_dir.obj \ @@ -148,12 +136,9 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_filename.obj \ $(OBJS)\baselib_filesys.obj \ $(OBJS)\baselib_fmapbase.obj \ - $(OBJS)\baselib_fs_inet.obj \ $(OBJS)\baselib_fs_zip.obj \ - $(OBJS)\baselib_ftp.obj \ $(OBJS)\baselib_hash.obj \ $(OBJS)\baselib_hashmap.obj \ - $(OBJS)\baselib_http.obj \ $(OBJS)\baselib_init.obj \ $(OBJS)\baselib_intl.obj \ $(OBJS)\baselib_ipcbase.obj \ @@ -166,13 +151,7 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_mstream.obj \ $(OBJS)\baselib_object.obj \ $(OBJS)\baselib_process.obj \ - $(OBJS)\baselib_protocol.obj \ $(OBJS)\baselib_regex.obj \ - $(OBJS)\baselib_sckaddr.obj \ - $(OBJS)\baselib_sckfile.obj \ - $(OBJS)\baselib_sckipc.obj \ - $(OBJS)\baselib_sckstrm.obj \ - $(OBJS)\baselib_socket.obj \ $(OBJS)\baselib_stopwatch.obj \ $(OBJS)\baselib_strconv.obj \ $(OBJS)\baselib_stream.obj \ @@ -183,14 +162,11 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_tokenzr.obj \ $(OBJS)\baselib_txtstrm.obj \ $(OBJS)\baselib_unzip.obj \ - $(OBJS)\baselib_url.obj \ $(OBJS)\baselib_variant.obj \ $(OBJS)\baselib_wfstream.obj \ $(OBJS)\baselib_wxchar.obj \ $(OBJS)\baselib_zipstrm.obj \ $(OBJS)\baselib_zstream.obj \ - $(OBJS)\baselib_gsocket.obj \ - $(OBJS)\baselib_gsockmsw.obj \ $(OBJS)\baselib_basemsw.obj \ $(OBJS)\baselib_dde.obj \ $(OBJS)\baselib_dir.obj \ @@ -350,12 +326,9 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_filename.obj \ $(OBJS)\monodll_filesys.obj \ $(OBJS)\monodll_fmapbase.obj \ - $(OBJS)\monodll_fs_inet.obj \ $(OBJS)\monodll_fs_zip.obj \ - $(OBJS)\monodll_ftp.obj \ $(OBJS)\monodll_hash.obj \ $(OBJS)\monodll_hashmap.obj \ - $(OBJS)\monodll_http.obj \ $(OBJS)\monodll_init.obj \ $(OBJS)\monodll_intl.obj \ $(OBJS)\monodll_ipcbase.obj \ @@ -368,13 +341,7 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_mstream.obj \ $(OBJS)\monodll_object.obj \ $(OBJS)\monodll_process.obj \ - $(OBJS)\monodll_protocol.obj \ $(OBJS)\monodll_regex.obj \ - $(OBJS)\monodll_sckaddr.obj \ - $(OBJS)\monodll_sckfile.obj \ - $(OBJS)\monodll_sckipc.obj \ - $(OBJS)\monodll_sckstrm.obj \ - $(OBJS)\monodll_socket.obj \ $(OBJS)\monodll_stopwatch.obj \ $(OBJS)\monodll_strconv.obj \ $(OBJS)\monodll_stream.obj \ @@ -385,14 +352,11 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_tokenzr.obj \ $(OBJS)\monodll_txtstrm.obj \ $(OBJS)\monodll_unzip.obj \ - $(OBJS)\monodll_url.obj \ $(OBJS)\monodll_variant.obj \ $(OBJS)\monodll_wfstream.obj \ $(OBJS)\monodll_wxchar.obj \ $(OBJS)\monodll_zipstrm.obj \ $(OBJS)\monodll_zstream.obj \ - $(OBJS)\monodll_gsocket.obj \ - $(OBJS)\monodll_gsockmsw.obj \ $(OBJS)\monodll_basemsw.obj \ $(OBJS)\monodll_dde.obj \ $(OBJS)\monodll_dir.obj \ @@ -411,6 +375,18 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_main.obj \ $(OBJS)\monodll_mslu.obj \ $(OBJS)\monodll_volume.obj \ + $(OBJS)\monodll_fs_inet.obj \ + $(OBJS)\monodll_ftp.obj \ + $(OBJS)\monodll_http.obj \ + $(OBJS)\monodll_protocol.obj \ + $(OBJS)\monodll_url.obj \ + $(OBJS)\monodll_sckfile.obj \ + $(OBJS)\monodll_sckaddr.obj \ + $(OBJS)\monodll_sckipc.obj \ + $(OBJS)\monodll_sckstrm.obj \ + $(OBJS)\monodll_socket.obj \ + $(OBJS)\monodll_gsocket.obj \ + $(OBJS)\monodll_gsockmsw.obj \ $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \ $(OBJS)\monodll_xml.obj MONOLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \ @@ -446,12 +422,9 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_filename.obj \ $(OBJS)\monolib_filesys.obj \ $(OBJS)\monolib_fmapbase.obj \ - $(OBJS)\monolib_fs_inet.obj \ $(OBJS)\monolib_fs_zip.obj \ - $(OBJS)\monolib_ftp.obj \ $(OBJS)\monolib_hash.obj \ $(OBJS)\monolib_hashmap.obj \ - $(OBJS)\monolib_http.obj \ $(OBJS)\monolib_init.obj \ $(OBJS)\monolib_intl.obj \ $(OBJS)\monolib_ipcbase.obj \ @@ -464,13 +437,7 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_mstream.obj \ $(OBJS)\monolib_object.obj \ $(OBJS)\monolib_process.obj \ - $(OBJS)\monolib_protocol.obj \ $(OBJS)\monolib_regex.obj \ - $(OBJS)\monolib_sckaddr.obj \ - $(OBJS)\monolib_sckfile.obj \ - $(OBJS)\monolib_sckipc.obj \ - $(OBJS)\monolib_sckstrm.obj \ - $(OBJS)\monolib_socket.obj \ $(OBJS)\monolib_stopwatch.obj \ $(OBJS)\monolib_strconv.obj \ $(OBJS)\monolib_stream.obj \ @@ -481,14 +448,11 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_tokenzr.obj \ $(OBJS)\monolib_txtstrm.obj \ $(OBJS)\monolib_unzip.obj \ - $(OBJS)\monolib_url.obj \ $(OBJS)\monolib_variant.obj \ $(OBJS)\monolib_wfstream.obj \ $(OBJS)\monolib_wxchar.obj \ $(OBJS)\monolib_zipstrm.obj \ $(OBJS)\monolib_zstream.obj \ - $(OBJS)\monolib_gsocket.obj \ - $(OBJS)\monolib_gsockmsw.obj \ $(OBJS)\monolib_basemsw.obj \ $(OBJS)\monolib_dde.obj \ $(OBJS)\monolib_dir.obj \ @@ -507,8 +471,68 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_main.obj \ $(OBJS)\monolib_mslu.obj \ $(OBJS)\monolib_volume.obj \ + $(OBJS)\monolib_fs_inet.obj \ + $(OBJS)\monolib_ftp.obj \ + $(OBJS)\monolib_http.obj \ + $(OBJS)\monolib_protocol.obj \ + $(OBJS)\monolib_url.obj \ + $(OBJS)\monolib_sckfile.obj \ + $(OBJS)\monolib_sckaddr.obj \ + $(OBJS)\monolib_sckipc.obj \ + $(OBJS)\monolib_sckstrm.obj \ + $(OBJS)\monolib_socket.obj \ + $(OBJS)\monolib_gsocket.obj \ + $(OBJS)\monolib_gsockmsw.obj \ $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \ $(OBJS)\monolib_xml.obj +NETDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \ + -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \ + -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \ + -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS) +NETDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \ + -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \ + -DWXUSINGDLL -DWXMAKINGDLL_NET $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_netdll.csm +NETDLL_OBJECTS = \ + $(OBJS)\netdll_dummy.obj \ + $(OBJS)\netdll_fs_inet.obj \ + $(OBJS)\netdll_ftp.obj \ + $(OBJS)\netdll_http.obj \ + $(OBJS)\netdll_protocol.obj \ + $(OBJS)\netdll_url.obj \ + $(OBJS)\netdll_sckfile.obj \ + $(OBJS)\netdll_sckaddr.obj \ + $(OBJS)\netdll_sckipc.obj \ + $(OBJS)\netdll_sckstrm.obj \ + $(OBJS)\netdll_socket.obj \ + $(OBJS)\netdll_gsocket.obj \ + $(OBJS)\netdll_gsockmsw.obj +NETLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \ + -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \ + -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \ + -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS) +NETLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \ + -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \ + -DWXUSINGDLL -DWXMAKINGDLL_NET $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_netlib.csm +NETLIB_OBJECTS = \ + $(OBJS)\netlib_dummy.obj \ + $(OBJS)\netlib_fs_inet.obj \ + $(OBJS)\netlib_ftp.obj \ + $(OBJS)\netlib_http.obj \ + $(OBJS)\netlib_protocol.obj \ + $(OBJS)\netlib_url.obj \ + $(OBJS)\netlib_sckfile.obj \ + $(OBJS)\netlib_sckaddr.obj \ + $(OBJS)\netlib_sckipc.obj \ + $(OBJS)\netlib_sckstrm.obj \ + $(OBJS)\netlib_socket.obj \ + $(OBJS)\netlib_gsocket.obj \ + $(OBJS)\netlib_gsockmsw.obj OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) WXEXPAT_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \ @@ -720,10 +744,10 @@ __RUNTIME_LIBS = -tWR __RUNTIME_LIBS = !endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_4 = i +__RUNTIME_LIBS_5 = i !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_4 = +__RUNTIME_LIBS_5 = !endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 @@ -2458,6 +2482,14 @@ __monodll___depname = \ __monolib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" +__netdll___depname = \ + $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll +!endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" +__netlib___depname = \ + $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib +!endif !if "$(USE_GUI)" == "1" __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib !endif @@ -2483,7 +2515,7 @@ $(OBJS): ### Targets: ### -all: setup_h $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__coredll___depname) $(__corelib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) +all: setup_h $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) $(OBJS)\basedll_appbase.obj: ..\src\common\appbase.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -2566,33 +2598,18 @@ $(OBJS)\basedll_filesys.obj: ..\src\common\filesys.cpp $(OBJS)\basedll_fmapbase.obj: ..\src\common\fmapbase.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_fs_inet.obj: ..\src\common\fs_inet.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** - $(OBJS)\basedll_fs_mem.obj: ..\src\common\fs_mem.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** $(OBJS)\basedll_fs_zip.obj: ..\src\common\fs_zip.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_ftp.obj: ..\src\common\ftp.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** - -$(OBJS)\basedll_gsocket.obj: ..\src\msw\gsocket.c - $(CC) -q -c -P- -o$@ $(BASEDLL_CFLAGS) $** - -$(OBJS)\basedll_gsockmsw.obj: ..\src\msw\gsockmsw.c - $(CC) -q -c -P- -o$@ $(BASEDLL_CFLAGS) $** - $(OBJS)\basedll_hash.obj: ..\src\common\hash.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** $(OBJS)\basedll_hashmap.obj: ..\src\common\hashmap.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_http.obj: ..\src\common\http.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** - $(OBJS)\basedll_init.obj: ..\src\common\init.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -2641,9 +2658,6 @@ $(OBJS)\basedll_object.obj: ..\src\common\object.cpp $(OBJS)\basedll_process.obj: ..\src\common\process.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_protocol.obj: ..\src\common\protocol.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** - $(OBJS)\basedll_regconf.obj: ..\src\msw\regconf.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -2653,24 +2667,9 @@ $(OBJS)\basedll_regex.obj: ..\src\common\regex.cpp $(OBJS)\basedll_registry.obj: ..\src\msw\registry.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_sckaddr.obj: ..\src\common\sckaddr.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** - -$(OBJS)\basedll_sckfile.obj: ..\src\common\sckfile.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** - -$(OBJS)\basedll_sckipc.obj: ..\src\common\sckipc.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** - -$(OBJS)\basedll_sckstrm.obj: ..\src\common\sckstrm.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** - $(OBJS)\basedll_snglinst.obj: ..\src\msw\snglinst.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_socket.obj: ..\src\common\socket.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** - $(OBJS)\basedll_stopwatch.obj: ..\src\common\stopwatch.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -2704,9 +2703,6 @@ $(OBJS)\basedll_txtstrm.obj: ..\src\common\txtstrm.cpp $(OBJS)\basedll_unzip.obj: ..\src\common\unzip.c $(CC) -q -c -P- -o$@ $(BASEDLL_CFLAGS) $** -$(OBJS)\basedll_url.obj: ..\src\common\url.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** - $(OBJS)\basedll_utils.obj: ..\src\msw\utils.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -2815,33 +2811,18 @@ $(OBJS)\baselib_filesys.obj: ..\src\common\filesys.cpp $(OBJS)\baselib_fmapbase.obj: ..\src\common\fmapbase.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_fs_inet.obj: ..\src\common\fs_inet.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** - $(OBJS)\baselib_fs_mem.obj: ..\src\common\fs_mem.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** $(OBJS)\baselib_fs_zip.obj: ..\src\common\fs_zip.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_ftp.obj: ..\src\common\ftp.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** - -$(OBJS)\baselib_gsocket.obj: ..\src\msw\gsocket.c - $(CC) -q -c -P- -o$@ $(BASELIB_CFLAGS) $** - -$(OBJS)\baselib_gsockmsw.obj: ..\src\msw\gsockmsw.c - $(CC) -q -c -P- -o$@ $(BASELIB_CFLAGS) $** - $(OBJS)\baselib_hash.obj: ..\src\common\hash.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** $(OBJS)\baselib_hashmap.obj: ..\src\common\hashmap.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_http.obj: ..\src\common\http.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** - $(OBJS)\baselib_init.obj: ..\src\common\init.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** @@ -2890,9 +2871,6 @@ $(OBJS)\baselib_object.obj: ..\src\common\object.cpp $(OBJS)\baselib_process.obj: ..\src\common\process.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_protocol.obj: ..\src\common\protocol.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** - $(OBJS)\baselib_regconf.obj: ..\src\msw\regconf.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** @@ -2902,24 +2880,9 @@ $(OBJS)\baselib_regex.obj: ..\src\common\regex.cpp $(OBJS)\baselib_registry.obj: ..\src\msw\registry.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_sckaddr.obj: ..\src\common\sckaddr.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** - -$(OBJS)\baselib_sckfile.obj: ..\src\common\sckfile.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** - -$(OBJS)\baselib_sckipc.obj: ..\src\common\sckipc.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** - -$(OBJS)\baselib_sckstrm.obj: ..\src\common\sckstrm.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** - $(OBJS)\baselib_snglinst.obj: ..\src\msw\snglinst.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_socket.obj: ..\src\common\socket.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** - $(OBJS)\baselib_stopwatch.obj: ..\src\common\stopwatch.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** @@ -2953,9 +2916,6 @@ $(OBJS)\baselib_txtstrm.obj: ..\src\common\txtstrm.cpp $(OBJS)\baselib_unzip.obj: ..\src\common\unzip.c $(CC) -q -c -P- -o$@ $(BASELIB_CFLAGS) $** -$(OBJS)\baselib_url.obj: ..\src\common\url.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** - $(OBJS)\baselib_utils.obj: ..\src\msw\utils.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** @@ -8433,6 +8393,84 @@ $(OBJS)\monolib_zipstrm.obj: ..\src\common\zipstrm.cpp $(OBJS)\monolib_zstream.obj: ..\src\common\zstream.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\netdll_dummy.obj: ..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) -H $** + +$(OBJS)\netdll_fs_inet.obj: ..\src\common\fs_inet.cpp + $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_ftp.obj: ..\src\common\ftp.cpp + $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_gsocket.obj: ..\src\msw\gsocket.c + $(CC) -q -c -P- -o$@ $(NETDLL_CFLAGS) $** + +$(OBJS)\netdll_gsockmsw.obj: ..\src\msw\gsockmsw.c + $(CC) -q -c -P- -o$@ $(NETDLL_CFLAGS) $** + +$(OBJS)\netdll_http.obj: ..\src\common\http.cpp + $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_protocol.obj: ..\src\common\protocol.cpp + $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_sckaddr.obj: ..\src\common\sckaddr.cpp + $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_sckfile.obj: ..\src\common\sckfile.cpp + $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_sckipc.obj: ..\src\common\sckipc.cpp + $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_sckstrm.obj: ..\src\common\sckstrm.cpp + $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_socket.obj: ..\src\common\socket.cpp + $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_url.obj: ..\src\common\url.cpp + $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netlib_dummy.obj: ..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) -H $** + +$(OBJS)\netlib_fs_inet.obj: ..\src\common\fs_inet.cpp + $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_ftp.obj: ..\src\common\ftp.cpp + $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_gsocket.obj: ..\src\msw\gsocket.c + $(CC) -q -c -P- -o$@ $(NETLIB_CFLAGS) $** + +$(OBJS)\netlib_gsockmsw.obj: ..\src\msw\gsockmsw.c + $(CC) -q -c -P- -o$@ $(NETLIB_CFLAGS) $** + +$(OBJS)\netlib_http.obj: ..\src\common\http.cpp + $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_protocol.obj: ..\src\common\protocol.cpp + $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_sckaddr.obj: ..\src\common\sckaddr.cpp + $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_sckfile.obj: ..\src\common\sckfile.cpp + $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_sckipc.obj: ..\src\common\sckipc.cpp + $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_sckstrm.obj: ..\src\common\sckstrm.cpp + $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_socket.obj: ..\src\common\socket.cpp + $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_url.obj: ..\src\common\url.cpp + $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $** + $(OBJS)\wxexpat_xmlparse.obj: ..\src\expat\lib\xmlparse.c $(CC) -q -c -P- -o$@ $(WXEXPAT_CFLAGS) $** @@ -8797,9 +8835,9 @@ $(OBJS)\xmllib_xml.obj: ..\src\xml\xml.cpp $(CXX) -q -c -P -o$@ $(XMLLIB_CXXFLAGS) $** !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(OBJS)\basedll_dummy.obj $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib +$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(OBJS)\basedll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L$(LIBDIRNAME) @&&| - c0d32.obj $(BASEDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_4).lib,, + c0d32.obj $(BASEDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_5).lib,, | implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@ !endif @@ -8827,6 +8865,9 @@ clean: -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib + -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib + -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib @@ -8843,7 +8884,7 @@ clean: !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(OBJS)\coredll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L$(LIBDIRNAME) @&&| - c0d32.obj $(COREDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib cw32mt$(__RUNTIME_LIBS_4).lib,, + c0d32.obj $(COREDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib cw32mt$(__RUNTIME_LIBS_5).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core $@ !endif @@ -8859,7 +8900,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.li !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(OBJS)\gldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L$(LIBDIRNAME) @&&| - c0d32.obj $(GLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) cw32mt$(__RUNTIME_LIBS_4).lib,, + c0d32.obj $(GLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) cw32mt$(__RUNTIME_LIBS_5).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl $@ !endif @@ -8875,7 +8916,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib: !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(OBJS)\htmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L$(LIBDIRNAME) @&&| - c0d32.obj $(HTMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib cw32mt$(__RUNTIME_LIBS_4).lib,, + c0d32.obj $(HTMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib cw32mt$(__RUNTIME_LIBS_5).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html $@ !endif @@ -8897,7 +8938,7 @@ $(LIBDIRNAME)\wx: $(LIBDIRNAME) !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(OBJS)\monodll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L$(LIBDIRNAME) @&&| - c0d32.obj $(MONODLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_4).lib,, + c0d32.obj $(MONODLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_5).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@ !endif @@ -8913,6 +8954,22 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $( ..\include\wx\msw\setup.h: if not exist ..\include\wx\msw\setup.h copy ..\include\wx\msw\setup0.h ..\include\wx\msw\setup.h +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" +$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(OBJS)\netdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) + ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L$(LIBDIRNAME) @&&| + c0d32.obj $(NETDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib cw32mt$(__RUNTIME_LIBS_5).lib,, +| + implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net $@ +!endif + +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" +$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(NETLIB_OBJECTS) $(OBJS)\netlib_dummy.obj + if exist $@ del $@ + tlib /a /p2048 $@ @&&| + $(NETLIB_OBJECTS) +| +!endif + $(LIBDIRNAME)\wx\setup.h: if not exist $(LIBDIRNAME)\wx\setup.h copy ..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h @@ -8961,9 +9018,9 @@ $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib: $(WXZLIB_OBJECTS) | !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(OBJS)\xmldll_dummy.obj $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) +$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(OBJS)\xmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L$(LIBDIRNAME) @&&| - c0d32.obj $(XMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib cw32mt$(__RUNTIME_LIBS_4).lib,, + c0d32.obj $(XMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib cw32mt$(__RUNTIME_LIBS_5).lib,, | implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml $@ !endif diff --git a/build/makefile.gcc b/build/makefile.gcc index 58dbb85a72..a1424b789e 100644 --- a/build/makefile.gcc +++ b/build/makefile.gcc @@ -24,7 +24,7 @@ BASEDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \ -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \ -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CXXFLAGS) -BASEDLL_OBJECTS = $(OBJS)\basedll_dummy.o $(OBJS)\basedll_appbase.o $(OBJS)\basedll_clntdata.o $(OBJS)\basedll_cmdline.o $(OBJS)\basedll_config.o $(OBJS)\basedll_datetime.o $(OBJS)\basedll_datstrm.o $(OBJS)\basedll_db.o $(OBJS)\basedll_dbtable.o $(OBJS)\basedll_dircmn.o $(OBJS)\basedll_dynarray.o $(OBJS)\basedll_dynlib.o $(OBJS)\basedll_dynload.o $(OBJS)\basedll_encconv.o $(OBJS)\basedll_extended.o $(OBJS)\basedll_ffile.o $(OBJS)\basedll_file.o $(OBJS)\basedll_fileconf.o $(OBJS)\basedll_filefn.o $(OBJS)\basedll_filename.o $(OBJS)\basedll_filesys.o $(OBJS)\basedll_fmapbase.o $(OBJS)\basedll_fs_inet.o $(OBJS)\basedll_fs_zip.o $(OBJS)\basedll_ftp.o $(OBJS)\basedll_hash.o $(OBJS)\basedll_hashmap.o $(OBJS)\basedll_http.o $(OBJS)\basedll_init.o $(OBJS)\basedll_intl.o $(OBJS)\basedll_ipcbase.o $(OBJS)\basedll_list.o $(OBJS)\basedll_log.o $(OBJS)\basedll_longlong.o $(OBJS)\basedll_memory.o $(OBJS)\basedll_mimecmn.o $(OBJS)\basedll_module.o $(OBJS)\basedll_mstream.o $(OBJS)\basedll_object.o $(OBJS)\basedll_process.o $(OBJS)\basedll_protocol.o $(OBJS)\basedll_regex.o $(OBJS)\basedll_sckaddr.o $(OBJS)\basedll_sckfile.o $(OBJS)\basedll_sckipc.o $(OBJS)\basedll_sckstrm.o $(OBJS)\basedll_socket.o $(OBJS)\basedll_stopwatch.o $(OBJS)\basedll_strconv.o $(OBJS)\basedll_stream.o $(OBJS)\basedll_string.o $(OBJS)\basedll_sysopt.o $(OBJS)\basedll_textbuf.o $(OBJS)\basedll_textfile.o $(OBJS)\basedll_tokenzr.o $(OBJS)\basedll_txtstrm.o $(OBJS)\basedll_unzip.o $(OBJS)\basedll_url.o $(OBJS)\basedll_variant.o $(OBJS)\basedll_wfstream.o $(OBJS)\basedll_wxchar.o $(OBJS)\basedll_zipstrm.o $(OBJS)\basedll_zstream.o $(OBJS)\basedll_gsocket.o $(OBJS)\basedll_gsockmsw.o $(OBJS)\basedll_basemsw.o $(OBJS)\basedll_dde.o $(OBJS)\basedll_dir.o $(OBJS)\basedll_mimetype.o $(OBJS)\basedll_regconf.o $(OBJS)\basedll_registry.o $(OBJS)\basedll_snglinst.o $(OBJS)\basedll_thread.o $(OBJS)\basedll_utils.o $(OBJS)\basedll_utilsexc.o $(OBJS)\basedll_crashrpt.o $(OBJS)\basedll_event.o $(OBJS)\basedll_fs_mem.o $(OBJS)\basedll_msgout.o $(OBJS)\basedll_utilscmn.o $(OBJS)\basedll_main.o $(OBJS)\basedll_mslu.o $(OBJS)\basedll_volume.o +BASEDLL_OBJECTS = $(OBJS)\basedll_dummy.o $(OBJS)\basedll_appbase.o $(OBJS)\basedll_clntdata.o $(OBJS)\basedll_cmdline.o $(OBJS)\basedll_config.o $(OBJS)\basedll_datetime.o $(OBJS)\basedll_datstrm.o $(OBJS)\basedll_db.o $(OBJS)\basedll_dbtable.o $(OBJS)\basedll_dircmn.o $(OBJS)\basedll_dynarray.o $(OBJS)\basedll_dynlib.o $(OBJS)\basedll_dynload.o $(OBJS)\basedll_encconv.o $(OBJS)\basedll_extended.o $(OBJS)\basedll_ffile.o $(OBJS)\basedll_file.o $(OBJS)\basedll_fileconf.o $(OBJS)\basedll_filefn.o $(OBJS)\basedll_filename.o $(OBJS)\basedll_filesys.o $(OBJS)\basedll_fmapbase.o $(OBJS)\basedll_fs_zip.o $(OBJS)\basedll_hash.o $(OBJS)\basedll_hashmap.o $(OBJS)\basedll_init.o $(OBJS)\basedll_intl.o $(OBJS)\basedll_ipcbase.o $(OBJS)\basedll_list.o $(OBJS)\basedll_log.o $(OBJS)\basedll_longlong.o $(OBJS)\basedll_memory.o $(OBJS)\basedll_mimecmn.o $(OBJS)\basedll_module.o $(OBJS)\basedll_mstream.o $(OBJS)\basedll_object.o $(OBJS)\basedll_process.o $(OBJS)\basedll_regex.o $(OBJS)\basedll_stopwatch.o $(OBJS)\basedll_strconv.o $(OBJS)\basedll_stream.o $(OBJS)\basedll_string.o $(OBJS)\basedll_sysopt.o $(OBJS)\basedll_textbuf.o $(OBJS)\basedll_textfile.o $(OBJS)\basedll_tokenzr.o $(OBJS)\basedll_txtstrm.o $(OBJS)\basedll_unzip.o $(OBJS)\basedll_variant.o $(OBJS)\basedll_wfstream.o $(OBJS)\basedll_wxchar.o $(OBJS)\basedll_zipstrm.o $(OBJS)\basedll_zstream.o $(OBJS)\basedll_basemsw.o $(OBJS)\basedll_dde.o $(OBJS)\basedll_dir.o $(OBJS)\basedll_mimetype.o $(OBJS)\basedll_regconf.o $(OBJS)\basedll_registry.o $(OBJS)\basedll_snglinst.o $(OBJS)\basedll_thread.o $(OBJS)\basedll_utils.o $(OBJS)\basedll_utilsexc.o $(OBJS)\basedll_crashrpt.o $(OBJS)\basedll_event.o $(OBJS)\basedll_fs_mem.o $(OBJS)\basedll_msgout.o $(OBJS)\basedll_utilscmn.o $(OBJS)\basedll_main.o $(OBJS)\basedll_mslu.o $(OBJS)\basedll_volume.o BASEDLL_OBJECTS = \ $(OBJS)\basedll_dummy.o \ $(OBJS)\basedll_appbase.o \ @@ -48,12 +48,9 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_filename.o \ $(OBJS)\basedll_filesys.o \ $(OBJS)\basedll_fmapbase.o \ - $(OBJS)\basedll_fs_inet.o \ $(OBJS)\basedll_fs_zip.o \ - $(OBJS)\basedll_ftp.o \ $(OBJS)\basedll_hash.o \ $(OBJS)\basedll_hashmap.o \ - $(OBJS)\basedll_http.o \ $(OBJS)\basedll_init.o \ $(OBJS)\basedll_intl.o \ $(OBJS)\basedll_ipcbase.o \ @@ -66,13 +63,7 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_mstream.o \ $(OBJS)\basedll_object.o \ $(OBJS)\basedll_process.o \ - $(OBJS)\basedll_protocol.o \ $(OBJS)\basedll_regex.o \ - $(OBJS)\basedll_sckaddr.o \ - $(OBJS)\basedll_sckfile.o \ - $(OBJS)\basedll_sckipc.o \ - $(OBJS)\basedll_sckstrm.o \ - $(OBJS)\basedll_socket.o \ $(OBJS)\basedll_stopwatch.o \ $(OBJS)\basedll_strconv.o \ $(OBJS)\basedll_stream.o \ @@ -83,14 +74,11 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_tokenzr.o \ $(OBJS)\basedll_txtstrm.o \ $(OBJS)\basedll_unzip.o \ - $(OBJS)\basedll_url.o \ $(OBJS)\basedll_variant.o \ $(OBJS)\basedll_wfstream.o \ $(OBJS)\basedll_wxchar.o \ $(OBJS)\basedll_zipstrm.o \ $(OBJS)\basedll_zstream.o \ - $(OBJS)\basedll_gsocket.o \ - $(OBJS)\basedll_gsockmsw.o \ $(OBJS)\basedll_basemsw.o \ $(OBJS)\basedll_dde.o \ $(OBJS)\basedll_dir.o \ @@ -121,7 +109,7 @@ BASELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \ -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \ -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CXXFLAGS) -BASELIB_OBJECTS = $(OBJS)\baselib_dummy.o $(OBJS)\baselib_appbase.o $(OBJS)\baselib_clntdata.o $(OBJS)\baselib_cmdline.o $(OBJS)\baselib_config.o $(OBJS)\baselib_datetime.o $(OBJS)\baselib_datstrm.o $(OBJS)\baselib_db.o $(OBJS)\baselib_dbtable.o $(OBJS)\baselib_dircmn.o $(OBJS)\baselib_dynarray.o $(OBJS)\baselib_dynlib.o $(OBJS)\baselib_dynload.o $(OBJS)\baselib_encconv.o $(OBJS)\baselib_extended.o $(OBJS)\baselib_ffile.o $(OBJS)\baselib_file.o $(OBJS)\baselib_fileconf.o $(OBJS)\baselib_filefn.o $(OBJS)\baselib_filename.o $(OBJS)\baselib_filesys.o $(OBJS)\baselib_fmapbase.o $(OBJS)\baselib_fs_inet.o $(OBJS)\baselib_fs_zip.o $(OBJS)\baselib_ftp.o $(OBJS)\baselib_hash.o $(OBJS)\baselib_hashmap.o $(OBJS)\baselib_http.o $(OBJS)\baselib_init.o $(OBJS)\baselib_intl.o $(OBJS)\baselib_ipcbase.o $(OBJS)\baselib_list.o $(OBJS)\baselib_log.o $(OBJS)\baselib_longlong.o $(OBJS)\baselib_memory.o $(OBJS)\baselib_mimecmn.o $(OBJS)\baselib_module.o $(OBJS)\baselib_mstream.o $(OBJS)\baselib_object.o $(OBJS)\baselib_process.o $(OBJS)\baselib_protocol.o $(OBJS)\baselib_regex.o $(OBJS)\baselib_sckaddr.o $(OBJS)\baselib_sckfile.o $(OBJS)\baselib_sckipc.o $(OBJS)\baselib_sckstrm.o $(OBJS)\baselib_socket.o $(OBJS)\baselib_stopwatch.o $(OBJS)\baselib_strconv.o $(OBJS)\baselib_stream.o $(OBJS)\baselib_string.o $(OBJS)\baselib_sysopt.o $(OBJS)\baselib_textbuf.o $(OBJS)\baselib_textfile.o $(OBJS)\baselib_tokenzr.o $(OBJS)\baselib_txtstrm.o $(OBJS)\baselib_unzip.o $(OBJS)\baselib_url.o $(OBJS)\baselib_variant.o $(OBJS)\baselib_wfstream.o $(OBJS)\baselib_wxchar.o $(OBJS)\baselib_zipstrm.o $(OBJS)\baselib_zstream.o $(OBJS)\baselib_gsocket.o $(OBJS)\baselib_gsockmsw.o $(OBJS)\baselib_basemsw.o $(OBJS)\baselib_dde.o $(OBJS)\baselib_dir.o $(OBJS)\baselib_mimetype.o $(OBJS)\baselib_regconf.o $(OBJS)\baselib_registry.o $(OBJS)\baselib_snglinst.o $(OBJS)\baselib_thread.o $(OBJS)\baselib_utils.o $(OBJS)\baselib_utilsexc.o $(OBJS)\baselib_crashrpt.o $(OBJS)\baselib_event.o $(OBJS)\baselib_fs_mem.o $(OBJS)\baselib_msgout.o $(OBJS)\baselib_utilscmn.o $(OBJS)\baselib_main.o $(OBJS)\baselib_mslu.o $(OBJS)\baselib_volume.o +BASELIB_OBJECTS = $(OBJS)\baselib_dummy.o $(OBJS)\baselib_appbase.o $(OBJS)\baselib_clntdata.o $(OBJS)\baselib_cmdline.o $(OBJS)\baselib_config.o $(OBJS)\baselib_datetime.o $(OBJS)\baselib_datstrm.o $(OBJS)\baselib_db.o $(OBJS)\baselib_dbtable.o $(OBJS)\baselib_dircmn.o $(OBJS)\baselib_dynarray.o $(OBJS)\baselib_dynlib.o $(OBJS)\baselib_dynload.o $(OBJS)\baselib_encconv.o $(OBJS)\baselib_extended.o $(OBJS)\baselib_ffile.o $(OBJS)\baselib_file.o $(OBJS)\baselib_fileconf.o $(OBJS)\baselib_filefn.o $(OBJS)\baselib_filename.o $(OBJS)\baselib_filesys.o $(OBJS)\baselib_fmapbase.o $(OBJS)\baselib_fs_zip.o $(OBJS)\baselib_hash.o $(OBJS)\baselib_hashmap.o $(OBJS)\baselib_init.o $(OBJS)\baselib_intl.o $(OBJS)\baselib_ipcbase.o $(OBJS)\baselib_list.o $(OBJS)\baselib_log.o $(OBJS)\baselib_longlong.o $(OBJS)\baselib_memory.o $(OBJS)\baselib_mimecmn.o $(OBJS)\baselib_module.o $(OBJS)\baselib_mstream.o $(OBJS)\baselib_object.o $(OBJS)\baselib_process.o $(OBJS)\baselib_regex.o $(OBJS)\baselib_stopwatch.o $(OBJS)\baselib_strconv.o $(OBJS)\baselib_stream.o $(OBJS)\baselib_string.o $(OBJS)\baselib_sysopt.o $(OBJS)\baselib_textbuf.o $(OBJS)\baselib_textfile.o $(OBJS)\baselib_tokenzr.o $(OBJS)\baselib_txtstrm.o $(OBJS)\baselib_unzip.o $(OBJS)\baselib_variant.o $(OBJS)\baselib_wfstream.o $(OBJS)\baselib_wxchar.o $(OBJS)\baselib_zipstrm.o $(OBJS)\baselib_zstream.o $(OBJS)\baselib_basemsw.o $(OBJS)\baselib_dde.o $(OBJS)\baselib_dir.o $(OBJS)\baselib_mimetype.o $(OBJS)\baselib_regconf.o $(OBJS)\baselib_registry.o $(OBJS)\baselib_snglinst.o $(OBJS)\baselib_thread.o $(OBJS)\baselib_utils.o $(OBJS)\baselib_utilsexc.o $(OBJS)\baselib_crashrpt.o $(OBJS)\baselib_event.o $(OBJS)\baselib_fs_mem.o $(OBJS)\baselib_msgout.o $(OBJS)\baselib_utilscmn.o $(OBJS)\baselib_main.o $(OBJS)\baselib_mslu.o $(OBJS)\baselib_volume.o BASELIB_OBJECTS = \ $(OBJS)\baselib_dummy.o \ $(OBJS)\baselib_appbase.o \ @@ -145,12 +133,9 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_filename.o \ $(OBJS)\baselib_filesys.o \ $(OBJS)\baselib_fmapbase.o \ - $(OBJS)\baselib_fs_inet.o \ $(OBJS)\baselib_fs_zip.o \ - $(OBJS)\baselib_ftp.o \ $(OBJS)\baselib_hash.o \ $(OBJS)\baselib_hashmap.o \ - $(OBJS)\baselib_http.o \ $(OBJS)\baselib_init.o \ $(OBJS)\baselib_intl.o \ $(OBJS)\baselib_ipcbase.o \ @@ -163,13 +148,7 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_mstream.o \ $(OBJS)\baselib_object.o \ $(OBJS)\baselib_process.o \ - $(OBJS)\baselib_protocol.o \ $(OBJS)\baselib_regex.o \ - $(OBJS)\baselib_sckaddr.o \ - $(OBJS)\baselib_sckfile.o \ - $(OBJS)\baselib_sckipc.o \ - $(OBJS)\baselib_sckstrm.o \ - $(OBJS)\baselib_socket.o \ $(OBJS)\baselib_stopwatch.o \ $(OBJS)\baselib_strconv.o \ $(OBJS)\baselib_stream.o \ @@ -180,14 +159,11 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_tokenzr.o \ $(OBJS)\baselib_txtstrm.o \ $(OBJS)\baselib_unzip.o \ - $(OBJS)\baselib_url.o \ $(OBJS)\baselib_variant.o \ $(OBJS)\baselib_wfstream.o \ $(OBJS)\baselib_wxchar.o \ $(OBJS)\baselib_zipstrm.o \ $(OBJS)\baselib_zstream.o \ - $(OBJS)\baselib_gsocket.o \ - $(OBJS)\baselib_gsockmsw.o \ $(OBJS)\baselib_basemsw.o \ $(OBJS)\baselib_dde.o \ $(OBJS)\baselib_dir.o \ @@ -337,7 +313,7 @@ MONODLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \ -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \ -DwxUSE_BASE=1 -DWXMAKINGDLL $(CXXFLAGS) -MONODLL_OBJECTS = $(OBJS)\monodll_dummy.o $(OBJS)\monodll_appbase.o $(OBJS)\monodll_clntdata.o $(OBJS)\monodll_cmdline.o $(OBJS)\monodll_config.o $(OBJS)\monodll_datetime.o $(OBJS)\monodll_datstrm.o $(OBJS)\monodll_db.o $(OBJS)\monodll_dbtable.o $(OBJS)\monodll_dircmn.o $(OBJS)\monodll_dynarray.o $(OBJS)\monodll_dynlib.o $(OBJS)\monodll_dynload.o $(OBJS)\monodll_encconv.o $(OBJS)\monodll_extended.o $(OBJS)\monodll_ffile.o $(OBJS)\monodll_file.o $(OBJS)\monodll_fileconf.o $(OBJS)\monodll_filefn.o $(OBJS)\monodll_filename.o $(OBJS)\monodll_filesys.o $(OBJS)\monodll_fmapbase.o $(OBJS)\monodll_fs_inet.o $(OBJS)\monodll_fs_zip.o $(OBJS)\monodll_ftp.o $(OBJS)\monodll_hash.o $(OBJS)\monodll_hashmap.o $(OBJS)\monodll_http.o $(OBJS)\monodll_init.o $(OBJS)\monodll_intl.o $(OBJS)\monodll_ipcbase.o $(OBJS)\monodll_list.o $(OBJS)\monodll_log.o $(OBJS)\monodll_longlong.o $(OBJS)\monodll_memory.o $(OBJS)\monodll_mimecmn.o $(OBJS)\monodll_module.o $(OBJS)\monodll_mstream.o $(OBJS)\monodll_object.o $(OBJS)\monodll_process.o $(OBJS)\monodll_protocol.o $(OBJS)\monodll_regex.o $(OBJS)\monodll_sckaddr.o $(OBJS)\monodll_sckfile.o $(OBJS)\monodll_sckipc.o $(OBJS)\monodll_sckstrm.o $(OBJS)\monodll_socket.o $(OBJS)\monodll_stopwatch.o $(OBJS)\monodll_strconv.o $(OBJS)\monodll_stream.o $(OBJS)\monodll_string.o $(OBJS)\monodll_sysopt.o $(OBJS)\monodll_textbuf.o $(OBJS)\monodll_textfile.o $(OBJS)\monodll_tokenzr.o $(OBJS)\monodll_txtstrm.o $(OBJS)\monodll_unzip.o $(OBJS)\monodll_url.o $(OBJS)\monodll_variant.o $(OBJS)\monodll_wfstream.o $(OBJS)\monodll_wxchar.o $(OBJS)\monodll_zipstrm.o $(OBJS)\monodll_zstream.o $(OBJS)\monodll_gsocket.o $(OBJS)\monodll_gsockmsw.o $(OBJS)\monodll_basemsw.o $(OBJS)\monodll_dde.o $(OBJS)\monodll_dir.o $(OBJS)\monodll_mimetype.o $(OBJS)\monodll_regconf.o $(OBJS)\monodll_registry.o $(OBJS)\monodll_snglinst.o $(OBJS)\monodll_thread.o $(OBJS)\monodll_utils.o $(OBJS)\monodll_utilsexc.o $(OBJS)\monodll_crashrpt.o $(OBJS)\monodll_event.o $(OBJS)\monodll_fs_mem.o $(OBJS)\monodll_msgout.o $(OBJS)\monodll_utilscmn.o $(OBJS)\monodll_main.o $(OBJS)\monodll_mslu.o $(OBJS)\monodll_volume.o $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) $(OBJS)\monodll_xml.o +MONODLL_OBJECTS = $(OBJS)\monodll_dummy.o $(OBJS)\monodll_appbase.o $(OBJS)\monodll_clntdata.o $(OBJS)\monodll_cmdline.o $(OBJS)\monodll_config.o $(OBJS)\monodll_datetime.o $(OBJS)\monodll_datstrm.o $(OBJS)\monodll_db.o $(OBJS)\monodll_dbtable.o $(OBJS)\monodll_dircmn.o $(OBJS)\monodll_dynarray.o $(OBJS)\monodll_dynlib.o $(OBJS)\monodll_dynload.o $(OBJS)\monodll_encconv.o $(OBJS)\monodll_extended.o $(OBJS)\monodll_ffile.o $(OBJS)\monodll_file.o $(OBJS)\monodll_fileconf.o $(OBJS)\monodll_filefn.o $(OBJS)\monodll_filename.o $(OBJS)\monodll_filesys.o $(OBJS)\monodll_fmapbase.o $(OBJS)\monodll_fs_zip.o $(OBJS)\monodll_hash.o $(OBJS)\monodll_hashmap.o $(OBJS)\monodll_init.o $(OBJS)\monodll_intl.o $(OBJS)\monodll_ipcbase.o $(OBJS)\monodll_list.o $(OBJS)\monodll_log.o $(OBJS)\monodll_longlong.o $(OBJS)\monodll_memory.o $(OBJS)\monodll_mimecmn.o $(OBJS)\monodll_module.o $(OBJS)\monodll_mstream.o $(OBJS)\monodll_object.o $(OBJS)\monodll_process.o $(OBJS)\monodll_regex.o $(OBJS)\monodll_stopwatch.o $(OBJS)\monodll_strconv.o $(OBJS)\monodll_stream.o $(OBJS)\monodll_string.o $(OBJS)\monodll_sysopt.o $(OBJS)\monodll_textbuf.o $(OBJS)\monodll_textfile.o $(OBJS)\monodll_tokenzr.o $(OBJS)\monodll_txtstrm.o $(OBJS)\monodll_unzip.o $(OBJS)\monodll_variant.o $(OBJS)\monodll_wfstream.o $(OBJS)\monodll_wxchar.o $(OBJS)\monodll_zipstrm.o $(OBJS)\monodll_zstream.o $(OBJS)\monodll_basemsw.o $(OBJS)\monodll_dde.o $(OBJS)\monodll_dir.o $(OBJS)\monodll_mimetype.o $(OBJS)\monodll_regconf.o $(OBJS)\monodll_registry.o $(OBJS)\monodll_snglinst.o $(OBJS)\monodll_thread.o $(OBJS)\monodll_utils.o $(OBJS)\monodll_utilsexc.o $(OBJS)\monodll_crashrpt.o $(OBJS)\monodll_event.o $(OBJS)\monodll_fs_mem.o $(OBJS)\monodll_msgout.o $(OBJS)\monodll_utilscmn.o $(OBJS)\monodll_main.o $(OBJS)\monodll_mslu.o $(OBJS)\monodll_volume.o $(OBJS)\monodll_fs_inet.o $(OBJS)\monodll_ftp.o $(OBJS)\monodll_http.o $(OBJS)\monodll_protocol.o $(OBJS)\monodll_url.o $(OBJS)\monodll_sckfile.o $(OBJS)\monodll_sckaddr.o $(OBJS)\monodll_sckipc.o $(OBJS)\monodll_sckstrm.o $(OBJS)\monodll_socket.o $(OBJS)\monodll_gsocket.o $(OBJS)\monodll_gsockmsw.o $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) $(OBJS)\monodll_xml.o MONODLL_OBJECTS = \ $(OBJS)\monodll_dummy.o \ $(OBJS)\monodll_appbase.o \ @@ -361,12 +337,9 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_filename.o \ $(OBJS)\monodll_filesys.o \ $(OBJS)\monodll_fmapbase.o \ - $(OBJS)\monodll_fs_inet.o \ $(OBJS)\monodll_fs_zip.o \ - $(OBJS)\monodll_ftp.o \ $(OBJS)\monodll_hash.o \ $(OBJS)\monodll_hashmap.o \ - $(OBJS)\monodll_http.o \ $(OBJS)\monodll_init.o \ $(OBJS)\monodll_intl.o \ $(OBJS)\monodll_ipcbase.o \ @@ -379,13 +352,7 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_mstream.o \ $(OBJS)\monodll_object.o \ $(OBJS)\monodll_process.o \ - $(OBJS)\monodll_protocol.o \ $(OBJS)\monodll_regex.o \ - $(OBJS)\monodll_sckaddr.o \ - $(OBJS)\monodll_sckfile.o \ - $(OBJS)\monodll_sckipc.o \ - $(OBJS)\monodll_sckstrm.o \ - $(OBJS)\monodll_socket.o \ $(OBJS)\monodll_stopwatch.o \ $(OBJS)\monodll_strconv.o \ $(OBJS)\monodll_stream.o \ @@ -396,14 +363,11 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_tokenzr.o \ $(OBJS)\monodll_txtstrm.o \ $(OBJS)\monodll_unzip.o \ - $(OBJS)\monodll_url.o \ $(OBJS)\monodll_variant.o \ $(OBJS)\monodll_wfstream.o \ $(OBJS)\monodll_wxchar.o \ $(OBJS)\monodll_zipstrm.o \ $(OBJS)\monodll_zstream.o \ - $(OBJS)\monodll_gsocket.o \ - $(OBJS)\monodll_gsockmsw.o \ $(OBJS)\monodll_basemsw.o \ $(OBJS)\monodll_dde.o \ $(OBJS)\monodll_dir.o \ @@ -422,6 +386,18 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_main.o \ $(OBJS)\monodll_mslu.o \ $(OBJS)\monodll_volume.o \ + $(OBJS)\monodll_fs_inet.o \ + $(OBJS)\monodll_ftp.o \ + $(OBJS)\monodll_http.o \ + $(OBJS)\monodll_protocol.o \ + $(OBJS)\monodll_url.o \ + $(OBJS)\monodll_sckfile.o \ + $(OBJS)\monodll_sckaddr.o \ + $(OBJS)\monodll_sckipc.o \ + $(OBJS)\monodll_sckstrm.o \ + $(OBJS)\monodll_socket.o \ + $(OBJS)\monodll_gsocket.o \ + $(OBJS)\monodll_gsockmsw.o \ $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \ $(OBJS)\monodll_xml.o MONOLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib -DwxUSE_BASE=1 $(CFLAGS) @@ -436,7 +412,7 @@ MONOLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \ -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \ -DwxUSE_BASE=1 $(CXXFLAGS) -MONOLIB_OBJECTS = $(OBJS)\monolib_dummy.o $(OBJS)\monolib_appbase.o $(OBJS)\monolib_clntdata.o $(OBJS)\monolib_cmdline.o $(OBJS)\monolib_config.o $(OBJS)\monolib_datetime.o $(OBJS)\monolib_datstrm.o $(OBJS)\monolib_db.o $(OBJS)\monolib_dbtable.o $(OBJS)\monolib_dircmn.o $(OBJS)\monolib_dynarray.o $(OBJS)\monolib_dynlib.o $(OBJS)\monolib_dynload.o $(OBJS)\monolib_encconv.o $(OBJS)\monolib_extended.o $(OBJS)\monolib_ffile.o $(OBJS)\monolib_file.o $(OBJS)\monolib_fileconf.o $(OBJS)\monolib_filefn.o $(OBJS)\monolib_filename.o $(OBJS)\monolib_filesys.o $(OBJS)\monolib_fmapbase.o $(OBJS)\monolib_fs_inet.o $(OBJS)\monolib_fs_zip.o $(OBJS)\monolib_ftp.o $(OBJS)\monolib_hash.o $(OBJS)\monolib_hashmap.o $(OBJS)\monolib_http.o $(OBJS)\monolib_init.o $(OBJS)\monolib_intl.o $(OBJS)\monolib_ipcbase.o $(OBJS)\monolib_list.o $(OBJS)\monolib_log.o $(OBJS)\monolib_longlong.o $(OBJS)\monolib_memory.o $(OBJS)\monolib_mimecmn.o $(OBJS)\monolib_module.o $(OBJS)\monolib_mstream.o $(OBJS)\monolib_object.o $(OBJS)\monolib_process.o $(OBJS)\monolib_protocol.o $(OBJS)\monolib_regex.o $(OBJS)\monolib_sckaddr.o $(OBJS)\monolib_sckfile.o $(OBJS)\monolib_sckipc.o $(OBJS)\monolib_sckstrm.o $(OBJS)\monolib_socket.o $(OBJS)\monolib_stopwatch.o $(OBJS)\monolib_strconv.o $(OBJS)\monolib_stream.o $(OBJS)\monolib_string.o $(OBJS)\monolib_sysopt.o $(OBJS)\monolib_textbuf.o $(OBJS)\monolib_textfile.o $(OBJS)\monolib_tokenzr.o $(OBJS)\monolib_txtstrm.o $(OBJS)\monolib_unzip.o $(OBJS)\monolib_url.o $(OBJS)\monolib_variant.o $(OBJS)\monolib_wfstream.o $(OBJS)\monolib_wxchar.o $(OBJS)\monolib_zipstrm.o $(OBJS)\monolib_zstream.o $(OBJS)\monolib_gsocket.o $(OBJS)\monolib_gsockmsw.o $(OBJS)\monolib_basemsw.o $(OBJS)\monolib_dde.o $(OBJS)\monolib_dir.o $(OBJS)\monolib_mimetype.o $(OBJS)\monolib_regconf.o $(OBJS)\monolib_registry.o $(OBJS)\monolib_snglinst.o $(OBJS)\monolib_thread.o $(OBJS)\monolib_utils.o $(OBJS)\monolib_utilsexc.o $(OBJS)\monolib_crashrpt.o $(OBJS)\monolib_event.o $(OBJS)\monolib_fs_mem.o $(OBJS)\monolib_msgout.o $(OBJS)\monolib_utilscmn.o $(OBJS)\monolib_main.o $(OBJS)\monolib_mslu.o $(OBJS)\monolib_volume.o $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) $(OBJS)\monolib_xml.o +MONOLIB_OBJECTS = $(OBJS)\monolib_dummy.o $(OBJS)\monolib_appbase.o $(OBJS)\monolib_clntdata.o $(OBJS)\monolib_cmdline.o $(OBJS)\monolib_config.o $(OBJS)\monolib_datetime.o $(OBJS)\monolib_datstrm.o $(OBJS)\monolib_db.o $(OBJS)\monolib_dbtable.o $(OBJS)\monolib_dircmn.o $(OBJS)\monolib_dynarray.o $(OBJS)\monolib_dynlib.o $(OBJS)\monolib_dynload.o $(OBJS)\monolib_encconv.o $(OBJS)\monolib_extended.o $(OBJS)\monolib_ffile.o $(OBJS)\monolib_file.o $(OBJS)\monolib_fileconf.o $(OBJS)\monolib_filefn.o $(OBJS)\monolib_filename.o $(OBJS)\monolib_filesys.o $(OBJS)\monolib_fmapbase.o $(OBJS)\monolib_fs_zip.o $(OBJS)\monolib_hash.o $(OBJS)\monolib_hashmap.o $(OBJS)\monolib_init.o $(OBJS)\monolib_intl.o $(OBJS)\monolib_ipcbase.o $(OBJS)\monolib_list.o $(OBJS)\monolib_log.o $(OBJS)\monolib_longlong.o $(OBJS)\monolib_memory.o $(OBJS)\monolib_mimecmn.o $(OBJS)\monolib_module.o $(OBJS)\monolib_mstream.o $(OBJS)\monolib_object.o $(OBJS)\monolib_process.o $(OBJS)\monolib_regex.o $(OBJS)\monolib_stopwatch.o $(OBJS)\monolib_strconv.o $(OBJS)\monolib_stream.o $(OBJS)\monolib_string.o $(OBJS)\monolib_sysopt.o $(OBJS)\monolib_textbuf.o $(OBJS)\monolib_textfile.o $(OBJS)\monolib_tokenzr.o $(OBJS)\monolib_txtstrm.o $(OBJS)\monolib_unzip.o $(OBJS)\monolib_variant.o $(OBJS)\monolib_wfstream.o $(OBJS)\monolib_wxchar.o $(OBJS)\monolib_zipstrm.o $(OBJS)\monolib_zstream.o $(OBJS)\monolib_basemsw.o $(OBJS)\monolib_dde.o $(OBJS)\monolib_dir.o $(OBJS)\monolib_mimetype.o $(OBJS)\monolib_regconf.o $(OBJS)\monolib_registry.o $(OBJS)\monolib_snglinst.o $(OBJS)\monolib_thread.o $(OBJS)\monolib_utils.o $(OBJS)\monolib_utilsexc.o $(OBJS)\monolib_crashrpt.o $(OBJS)\monolib_event.o $(OBJS)\monolib_fs_mem.o $(OBJS)\monolib_msgout.o $(OBJS)\monolib_utilscmn.o $(OBJS)\monolib_main.o $(OBJS)\monolib_mslu.o $(OBJS)\monolib_volume.o $(OBJS)\monolib_fs_inet.o $(OBJS)\monolib_ftp.o $(OBJS)\monolib_http.o $(OBJS)\monolib_protocol.o $(OBJS)\monolib_url.o $(OBJS)\monolib_sckfile.o $(OBJS)\monolib_sckaddr.o $(OBJS)\monolib_sckipc.o $(OBJS)\monolib_sckstrm.o $(OBJS)\monolib_socket.o $(OBJS)\monolib_gsocket.o $(OBJS)\monolib_gsockmsw.o $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) $(OBJS)\monolib_xml.o MONOLIB_OBJECTS = \ $(OBJS)\monolib_dummy.o \ $(OBJS)\monolib_appbase.o \ @@ -460,12 +436,9 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_filename.o \ $(OBJS)\monolib_filesys.o \ $(OBJS)\monolib_fmapbase.o \ - $(OBJS)\monolib_fs_inet.o \ $(OBJS)\monolib_fs_zip.o \ - $(OBJS)\monolib_ftp.o \ $(OBJS)\monolib_hash.o \ $(OBJS)\monolib_hashmap.o \ - $(OBJS)\monolib_http.o \ $(OBJS)\monolib_init.o \ $(OBJS)\monolib_intl.o \ $(OBJS)\monolib_ipcbase.o \ @@ -478,13 +451,7 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_mstream.o \ $(OBJS)\monolib_object.o \ $(OBJS)\monolib_process.o \ - $(OBJS)\monolib_protocol.o \ $(OBJS)\monolib_regex.o \ - $(OBJS)\monolib_sckaddr.o \ - $(OBJS)\monolib_sckfile.o \ - $(OBJS)\monolib_sckipc.o \ - $(OBJS)\monolib_sckstrm.o \ - $(OBJS)\monolib_socket.o \ $(OBJS)\monolib_stopwatch.o \ $(OBJS)\monolib_strconv.o \ $(OBJS)\monolib_stream.o \ @@ -495,14 +462,11 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_tokenzr.o \ $(OBJS)\monolib_txtstrm.o \ $(OBJS)\monolib_unzip.o \ - $(OBJS)\monolib_url.o \ $(OBJS)\monolib_variant.o \ $(OBJS)\monolib_wfstream.o \ $(OBJS)\monolib_wxchar.o \ $(OBJS)\monolib_zipstrm.o \ $(OBJS)\monolib_zstream.o \ - $(OBJS)\monolib_gsocket.o \ - $(OBJS)\monolib_gsockmsw.o \ $(OBJS)\monolib_basemsw.o \ $(OBJS)\monolib_dde.o \ $(OBJS)\monolib_dir.o \ @@ -521,8 +485,74 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_main.o \ $(OBJS)\monolib_mslu.o \ $(OBJS)\monolib_volume.o \ + $(OBJS)\monolib_fs_inet.o \ + $(OBJS)\monolib_ftp.o \ + $(OBJS)\monolib_http.o \ + $(OBJS)\monolib_protocol.o \ + $(OBJS)\monolib_url.o \ + $(OBJS)\monolib_sckfile.o \ + $(OBJS)\monolib_sckaddr.o \ + $(OBJS)\monolib_sckipc.o \ + $(OBJS)\monolib_sckstrm.o \ + $(OBJS)\monolib_socket.o \ + $(OBJS)\monolib_gsocket.o \ + $(OBJS)\monolib_gsockmsw.o \ $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \ $(OBJS)\monolib_xml.o +NETDLL_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS) +NETDLL_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \ + -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \ + -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS) +NETDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_NET $(CXXFLAGS) +NETDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \ + -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \ + -DWXUSINGDLL -DWXMAKINGDLL_NET $(CXXFLAGS) +NETDLL_OBJECTS = $(OBJS)\netdll_dummy.o $(OBJS)\netdll_fs_inet.o $(OBJS)\netdll_ftp.o $(OBJS)\netdll_http.o $(OBJS)\netdll_protocol.o $(OBJS)\netdll_url.o $(OBJS)\netdll_sckfile.o $(OBJS)\netdll_sckaddr.o $(OBJS)\netdll_sckipc.o $(OBJS)\netdll_sckstrm.o $(OBJS)\netdll_socket.o $(OBJS)\netdll_gsocket.o $(OBJS)\netdll_gsockmsw.o +NETDLL_OBJECTS = \ + $(OBJS)\netdll_dummy.o \ + $(OBJS)\netdll_fs_inet.o \ + $(OBJS)\netdll_ftp.o \ + $(OBJS)\netdll_http.o \ + $(OBJS)\netdll_protocol.o \ + $(OBJS)\netdll_url.o \ + $(OBJS)\netdll_sckfile.o \ + $(OBJS)\netdll_sckaddr.o \ + $(OBJS)\netdll_sckipc.o \ + $(OBJS)\netdll_sckstrm.o \ + $(OBJS)\netdll_socket.o \ + $(OBJS)\netdll_gsocket.o \ + $(OBJS)\netdll_gsockmsw.o +NETLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS) +NETLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \ + -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \ + -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS) +NETLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_NET $(CXXFLAGS) +NETLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \ + -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \ + -DWXUSINGDLL -DWXMAKINGDLL_NET $(CXXFLAGS) +NETLIB_OBJECTS = $(OBJS)\netlib_dummy.o $(OBJS)\netlib_fs_inet.o $(OBJS)\netlib_ftp.o $(OBJS)\netlib_http.o $(OBJS)\netlib_protocol.o $(OBJS)\netlib_url.o $(OBJS)\netlib_sckfile.o $(OBJS)\netlib_sckaddr.o $(OBJS)\netlib_sckipc.o $(OBJS)\netlib_sckstrm.o $(OBJS)\netlib_socket.o $(OBJS)\netlib_gsocket.o $(OBJS)\netlib_gsockmsw.o +NETLIB_OBJECTS = \ + $(OBJS)\netlib_dummy.o \ + $(OBJS)\netlib_fs_inet.o \ + $(OBJS)\netlib_ftp.o \ + $(OBJS)\netlib_http.o \ + $(OBJS)\netlib_protocol.o \ + $(OBJS)\netlib_url.o \ + $(OBJS)\netlib_sckfile.o \ + $(OBJS)\netlib_sckaddr.o \ + $(OBJS)\netlib_sckipc.o \ + $(OBJS)\netlib_sckstrm.o \ + $(OBJS)\netlib_socket.o \ + $(OBJS)\netlib_gsocket.o \ + $(OBJS)\netlib_gsockmsw.o OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @@ -2528,6 +2558,18 @@ __monolib___depname = \ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a endif endif +ifeq ($(MONOLITHIC),0) +ifeq ($(SHARED),1) +__netdll___depname = \ + $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_gcc$(VENDORTAG).dll +endif +endif +ifeq ($(MONOLITHIC),0) +ifeq ($(SHARED),0) +__netlib___depname = \ + $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.a +endif +endif ifeq ($(USE_GUI),1) __wxjpeg___depname = $(LIBDIRNAME)\libwxjpeg$(WXDEBUGFLAG).a endif @@ -2557,7 +2599,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) $(__coredll___depname) $(__corelib___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) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) $(OBJS)\basedll_appbase.o: ..\src\common\appbase.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -2640,33 +2682,18 @@ $(OBJS)\basedll_filesys.o: ..\src\common\filesys.cpp $(OBJS)\basedll_fmapbase.o: ..\src\common\fmapbase.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< -$(OBJS)\basedll_fs_inet.o: ..\src\common\fs_inet.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< - $(OBJS)\basedll_fs_mem.o: ..\src\common\fs_mem.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< $(OBJS)\basedll_fs_zip.o: ..\src\common\fs_zip.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< -$(OBJS)\basedll_ftp.o: ..\src\common\ftp.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_gsocket.o: ..\src\msw\gsocket.c - $(CC) -c -o $@ $(BASEDLL_CFLAGS) $< - -$(OBJS)\basedll_gsockmsw.o: ..\src\msw\gsockmsw.c - $(CC) -c -o $@ $(BASEDLL_CFLAGS) $< - $(OBJS)\basedll_hash.o: ..\src\common\hash.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< $(OBJS)\basedll_hashmap.o: ..\src\common\hashmap.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< -$(OBJS)\basedll_http.o: ..\src\common\http.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< - $(OBJS)\basedll_init.o: ..\src\common\init.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -2715,9 +2742,6 @@ $(OBJS)\basedll_object.o: ..\src\common\object.cpp $(OBJS)\basedll_process.o: ..\src\common\process.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< -$(OBJS)\basedll_protocol.o: ..\src\common\protocol.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< - $(OBJS)\basedll_regconf.o: ..\src\msw\regconf.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -2727,24 +2751,9 @@ $(OBJS)\basedll_regex.o: ..\src\common\regex.cpp $(OBJS)\basedll_registry.o: ..\src\msw\registry.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< -$(OBJS)\basedll_sckaddr.o: ..\src\common\sckaddr.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_sckfile.o: ..\src\common\sckfile.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_sckipc.o: ..\src\common\sckipc.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_sckstrm.o: ..\src\common\sckstrm.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< - $(OBJS)\basedll_snglinst.o: ..\src\msw\snglinst.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< -$(OBJS)\basedll_socket.o: ..\src\common\socket.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< - $(OBJS)\basedll_stopwatch.o: ..\src\common\stopwatch.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -2778,9 +2787,6 @@ $(OBJS)\basedll_txtstrm.o: ..\src\common\txtstrm.cpp $(OBJS)\basedll_unzip.o: ..\src\common\unzip.c $(CC) -c -o $@ $(BASEDLL_CFLAGS) $< -$(OBJS)\basedll_url.o: ..\src\common\url.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< - $(OBJS)\basedll_utils.o: ..\src\msw\utils.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $< @@ -2889,33 +2895,18 @@ $(OBJS)\baselib_filesys.o: ..\src\common\filesys.cpp $(OBJS)\baselib_fmapbase.o: ..\src\common\fmapbase.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< -$(OBJS)\baselib_fs_inet.o: ..\src\common\fs_inet.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< - $(OBJS)\baselib_fs_mem.o: ..\src\common\fs_mem.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< $(OBJS)\baselib_fs_zip.o: ..\src\common\fs_zip.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< -$(OBJS)\baselib_ftp.o: ..\src\common\ftp.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_gsocket.o: ..\src\msw\gsocket.c - $(CC) -c -o $@ $(BASELIB_CFLAGS) $< - -$(OBJS)\baselib_gsockmsw.o: ..\src\msw\gsockmsw.c - $(CC) -c -o $@ $(BASELIB_CFLAGS) $< - $(OBJS)\baselib_hash.o: ..\src\common\hash.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< $(OBJS)\baselib_hashmap.o: ..\src\common\hashmap.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< -$(OBJS)\baselib_http.o: ..\src\common\http.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< - $(OBJS)\baselib_init.o: ..\src\common\init.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -2964,9 +2955,6 @@ $(OBJS)\baselib_object.o: ..\src\common\object.cpp $(OBJS)\baselib_process.o: ..\src\common\process.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< -$(OBJS)\baselib_protocol.o: ..\src\common\protocol.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< - $(OBJS)\baselib_regconf.o: ..\src\msw\regconf.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -2976,24 +2964,9 @@ $(OBJS)\baselib_regex.o: ..\src\common\regex.cpp $(OBJS)\baselib_registry.o: ..\src\msw\registry.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< -$(OBJS)\baselib_sckaddr.o: ..\src\common\sckaddr.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_sckfile.o: ..\src\common\sckfile.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_sckipc.o: ..\src\common\sckipc.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_sckstrm.o: ..\src\common\sckstrm.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< - $(OBJS)\baselib_snglinst.o: ..\src\msw\snglinst.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< -$(OBJS)\baselib_socket.o: ..\src\common\socket.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< - $(OBJS)\baselib_stopwatch.o: ..\src\common\stopwatch.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -3027,9 +3000,6 @@ $(OBJS)\baselib_txtstrm.o: ..\src\common\txtstrm.cpp $(OBJS)\baselib_unzip.o: ..\src\common\unzip.c $(CC) -c -o $@ $(BASELIB_CFLAGS) $< -$(OBJS)\baselib_url.o: ..\src\common\url.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< - $(OBJS)\baselib_utils.o: ..\src\msw\utils.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $< @@ -8923,6 +8893,84 @@ $(OBJS)\monolib_zipstrm.o: ..\src\common\zipstrm.cpp $(OBJS)\monolib_zstream.o: ..\src\common\zstream.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\netdll_dummy.o: ..\src\msw\dummy.cpp + $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $< + +$(OBJS)\netdll_fs_inet.o: ..\src\common\fs_inet.cpp + $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $< + +$(OBJS)\netdll_ftp.o: ..\src\common\ftp.cpp + $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $< + +$(OBJS)\netdll_gsocket.o: ..\src\msw\gsocket.c + $(CC) -c -o $@ $(NETDLL_CFLAGS) $< + +$(OBJS)\netdll_gsockmsw.o: ..\src\msw\gsockmsw.c + $(CC) -c -o $@ $(NETDLL_CFLAGS) $< + +$(OBJS)\netdll_http.o: ..\src\common\http.cpp + $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $< + +$(OBJS)\netdll_protocol.o: ..\src\common\protocol.cpp + $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $< + +$(OBJS)\netdll_sckaddr.o: ..\src\common\sckaddr.cpp + $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $< + +$(OBJS)\netdll_sckfile.o: ..\src\common\sckfile.cpp + $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $< + +$(OBJS)\netdll_sckipc.o: ..\src\common\sckipc.cpp + $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $< + +$(OBJS)\netdll_sckstrm.o: ..\src\common\sckstrm.cpp + $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $< + +$(OBJS)\netdll_socket.o: ..\src\common\socket.cpp + $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $< + +$(OBJS)\netdll_url.o: ..\src\common\url.cpp + $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $< + +$(OBJS)\netlib_dummy.o: ..\src\msw\dummy.cpp + $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $< + +$(OBJS)\netlib_fs_inet.o: ..\src\common\fs_inet.cpp + $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $< + +$(OBJS)\netlib_ftp.o: ..\src\common\ftp.cpp + $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $< + +$(OBJS)\netlib_gsocket.o: ..\src\msw\gsocket.c + $(CC) -c -o $@ $(NETLIB_CFLAGS) $< + +$(OBJS)\netlib_gsockmsw.o: ..\src\msw\gsockmsw.c + $(CC) -c -o $@ $(NETLIB_CFLAGS) $< + +$(OBJS)\netlib_http.o: ..\src\common\http.cpp + $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $< + +$(OBJS)\netlib_protocol.o: ..\src\common\protocol.cpp + $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $< + +$(OBJS)\netlib_sckaddr.o: ..\src\common\sckaddr.cpp + $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $< + +$(OBJS)\netlib_sckfile.o: ..\src\common\sckfile.cpp + $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $< + +$(OBJS)\netlib_sckipc.o: ..\src\common\sckipc.cpp + $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $< + +$(OBJS)\netlib_sckstrm.o: ..\src\common\sckstrm.cpp + $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $< + +$(OBJS)\netlib_socket.o: ..\src\common\socket.cpp + $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $< + +$(OBJS)\netlib_url.o: ..\src\common\url.cpp + $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $< + $(OBJS)\wxexpat_xmlparse.o: ..\src\expat\lib\xmlparse.c $(CC) -c -o $@ $(WXEXPAT_CFLAGS) $< @@ -9288,7 +9336,7 @@ $(OBJS)\xmllib_xml.o: ..\src\xml\xml.cpp ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) -$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gcc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a +$(LIBDIRNAME)\wxbase250$(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) $(__DEBUGFLAG) -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) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 endif endif @@ -9316,6 +9364,9 @@ clean: -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(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)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(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)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(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 @@ -9414,6 +9465,22 @@ endif ..\include\wx\msw\setup.h: if not exist ..\include\wx\msw\setup.h copy ..\include\wx\msw\setup0.h ..\include\wx\msw\setup.h +ifeq ($(MONOLITHIC),0) +ifeq ($(SHARED),1) +$(LIBDIRNAME)\wxbase250$(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) $(__DEBUGFLAG) -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) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a +endif +endif + +ifeq ($(MONOLITHIC),0) +ifeq ($(SHARED),0) +$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.a: $(NETLIB_OBJECTS) + if exist $@ del $@ + ar rcu $@ $(NETLIB_OBJECTS) + ranlib $@ +endif +endif + $(LIBDIRNAME)\wx\setup.h: if not exist $(LIBDIRNAME)\wx\setup.h copy ..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h @@ -9457,7 +9524,7 @@ $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a: $(WXZLIB_OBJECTS) ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) -$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_gcc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__basedll___depname) +$(LIBDIRNAME)\wxbase250$(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) $(__DEBUGFLAG) -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) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a endif endif diff --git a/build/makefile.vc b/build/makefile.vc index a151247636..3609505513 100644 --- a/build/makefile.vc +++ b/build/makefile.vc @@ -12,22 +12,21 @@ ### Variables: ### -BASEDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +BASEDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \ + $(__DEBUGFLAG_46) $(____DEBUGFLAG) \ /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \ $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_basedll.pch /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 \ - /DwxUSE_GUI=0 $(CFLAGS) -BASEDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ + /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 /DwxUSE_GUI=0 $(CFLAGS) +BASEDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \ + $(__DEBUGFLAG_46) $(____DEBUGFLAG) \ /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \ $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_basedll.pch /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 \ - /DwxUSE_GUI=0 $(CXXFLAGS) /Yuwx/wxprec.h + /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 /DwxUSE_GUI=0 $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_basedll.pch" BASEDLL_OBJECTS = \ $(OBJS)\basedll_dummy.obj \ $(OBJS)\basedll_appbase.obj \ @@ -51,12 +50,9 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_filename.obj \ $(OBJS)\basedll_filesys.obj \ $(OBJS)\basedll_fmapbase.obj \ - $(OBJS)\basedll_fs_inet.obj \ $(OBJS)\basedll_fs_zip.obj \ - $(OBJS)\basedll_ftp.obj \ $(OBJS)\basedll_hash.obj \ $(OBJS)\basedll_hashmap.obj \ - $(OBJS)\basedll_http.obj \ $(OBJS)\basedll_init.obj \ $(OBJS)\basedll_intl.obj \ $(OBJS)\basedll_ipcbase.obj \ @@ -69,13 +65,7 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_mstream.obj \ $(OBJS)\basedll_object.obj \ $(OBJS)\basedll_process.obj \ - $(OBJS)\basedll_protocol.obj \ $(OBJS)\basedll_regex.obj \ - $(OBJS)\basedll_sckaddr.obj \ - $(OBJS)\basedll_sckfile.obj \ - $(OBJS)\basedll_sckipc.obj \ - $(OBJS)\basedll_sckstrm.obj \ - $(OBJS)\basedll_socket.obj \ $(OBJS)\basedll_stopwatch.obj \ $(OBJS)\basedll_strconv.obj \ $(OBJS)\basedll_stream.obj \ @@ -86,14 +76,11 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_tokenzr.obj \ $(OBJS)\basedll_txtstrm.obj \ $(OBJS)\basedll_unzip.obj \ - $(OBJS)\basedll_url.obj \ $(OBJS)\basedll_variant.obj \ $(OBJS)\basedll_wfstream.obj \ $(OBJS)\basedll_wxchar.obj \ $(OBJS)\basedll_zipstrm.obj \ $(OBJS)\basedll_zstream.obj \ - $(OBJS)\basedll_gsocket.obj \ - $(OBJS)\basedll_gsockmsw.obj \ $(OBJS)\basedll_basemsw.obj \ $(OBJS)\basedll_dde.obj \ $(OBJS)\basedll_dir.obj \ @@ -112,21 +99,21 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_main.obj \ $(OBJS)\basedll_mslu.obj \ $(OBJS)\basedll_volume.obj -BASELIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +BASELIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \ + $(__DEBUGFLAG_46) $(____DEBUGFLAG) \ /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \ $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_baselib.pch /DwxUSE_BASE=1 /DwxUSE_GUI=0 $(CFLAGS) -BASELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ + /DwxUSE_BASE=1 /DwxUSE_GUI=0 $(CFLAGS) +BASELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \ + $(__DEBUGFLAG_46) $(____DEBUGFLAG) \ /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \ $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_baselib.pch /DwxUSE_BASE=1 /DwxUSE_GUI=0 $(CXXFLAGS) \ - /Yuwx/wxprec.h + /DwxUSE_BASE=1 /DwxUSE_GUI=0 $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_baselib.pch" BASELIB_OBJECTS = \ $(OBJS)\baselib_dummy.obj \ $(OBJS)\baselib_appbase.obj \ @@ -150,12 +137,9 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_filename.obj \ $(OBJS)\baselib_filesys.obj \ $(OBJS)\baselib_fmapbase.obj \ - $(OBJS)\baselib_fs_inet.obj \ $(OBJS)\baselib_fs_zip.obj \ - $(OBJS)\baselib_ftp.obj \ $(OBJS)\baselib_hash.obj \ $(OBJS)\baselib_hashmap.obj \ - $(OBJS)\baselib_http.obj \ $(OBJS)\baselib_init.obj \ $(OBJS)\baselib_intl.obj \ $(OBJS)\baselib_ipcbase.obj \ @@ -168,13 +152,7 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_mstream.obj \ $(OBJS)\baselib_object.obj \ $(OBJS)\baselib_process.obj \ - $(OBJS)\baselib_protocol.obj \ $(OBJS)\baselib_regex.obj \ - $(OBJS)\baselib_sckaddr.obj \ - $(OBJS)\baselib_sckfile.obj \ - $(OBJS)\baselib_sckipc.obj \ - $(OBJS)\baselib_sckstrm.obj \ - $(OBJS)\baselib_socket.obj \ $(OBJS)\baselib_stopwatch.obj \ $(OBJS)\baselib_strconv.obj \ $(OBJS)\baselib_stream.obj \ @@ -185,14 +163,11 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_tokenzr.obj \ $(OBJS)\baselib_txtstrm.obj \ $(OBJS)\baselib_unzip.obj \ - $(OBJS)\baselib_url.obj \ $(OBJS)\baselib_variant.obj \ $(OBJS)\baselib_wfstream.obj \ $(OBJS)\baselib_wxchar.obj \ $(OBJS)\baselib_zipstrm.obj \ $(OBJS)\baselib_zstream.obj \ - $(OBJS)\baselib_gsocket.obj \ - $(OBJS)\baselib_gsockmsw.obj \ $(OBJS)\baselib_basemsw.obj \ $(OBJS)\baselib_dde.obj \ $(OBJS)\baselib_dir.obj \ @@ -211,14 +186,14 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_main.obj \ $(OBJS)\baselib_mslu.obj \ $(OBJS)\baselib_volume.obj -COREDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +COREDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \ + $(__DEBUGFLAG_46) $(____DEBUGFLAG) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).pdb \ $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_coredll.pch /DWXUSINGDLL /DWXMAKINGDLL_CORE \ - /DwxUSE_BASE=0 $(CXXFLAGS) /Yuwx/wxprec.h + /DWXUSINGDLL /DWXMAKINGDLL_CORE /DwxUSE_BASE=0 $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_coredll.pch" COREDLL_OBJECTS = \ $(OBJS)\coredll_dummy.obj \ $(OBJS)\coredll_event.obj \ @@ -229,13 +204,13 @@ COREDLL_OBJECTS = \ $(OBJS)\coredll_mslu.obj \ $(OBJS)\coredll_volume.obj \ $(____CORE_SRC_FILENAMES_2_OBJECTS) -CORELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +CORELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \ + $(__DEBUGFLAG_46) $(____DEBUGFLAG) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.pdb \ $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_corelib.pch /DwxUSE_BASE=0 $(CXXFLAGS) /Yuwx/wxprec.h + /DwxUSE_BASE=0 $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_corelib.pch" CORELIB_OBJECTS = \ $(OBJS)\corelib_dummy.obj \ $(OBJS)\corelib_event.obj \ @@ -246,35 +221,35 @@ CORELIB_OBJECTS = \ $(OBJS)\corelib_mslu.obj \ $(OBJS)\corelib_volume.obj \ $(____CORE_SRC_FILENAMES_3_OBJECTS) -GLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +GLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \ + $(__DEBUGFLAG_46) $(____DEBUGFLAG) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).pdb \ $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_gldll.pch /DWXUSINGDLL /DWXMAKINGDLL_GL $(CXXFLAGS) \ - /Yuwx/wxprec.h + /DWXUSINGDLL /DWXMAKINGDLL_GL $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_gldll.pch" GLDLL_OBJECTS = \ $(OBJS)\gldll_dummy.obj \ $(OBJS)\gldll_glcanvas.obj -GLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +GLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \ + $(__DEBUGFLAG_46) $(____DEBUGFLAG) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.pdb \ $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_gllib.pch $(CXXFLAGS) /Yuwx/wxprec.h + $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gllib.pch" GLLIB_OBJECTS = \ $(OBJS)\gllib_dummy.obj \ $(OBJS)\gllib_glcanvas.obj -HTMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +HTMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \ + $(__DEBUGFLAG_46) $(____DEBUGFLAG) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).pdb \ $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_htmldll.pch /DWXUSINGDLL /DWXMAKINGDLL_HTML $(CXXFLAGS) \ - /Yuwx/wxprec.h + /DWXUSINGDLL /DWXMAKINGDLL_HTML $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_htmldll.pch" HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_dummy.obj \ $(OBJS)\htmldll_helpbest.obj \ @@ -299,13 +274,13 @@ HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_m_style.obj \ $(OBJS)\htmldll_htmprint.obj \ $(OBJS)\htmldll_htmllbox.obj -HTMLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +HTMLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \ + $(__DEBUGFLAG_46) $(____DEBUGFLAG) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.pdb \ $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_htmllib.pch $(CXXFLAGS) /Yuwx/wxprec.h + $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_htmllib.pch" HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_dummy.obj \ $(OBJS)\htmllib_helpbest.obj \ @@ -332,21 +307,21 @@ HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_htmllbox.obj LIBDIRNAME = \ ..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -MONODLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +MONODLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \ + $(__DEBUGFLAG_46) $(____DEBUGFLAG) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \ $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_monodll.pch /DwxUSE_BASE=1 /DWXMAKINGDLL $(CFLAGS) -MONODLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ + /DwxUSE_BASE=1 /DWXMAKINGDLL $(CFLAGS) +MONODLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \ + $(__DEBUGFLAG_46) $(____DEBUGFLAG) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \ $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_monodll.pch /DwxUSE_BASE=1 /DWXMAKINGDLL $(CXXFLAGS) \ - /Yuwx/wxprec.h + /DwxUSE_BASE=1 /DWXMAKINGDLL $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_monodll.pch" MONODLL_OBJECTS = \ $(OBJS)\monodll_dummy.obj \ $(OBJS)\monodll_appbase.obj \ @@ -370,12 +345,9 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_filename.obj \ $(OBJS)\monodll_filesys.obj \ $(OBJS)\monodll_fmapbase.obj \ - $(OBJS)\monodll_fs_inet.obj \ $(OBJS)\monodll_fs_zip.obj \ - $(OBJS)\monodll_ftp.obj \ $(OBJS)\monodll_hash.obj \ $(OBJS)\monodll_hashmap.obj \ - $(OBJS)\monodll_http.obj \ $(OBJS)\monodll_init.obj \ $(OBJS)\monodll_intl.obj \ $(OBJS)\monodll_ipcbase.obj \ @@ -388,13 +360,7 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_mstream.obj \ $(OBJS)\monodll_object.obj \ $(OBJS)\monodll_process.obj \ - $(OBJS)\monodll_protocol.obj \ $(OBJS)\monodll_regex.obj \ - $(OBJS)\monodll_sckaddr.obj \ - $(OBJS)\monodll_sckfile.obj \ - $(OBJS)\monodll_sckipc.obj \ - $(OBJS)\monodll_sckstrm.obj \ - $(OBJS)\monodll_socket.obj \ $(OBJS)\monodll_stopwatch.obj \ $(OBJS)\monodll_strconv.obj \ $(OBJS)\monodll_stream.obj \ @@ -405,14 +371,11 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_tokenzr.obj \ $(OBJS)\monodll_txtstrm.obj \ $(OBJS)\monodll_unzip.obj \ - $(OBJS)\monodll_url.obj \ $(OBJS)\monodll_variant.obj \ $(OBJS)\monodll_wfstream.obj \ $(OBJS)\monodll_wxchar.obj \ $(OBJS)\monodll_zipstrm.obj \ $(OBJS)\monodll_zstream.obj \ - $(OBJS)\monodll_gsocket.obj \ - $(OBJS)\monodll_gsockmsw.obj \ $(OBJS)\monodll_basemsw.obj \ $(OBJS)\monodll_dde.obj \ $(OBJS)\monodll_dir.obj \ @@ -431,22 +394,34 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_main.obj \ $(OBJS)\monodll_mslu.obj \ $(OBJS)\monodll_volume.obj \ + $(OBJS)\monodll_fs_inet.obj \ + $(OBJS)\monodll_ftp.obj \ + $(OBJS)\monodll_http.obj \ + $(OBJS)\monodll_protocol.obj \ + $(OBJS)\monodll_url.obj \ + $(OBJS)\monodll_sckfile.obj \ + $(OBJS)\monodll_sckaddr.obj \ + $(OBJS)\monodll_sckipc.obj \ + $(OBJS)\monodll_sckstrm.obj \ + $(OBJS)\monodll_socket.obj \ + $(OBJS)\monodll_gsocket.obj \ + $(OBJS)\monodll_gsockmsw.obj \ $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \ $(OBJS)\monodll_xml.obj -MONOLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +MONOLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \ + $(__DEBUGFLAG_46) $(____DEBUGFLAG) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \ $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_monolib.pch /DwxUSE_BASE=1 $(CFLAGS) -MONOLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ + /DwxUSE_BASE=1 $(CFLAGS) +MONOLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \ + $(__DEBUGFLAG_46) $(____DEBUGFLAG) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \ $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_monolib.pch /DwxUSE_BASE=1 $(CXXFLAGS) /Yuwx/wxprec.h + /DwxUSE_BASE=1 $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_monolib.pch" MONOLIB_OBJECTS = \ $(OBJS)\monolib_dummy.obj \ $(OBJS)\monolib_appbase.obj \ @@ -470,12 +445,9 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_filename.obj \ $(OBJS)\monolib_filesys.obj \ $(OBJS)\monolib_fmapbase.obj \ - $(OBJS)\monolib_fs_inet.obj \ $(OBJS)\monolib_fs_zip.obj \ - $(OBJS)\monolib_ftp.obj \ $(OBJS)\monolib_hash.obj \ $(OBJS)\monolib_hashmap.obj \ - $(OBJS)\monolib_http.obj \ $(OBJS)\monolib_init.obj \ $(OBJS)\monolib_intl.obj \ $(OBJS)\monolib_ipcbase.obj \ @@ -488,13 +460,7 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_mstream.obj \ $(OBJS)\monolib_object.obj \ $(OBJS)\monolib_process.obj \ - $(OBJS)\monolib_protocol.obj \ $(OBJS)\monolib_regex.obj \ - $(OBJS)\monolib_sckaddr.obj \ - $(OBJS)\monolib_sckfile.obj \ - $(OBJS)\monolib_sckipc.obj \ - $(OBJS)\monolib_sckstrm.obj \ - $(OBJS)\monolib_socket.obj \ $(OBJS)\monolib_stopwatch.obj \ $(OBJS)\monolib_strconv.obj \ $(OBJS)\monolib_stream.obj \ @@ -505,14 +471,11 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_tokenzr.obj \ $(OBJS)\monolib_txtstrm.obj \ $(OBJS)\monolib_unzip.obj \ - $(OBJS)\monolib_url.obj \ $(OBJS)\monolib_variant.obj \ $(OBJS)\monolib_wfstream.obj \ $(OBJS)\monolib_wxchar.obj \ $(OBJS)\monolib_zipstrm.obj \ $(OBJS)\monolib_zstream.obj \ - $(OBJS)\monolib_gsocket.obj \ - $(OBJS)\monolib_gsockmsw.obj \ $(OBJS)\monolib_basemsw.obj \ $(OBJS)\monolib_dde.obj \ $(OBJS)\monolib_dir.obj \ @@ -531,20 +494,90 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_main.obj \ $(OBJS)\monolib_mslu.obj \ $(OBJS)\monolib_volume.obj \ + $(OBJS)\monolib_fs_inet.obj \ + $(OBJS)\monolib_ftp.obj \ + $(OBJS)\monolib_http.obj \ + $(OBJS)\monolib_protocol.obj \ + $(OBJS)\monolib_url.obj \ + $(OBJS)\monolib_sckfile.obj \ + $(OBJS)\monolib_sckaddr.obj \ + $(OBJS)\monolib_sckipc.obj \ + $(OBJS)\monolib_sckstrm.obj \ + $(OBJS)\monolib_socket.obj \ + $(OBJS)\monolib_gsocket.obj \ + $(OBJS)\monolib_gsockmsw.obj \ $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \ $(OBJS)\monolib_xml.obj +NETDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \ + $(__DEBUGFLAG_46) $(____DEBUGFLAG) \ + /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb \ + $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ + /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ + /DWXUSINGDLL /DWXMAKINGDLL_NET $(CFLAGS) +NETDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \ + $(__DEBUGFLAG_46) $(____DEBUGFLAG) \ + /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb \ + $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ + /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ + /DWXUSINGDLL /DWXMAKINGDLL_NET $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_netdll.pch" +NETDLL_OBJECTS = \ + $(OBJS)\netdll_dummy.obj \ + $(OBJS)\netdll_fs_inet.obj \ + $(OBJS)\netdll_ftp.obj \ + $(OBJS)\netdll_http.obj \ + $(OBJS)\netdll_protocol.obj \ + $(OBJS)\netdll_url.obj \ + $(OBJS)\netdll_sckfile.obj \ + $(OBJS)\netdll_sckaddr.obj \ + $(OBJS)\netdll_sckipc.obj \ + $(OBJS)\netdll_sckstrm.obj \ + $(OBJS)\netdll_socket.obj \ + $(OBJS)\netdll_gsocket.obj \ + $(OBJS)\netdll_gsockmsw.obj +NETLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \ + $(__DEBUGFLAG_46) $(____DEBUGFLAG) \ + /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.pdb \ + $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ + /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ + /DWXUSINGDLL /DWXMAKINGDLL_NET $(CFLAGS) +NETLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \ + $(__DEBUGFLAG_46) $(____DEBUGFLAG) \ + /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.pdb \ + $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ + /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ + /DWXUSINGDLL /DWXMAKINGDLL_NET $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_netlib.pch" +NETLIB_OBJECTS = \ + $(OBJS)\netlib_dummy.obj \ + $(OBJS)\netlib_fs_inet.obj \ + $(OBJS)\netlib_ftp.obj \ + $(OBJS)\netlib_http.obj \ + $(OBJS)\netlib_protocol.obj \ + $(OBJS)\netlib_url.obj \ + $(OBJS)\netlib_sckfile.obj \ + $(OBJS)\netlib_sckaddr.obj \ + $(OBJS)\netlib_sckipc.obj \ + $(OBJS)\netlib_sckstrm.obj \ + $(OBJS)\netlib_socket.obj \ + $(OBJS)\netlib_gsocket.obj \ + $(OBJS)\netlib_gsockmsw.obj OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -WXEXPAT_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +WXEXPAT_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \ + $(__DEBUGFLAG_46) $(____DEBUGFLAG) \ /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb $(__OPTIMIZEFLAG) \ /I$(LIBDIRNAME) /DCOMPILED_FROM_DSP $(CFLAGS) WXEXPAT_OBJECTS = \ $(OBJS)\wxexpat_xmlparse.obj \ $(OBJS)\wxexpat_xmlrole.obj \ $(OBJS)\wxexpat_xmltok.obj -WXJPEG_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +WXJPEG_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \ + $(__DEBUGFLAG_46) $(____DEBUGFLAG) \ /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(__OPTIMIZEFLAG) \ /I$(LIBDIRNAME) $(CFLAGS) WXJPEG_OBJECTS = \ @@ -594,8 +627,8 @@ WXJPEG_OBJECTS = \ $(OBJS)\wxjpeg_jquant1.obj \ $(OBJS)\wxjpeg_jquant2.obj \ $(OBJS)\wxjpeg_jdmerge.obj -WXPNG_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +WXPNG_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \ + $(__DEBUGFLAG_46) $(____DEBUGFLAG) \ /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(__OPTIMIZEFLAG) /I..\src\zlib \ $(CFLAGS) WXPNG_OBJECTS = \ @@ -616,16 +649,16 @@ WXPNG_OBJECTS = \ $(OBJS)\wxpng_pngwrite.obj \ $(OBJS)\wxpng_pngwtran.obj \ $(OBJS)\wxpng_pngwutil.obj -WXREGEX_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +WXREGEX_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \ + $(__DEBUGFLAG_46) $(____DEBUGFLAG) \ /Fd$(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).pdb $(__OPTIMIZEFLAG) $(CFLAGS) WXREGEX_OBJECTS = \ $(OBJS)\wxregex_regcomp.obj \ $(OBJS)\wxregex_regexec.obj \ $(OBJS)\wxregex_regerror.obj \ $(OBJS)\wxregex_regfree.obj -WXTIFF_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +WXTIFF_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \ + $(__DEBUGFLAG_46) $(____DEBUGFLAG) \ /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(__OPTIMIZEFLAG) $(CFLAGS) WXTIFF_OBJECTS = \ $(OBJS)\wxtiff_tif_win32.obj \ @@ -661,8 +694,8 @@ WXTIFF_OBJECTS = \ $(OBJS)\wxtiff_tif_warning.obj \ $(OBJS)\wxtiff_tif_write.obj \ $(OBJS)\wxtiff_tif_zip.obj -WXZLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +WXZLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \ + $(__DEBUGFLAG_46) $(____DEBUGFLAG) \ /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(__OPTIMIZEFLAG) $(CFLAGS) WXZLIB_OBJECTS = \ $(OBJS)\wxzlib_adler32.obj \ @@ -679,24 +712,24 @@ WXZLIB_OBJECTS = \ $(OBJS)\wxzlib_infcodes.obj \ $(OBJS)\wxzlib_infutil.obj \ $(OBJS)\wxzlib_inffast.obj -XMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +XMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \ + $(__DEBUGFLAG_46) $(____DEBUGFLAG) \ /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).pdb \ $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_xmldll.pch /DWXUSINGDLL /DWXMAKINGDLL_XML $(CXXFLAGS) \ - /Yuwx/wxprec.h + /DWXUSINGDLL /DWXMAKINGDLL_XML $(CXXFLAGS) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_xmldll.pch" XMLDLL_OBJECTS = \ $(OBJS)\xmldll_dummy.obj \ $(OBJS)\xmldll_xml.obj -XMLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) /DWIN32 \ - $(__DEBUGFLAG_25) $(____DEBUGFLAG) \ +XMLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \ + $(__DEBUGFLAG_46) $(____DEBUGFLAG) \ /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.pdb \ $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \ /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \ - /Fp$(OBJS)\wxprec_xmllib.pch $(CXXFLAGS) /Yuwx/wxprec.h + $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmllib.pch" XMLLIB_OBJECTS = \ $(OBJS)\xmllib_dummy.obj \ $(OBJS)\xmllib_xml.obj @@ -728,22 +761,22 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" -__DEBUGFLAG = d +__DEBUGFLAG = /DEBUG !endif !if "$(BUILD)" == "release" __DEBUGFLAG = !endif !if "$(BUILD)" == "debug" -__DEBUGFLAG_1_3 = /DEBUG +__DEBUGFLAG_45 = d !endif !if "$(BUILD)" == "release" -__DEBUGFLAG_1_3 = +__DEBUGFLAG_45 = !endif !if "$(BUILD)" == "debug" -__DEBUGFLAG_25 = /Zi +__DEBUGFLAG_46 = /Zi !endif !if "$(BUILD)" == "release" -__DEBUGFLAG_25 = +__DEBUGFLAG_46 = !endif !if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ @@ -2508,6 +2541,14 @@ __monodll___depname = \ __monolib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" +__netdll___depname = \ + $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll +!endif +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" +__netlib___depname = \ + $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib +!endif !if "$(USE_GUI)" == "1" __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib !endif @@ -2533,7 +2574,7 @@ $(OBJS): ### Targets: ### -all: setup_h $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__coredll___depname) $(__corelib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) +all: setup_h $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) $(OBJS)\basedll_appbase.obj: ..\src\common\appbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** @@ -2616,33 +2657,18 @@ $(OBJS)\basedll_filesys.obj: ..\src\common\filesys.cpp $(OBJS)\basedll_fmapbase.obj: ..\src\common\fmapbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_fs_inet.obj: ..\src\common\fs_inet.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** - $(OBJS)\basedll_fs_mem.obj: ..\src\common\fs_mem.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** $(OBJS)\basedll_fs_zip.obj: ..\src\common\fs_zip.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_ftp.obj: ..\src\common\ftp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** - -$(OBJS)\basedll_gsocket.obj: ..\src\msw\gsocket.c - $(CC) /c /nologo /TC /Fo$@ $(BASEDLL_CFLAGS) $** - -$(OBJS)\basedll_gsockmsw.obj: ..\src\msw\gsockmsw.c - $(CC) /c /nologo /TC /Fo$@ $(BASEDLL_CFLAGS) $** - $(OBJS)\basedll_hash.obj: ..\src\common\hash.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** $(OBJS)\basedll_hashmap.obj: ..\src\common\hashmap.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_http.obj: ..\src\common\http.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** - $(OBJS)\basedll_init.obj: ..\src\common\init.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** @@ -2691,9 +2717,6 @@ $(OBJS)\basedll_object.obj: ..\src\common\object.cpp $(OBJS)\basedll_process.obj: ..\src\common\process.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_protocol.obj: ..\src\common\protocol.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** - $(OBJS)\basedll_regconf.obj: ..\src\msw\regconf.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** @@ -2703,24 +2726,9 @@ $(OBJS)\basedll_regex.obj: ..\src\common\regex.cpp $(OBJS)\basedll_registry.obj: ..\src\msw\registry.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_sckaddr.obj: ..\src\common\sckaddr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** - -$(OBJS)\basedll_sckfile.obj: ..\src\common\sckfile.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** - -$(OBJS)\basedll_sckipc.obj: ..\src\common\sckipc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** - -$(OBJS)\basedll_sckstrm.obj: ..\src\common\sckstrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** - $(OBJS)\basedll_snglinst.obj: ..\src\msw\snglinst.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_socket.obj: ..\src\common\socket.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** - $(OBJS)\basedll_stopwatch.obj: ..\src\common\stopwatch.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** @@ -2754,9 +2762,6 @@ $(OBJS)\basedll_txtstrm.obj: ..\src\common\txtstrm.cpp $(OBJS)\basedll_unzip.obj: ..\src\common\unzip.c $(CC) /c /nologo /TC /Fo$@ $(BASEDLL_CFLAGS) $** -$(OBJS)\basedll_url.obj: ..\src\common\url.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** - $(OBJS)\basedll_utils.obj: ..\src\msw\utils.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** @@ -2865,33 +2870,18 @@ $(OBJS)\baselib_filesys.obj: ..\src\common\filesys.cpp $(OBJS)\baselib_fmapbase.obj: ..\src\common\fmapbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_fs_inet.obj: ..\src\common\fs_inet.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** - $(OBJS)\baselib_fs_mem.obj: ..\src\common\fs_mem.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** $(OBJS)\baselib_fs_zip.obj: ..\src\common\fs_zip.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_ftp.obj: ..\src\common\ftp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** - -$(OBJS)\baselib_gsocket.obj: ..\src\msw\gsocket.c - $(CC) /c /nologo /TC /Fo$@ $(BASELIB_CFLAGS) $** - -$(OBJS)\baselib_gsockmsw.obj: ..\src\msw\gsockmsw.c - $(CC) /c /nologo /TC /Fo$@ $(BASELIB_CFLAGS) $** - $(OBJS)\baselib_hash.obj: ..\src\common\hash.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** $(OBJS)\baselib_hashmap.obj: ..\src\common\hashmap.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_http.obj: ..\src\common\http.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** - $(OBJS)\baselib_init.obj: ..\src\common\init.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** @@ -2940,9 +2930,6 @@ $(OBJS)\baselib_object.obj: ..\src\common\object.cpp $(OBJS)\baselib_process.obj: ..\src\common\process.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_protocol.obj: ..\src\common\protocol.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** - $(OBJS)\baselib_regconf.obj: ..\src\msw\regconf.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** @@ -2952,24 +2939,9 @@ $(OBJS)\baselib_regex.obj: ..\src\common\regex.cpp $(OBJS)\baselib_registry.obj: ..\src\msw\registry.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_sckaddr.obj: ..\src\common\sckaddr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** - -$(OBJS)\baselib_sckfile.obj: ..\src\common\sckfile.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** - -$(OBJS)\baselib_sckipc.obj: ..\src\common\sckipc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** - -$(OBJS)\baselib_sckstrm.obj: ..\src\common\sckstrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** - $(OBJS)\baselib_snglinst.obj: ..\src\msw\snglinst.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_socket.obj: ..\src\common\socket.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** - $(OBJS)\baselib_stopwatch.obj: ..\src\common\stopwatch.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** @@ -3003,9 +2975,6 @@ $(OBJS)\baselib_txtstrm.obj: ..\src\common\txtstrm.cpp $(OBJS)\baselib_unzip.obj: ..\src\common\unzip.c $(CC) /c /nologo /TC /Fo$@ $(BASELIB_CFLAGS) $** -$(OBJS)\baselib_url.obj: ..\src\common\url.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** - $(OBJS)\baselib_utils.obj: ..\src\msw\utils.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** @@ -8483,6 +8452,84 @@ $(OBJS)\monolib_zipstrm.obj: ..\src\common\zipstrm.cpp $(OBJS)\monolib_zstream.obj: ..\src\common\zstream.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\netdll_dummy.obj: ..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\netdll_fs_inet.obj: ..\src\common\fs_inet.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_ftp.obj: ..\src\common\ftp.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_gsocket.obj: ..\src\msw\gsocket.c + $(CC) /c /nologo /TC /Fo$@ $(NETDLL_CFLAGS) $** + +$(OBJS)\netdll_gsockmsw.obj: ..\src\msw\gsockmsw.c + $(CC) /c /nologo /TC /Fo$@ $(NETDLL_CFLAGS) $** + +$(OBJS)\netdll_http.obj: ..\src\common\http.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_protocol.obj: ..\src\common\protocol.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_sckaddr.obj: ..\src\common\sckaddr.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_sckfile.obj: ..\src\common\sckfile.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_sckipc.obj: ..\src\common\sckipc.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_sckstrm.obj: ..\src\common\sckstrm.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_socket.obj: ..\src\common\socket.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netdll_url.obj: ..\src\common\url.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $** + +$(OBJS)\netlib_dummy.obj: ..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\netlib_fs_inet.obj: ..\src\common\fs_inet.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_ftp.obj: ..\src\common\ftp.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_gsocket.obj: ..\src\msw\gsocket.c + $(CC) /c /nologo /TC /Fo$@ $(NETLIB_CFLAGS) $** + +$(OBJS)\netlib_gsockmsw.obj: ..\src\msw\gsockmsw.c + $(CC) /c /nologo /TC /Fo$@ $(NETLIB_CFLAGS) $** + +$(OBJS)\netlib_http.obj: ..\src\common\http.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_protocol.obj: ..\src\common\protocol.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_sckaddr.obj: ..\src\common\sckaddr.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_sckfile.obj: ..\src\common\sckfile.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_sckipc.obj: ..\src\common\sckipc.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_sckstrm.obj: ..\src\common\sckstrm.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_socket.obj: ..\src\common\socket.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $** + +$(OBJS)\netlib_url.obj: ..\src\common\url.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $** + $(OBJS)\wxexpat_xmlparse.obj: ..\src\expat\lib\xmlparse.c $(CC) /c /nologo /TC /Fo$@ $(WXEXPAT_CFLAGS) $** @@ -8847,8 +8894,8 @@ $(OBJS)\xmllib_xml.obj: ..\src\xml\xml.cpp $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) $** !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(OBJS)\basedll_dummy.obj $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1_3) /LIBPATH:$(LIBDIRNAME) @<< +$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(OBJS)\basedll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG) /LIBPATH:$(LIBDIRNAME) @<< $(BASEDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib << !endif @@ -8876,6 +8923,9 @@ clean: -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib + -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib + -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib @@ -8891,7 +8941,7 @@ clean: !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(OBJS)\coredll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1_3) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG) /LIBPATH:$(LIBDIRNAME) @<< $(COREDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib << !endif @@ -8906,7 +8956,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.li !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(OBJS)\gldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1_3) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG) /LIBPATH:$(LIBDIRNAME) @<< $(GLDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib << !endif @@ -8921,7 +8971,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib: !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(OBJS)\htmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1_3) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG) /LIBPATH:$(LIBDIRNAME) @<< $(HTMLDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib << !endif @@ -8942,7 +8992,7 @@ $(LIBDIRNAME)\wx: $(LIBDIRNAME) !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(OBJS)\monodll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1_3) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG) /LIBPATH:$(LIBDIRNAME) @<< $(MONODLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib << !endif @@ -8958,6 +9008,21 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $( ..\include\wx\msw\setup.h: if not exist ..\include\wx\msw\setup.h copy ..\include\wx\msw\setup0.h ..\include\wx\msw\setup.h +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" +$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(OBJS)\netdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG) /LIBPATH:$(LIBDIRNAME) @<< + $(NETDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib +<< +!endif + +!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" +$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(NETLIB_OBJECTS) $(OBJS)\netlib_dummy.obj + if exist $@ del $@ + lib /NOLOGO /OUT:$@ @<< + $(NETLIB_OBJECTS) +<< +!endif + $(LIBDIRNAME)\wx\setup.h: if not exist $(LIBDIRNAME)\wx\setup.h copy ..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h @@ -9006,8 +9071,8 @@ $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib: $(WXZLIB_OBJECTS) << !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(OBJS)\xmldll_dummy.obj $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1_3) /LIBPATH:$(LIBDIRNAME) @<< +$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(OBJS)\xmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG) /LIBPATH:$(LIBDIRNAME) @<< $(XMLDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib << !endif diff --git a/build/makefile.wat b/build/makefile.wat index 62863761f1..195f0d5c5f 100644 --- a/build/makefile.wat +++ b/build/makefile.wat @@ -64,12 +64,12 @@ __DEBUGFLAG = -d2 !ifeq BUILD release __DEBUGFLAG = -d0 !endif -__DEBUGFLAG_5 = +__DEBUGFLAG_7 = !ifeq BUILD debug -__DEBUGFLAG_5 = debug all +__DEBUGFLAG_7 = debug all !endif !ifeq BUILD release -__DEBUGFLAG_5 = +__DEBUGFLAG_7 = !endif __DEBUG_DEFINE_p = !ifeq BUILD debug @@ -1903,6 +1903,20 @@ __monolib___depname = & $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !endif +__netdll___depname = +!ifeq MONOLITHIC 0 +!ifeq SHARED 1 +__netdll___depname = & + $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll +!endif +!endif +__netlib___depname = +!ifeq MONOLITHIC 0 +!ifeq SHARED 0 +__netlib___depname = & + $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib +!endif +!endif __wxjpeg___depname = !ifeq USE_GUI 1 __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib @@ -1967,12 +1981,9 @@ BASEDLL_OBJECTS = & $(OBJS)\basedll_filename.obj & $(OBJS)\basedll_filesys.obj & $(OBJS)\basedll_fmapbase.obj & - $(OBJS)\basedll_fs_inet.obj & $(OBJS)\basedll_fs_zip.obj & - $(OBJS)\basedll_ftp.obj & $(OBJS)\basedll_hash.obj & $(OBJS)\basedll_hashmap.obj & - $(OBJS)\basedll_http.obj & $(OBJS)\basedll_init.obj & $(OBJS)\basedll_intl.obj & $(OBJS)\basedll_ipcbase.obj & @@ -1985,13 +1996,7 @@ BASEDLL_OBJECTS = & $(OBJS)\basedll_mstream.obj & $(OBJS)\basedll_object.obj & $(OBJS)\basedll_process.obj & - $(OBJS)\basedll_protocol.obj & $(OBJS)\basedll_regex.obj & - $(OBJS)\basedll_sckaddr.obj & - $(OBJS)\basedll_sckfile.obj & - $(OBJS)\basedll_sckipc.obj & - $(OBJS)\basedll_sckstrm.obj & - $(OBJS)\basedll_socket.obj & $(OBJS)\basedll_stopwatch.obj & $(OBJS)\basedll_strconv.obj & $(OBJS)\basedll_stream.obj & @@ -2002,14 +2007,11 @@ BASEDLL_OBJECTS = & $(OBJS)\basedll_tokenzr.obj & $(OBJS)\basedll_txtstrm.obj & $(OBJS)\basedll_unzip.obj & - $(OBJS)\basedll_url.obj & $(OBJS)\basedll_variant.obj & $(OBJS)\basedll_wfstream.obj & $(OBJS)\basedll_wxchar.obj & $(OBJS)\basedll_zipstrm.obj & $(OBJS)\basedll_zstream.obj & - $(OBJS)\basedll_gsocket.obj & - $(OBJS)\basedll_gsockmsw.obj & $(OBJS)\basedll_basemsw.obj & $(OBJS)\basedll_dde.obj & $(OBJS)\basedll_dir.obj & @@ -2062,12 +2064,9 @@ BASELIB_OBJECTS = & $(OBJS)\baselib_filename.obj & $(OBJS)\baselib_filesys.obj & $(OBJS)\baselib_fmapbase.obj & - $(OBJS)\baselib_fs_inet.obj & $(OBJS)\baselib_fs_zip.obj & - $(OBJS)\baselib_ftp.obj & $(OBJS)\baselib_hash.obj & $(OBJS)\baselib_hashmap.obj & - $(OBJS)\baselib_http.obj & $(OBJS)\baselib_init.obj & $(OBJS)\baselib_intl.obj & $(OBJS)\baselib_ipcbase.obj & @@ -2080,13 +2079,7 @@ BASELIB_OBJECTS = & $(OBJS)\baselib_mstream.obj & $(OBJS)\baselib_object.obj & $(OBJS)\baselib_process.obj & - $(OBJS)\baselib_protocol.obj & $(OBJS)\baselib_regex.obj & - $(OBJS)\baselib_sckaddr.obj & - $(OBJS)\baselib_sckfile.obj & - $(OBJS)\baselib_sckipc.obj & - $(OBJS)\baselib_sckstrm.obj & - $(OBJS)\baselib_socket.obj & $(OBJS)\baselib_stopwatch.obj & $(OBJS)\baselib_strconv.obj & $(OBJS)\baselib_stream.obj & @@ -2097,14 +2090,11 @@ BASELIB_OBJECTS = & $(OBJS)\baselib_tokenzr.obj & $(OBJS)\baselib_txtstrm.obj & $(OBJS)\baselib_unzip.obj & - $(OBJS)\baselib_url.obj & $(OBJS)\baselib_variant.obj & $(OBJS)\baselib_wfstream.obj & $(OBJS)\baselib_wxchar.obj & $(OBJS)\baselib_zipstrm.obj & $(OBJS)\baselib_zstream.obj & - $(OBJS)\baselib_gsocket.obj & - $(OBJS)\baselib_gsockmsw.obj & $(OBJS)\baselib_basemsw.obj & $(OBJS)\baselib_dde.obj & $(OBJS)\baselib_dir.obj & @@ -2267,12 +2257,9 @@ MONODLL_OBJECTS = & $(OBJS)\monodll_filename.obj & $(OBJS)\monodll_filesys.obj & $(OBJS)\monodll_fmapbase.obj & - $(OBJS)\monodll_fs_inet.obj & $(OBJS)\monodll_fs_zip.obj & - $(OBJS)\monodll_ftp.obj & $(OBJS)\monodll_hash.obj & $(OBJS)\monodll_hashmap.obj & - $(OBJS)\monodll_http.obj & $(OBJS)\monodll_init.obj & $(OBJS)\monodll_intl.obj & $(OBJS)\monodll_ipcbase.obj & @@ -2285,13 +2272,7 @@ MONODLL_OBJECTS = & $(OBJS)\monodll_mstream.obj & $(OBJS)\monodll_object.obj & $(OBJS)\monodll_process.obj & - $(OBJS)\monodll_protocol.obj & $(OBJS)\monodll_regex.obj & - $(OBJS)\monodll_sckaddr.obj & - $(OBJS)\monodll_sckfile.obj & - $(OBJS)\monodll_sckipc.obj & - $(OBJS)\monodll_sckstrm.obj & - $(OBJS)\monodll_socket.obj & $(OBJS)\monodll_stopwatch.obj & $(OBJS)\monodll_strconv.obj & $(OBJS)\monodll_stream.obj & @@ -2302,14 +2283,11 @@ MONODLL_OBJECTS = & $(OBJS)\monodll_tokenzr.obj & $(OBJS)\monodll_txtstrm.obj & $(OBJS)\monodll_unzip.obj & - $(OBJS)\monodll_url.obj & $(OBJS)\monodll_variant.obj & $(OBJS)\monodll_wfstream.obj & $(OBJS)\monodll_wxchar.obj & $(OBJS)\monodll_zipstrm.obj & $(OBJS)\monodll_zstream.obj & - $(OBJS)\monodll_gsocket.obj & - $(OBJS)\monodll_gsockmsw.obj & $(OBJS)\monodll_basemsw.obj & $(OBJS)\monodll_dde.obj & $(OBJS)\monodll_dir.obj & @@ -2328,6 +2306,18 @@ MONODLL_OBJECTS = & $(OBJS)\monodll_main.obj & $(OBJS)\monodll_mslu.obj & $(OBJS)\monodll_volume.obj & + $(OBJS)\monodll_fs_inet.obj & + $(OBJS)\monodll_ftp.obj & + $(OBJS)\monodll_http.obj & + $(OBJS)\monodll_protocol.obj & + $(OBJS)\monodll_url.obj & + $(OBJS)\monodll_sckfile.obj & + $(OBJS)\monodll_sckaddr.obj & + $(OBJS)\monodll_sckipc.obj & + $(OBJS)\monodll_sckstrm.obj & + $(OBJS)\monodll_socket.obj & + $(OBJS)\monodll_gsocket.obj & + $(OBJS)\monodll_gsockmsw.obj & $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) & $(OBJS)\monodll_xml.obj MONOLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm & @@ -2364,12 +2354,9 @@ MONOLIB_OBJECTS = & $(OBJS)\monolib_filename.obj & $(OBJS)\monolib_filesys.obj & $(OBJS)\monolib_fmapbase.obj & - $(OBJS)\monolib_fs_inet.obj & $(OBJS)\monolib_fs_zip.obj & - $(OBJS)\monolib_ftp.obj & $(OBJS)\monolib_hash.obj & $(OBJS)\monolib_hashmap.obj & - $(OBJS)\monolib_http.obj & $(OBJS)\monolib_init.obj & $(OBJS)\monolib_intl.obj & $(OBJS)\monolib_ipcbase.obj & @@ -2382,13 +2369,7 @@ MONOLIB_OBJECTS = & $(OBJS)\monolib_mstream.obj & $(OBJS)\monolib_object.obj & $(OBJS)\monolib_process.obj & - $(OBJS)\monolib_protocol.obj & $(OBJS)\monolib_regex.obj & - $(OBJS)\monolib_sckaddr.obj & - $(OBJS)\monolib_sckfile.obj & - $(OBJS)\monolib_sckipc.obj & - $(OBJS)\monolib_sckstrm.obj & - $(OBJS)\monolib_socket.obj & $(OBJS)\monolib_stopwatch.obj & $(OBJS)\monolib_strconv.obj & $(OBJS)\monolib_stream.obj & @@ -2399,14 +2380,11 @@ MONOLIB_OBJECTS = & $(OBJS)\monolib_tokenzr.obj & $(OBJS)\monolib_txtstrm.obj & $(OBJS)\monolib_unzip.obj & - $(OBJS)\monolib_url.obj & $(OBJS)\monolib_variant.obj & $(OBJS)\monolib_wfstream.obj & $(OBJS)\monolib_wxchar.obj & $(OBJS)\monolib_zipstrm.obj & $(OBJS)\monolib_zstream.obj & - $(OBJS)\monolib_gsocket.obj & - $(OBJS)\monolib_gsockmsw.obj & $(OBJS)\monolib_basemsw.obj & $(OBJS)\monolib_dde.obj & $(OBJS)\monolib_dir.obj & @@ -2425,8 +2403,70 @@ MONOLIB_OBJECTS = & $(OBJS)\monolib_main.obj & $(OBJS)\monolib_mslu.obj & $(OBJS)\monolib_volume.obj & + $(OBJS)\monolib_fs_inet.obj & + $(OBJS)\monolib_ftp.obj & + $(OBJS)\monolib_http.obj & + $(OBJS)\monolib_protocol.obj & + $(OBJS)\monolib_url.obj & + $(OBJS)\monolib_sckfile.obj & + $(OBJS)\monolib_sckaddr.obj & + $(OBJS)\monolib_sckipc.obj & + $(OBJS)\monolib_sckstrm.obj & + $(OBJS)\monolib_socket.obj & + $(OBJS)\monolib_gsocket.obj & + $(OBJS)\monolib_gsockmsw.obj & $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) & $(OBJS)\monolib_xml.obj +NETDLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff & + -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex & + -i=..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_NET $(CFLAGS) +NETDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff & + -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex & + -i=..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_NET $(CXXFLAGS) & + /fh=$(OBJS)\wxprec_netdll.pch +NETDLL_OBJECTS = & + $(OBJS)\netdll_dummy.obj & + $(OBJS)\netdll_fs_inet.obj & + $(OBJS)\netdll_ftp.obj & + $(OBJS)\netdll_http.obj & + $(OBJS)\netdll_protocol.obj & + $(OBJS)\netdll_url.obj & + $(OBJS)\netdll_sckfile.obj & + $(OBJS)\netdll_sckaddr.obj & + $(OBJS)\netdll_sckipc.obj & + $(OBJS)\netdll_sckstrm.obj & + $(OBJS)\netdll_socket.obj & + $(OBJS)\netdll_gsocket.obj & + $(OBJS)\netdll_gsockmsw.obj +NETLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff & + -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex & + -i=..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_NET $(CFLAGS) +NETLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff & + -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex & + -i=..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_NET $(CXXFLAGS) & + /fh=$(OBJS)\wxprec_netlib.pch +NETLIB_OBJECTS = & + $(OBJS)\netlib_dummy.obj & + $(OBJS)\netlib_fs_inet.obj & + $(OBJS)\netlib_ftp.obj & + $(OBJS)\netlib_http.obj & + $(OBJS)\netlib_protocol.obj & + $(OBJS)\netlib_url.obj & + $(OBJS)\netlib_sckfile.obj & + $(OBJS)\netlib_sckaddr.obj & + $(OBJS)\netlib_sckipc.obj & + $(OBJS)\netlib_sckstrm.obj & + $(OBJS)\netlib_socket.obj & + $(OBJS)\netlib_gsocket.obj & + $(OBJS)\netlib_gsockmsw.obj OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) WXEXPAT_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm & @@ -2590,7 +2630,7 @@ $(OBJS) : ### Targets: ### -all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__coredll___depname) $(__corelib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) +all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) $(OBJS)\basedll_appbase.obj : .AUTODEPEND ..\src\common\appbase.cpp $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< @@ -2673,33 +2713,18 @@ $(OBJS)\basedll_filesys.obj : .AUTODEPEND ..\src\common\filesys.cpp $(OBJS)\basedll_fmapbase.obj : .AUTODEPEND ..\src\common\fmapbase.cpp $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< -$(OBJS)\basedll_fs_inet.obj : .AUTODEPEND ..\src\common\fs_inet.cpp - $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - $(OBJS)\basedll_fs_mem.obj : .AUTODEPEND ..\src\common\fs_mem.cpp $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< $(OBJS)\basedll_fs_zip.obj : .AUTODEPEND ..\src\common\fs_zip.cpp $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< -$(OBJS)\basedll_ftp.obj : .AUTODEPEND ..\src\common\ftp.cpp - $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_gsocket.obj : .AUTODEPEND ..\src\msw\gsocket.c - $(CC) -zq -fo=$^@ $(BASEDLL_CFLAGS) $< - -$(OBJS)\basedll_gsockmsw.obj : .AUTODEPEND ..\src\msw\gsockmsw.c - $(CC) -zq -fo=$^@ $(BASEDLL_CFLAGS) $< - $(OBJS)\basedll_hash.obj : .AUTODEPEND ..\src\common\hash.cpp $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< $(OBJS)\basedll_hashmap.obj : .AUTODEPEND ..\src\common\hashmap.cpp $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< -$(OBJS)\basedll_http.obj : .AUTODEPEND ..\src\common\http.cpp - $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - $(OBJS)\basedll_init.obj : .AUTODEPEND ..\src\common\init.cpp $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< @@ -2748,9 +2773,6 @@ $(OBJS)\basedll_object.obj : .AUTODEPEND ..\src\common\object.cpp $(OBJS)\basedll_process.obj : .AUTODEPEND ..\src\common\process.cpp $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< -$(OBJS)\basedll_protocol.obj : .AUTODEPEND ..\src\common\protocol.cpp - $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - $(OBJS)\basedll_regconf.obj : .AUTODEPEND ..\src\msw\regconf.cpp $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< @@ -2760,24 +2782,9 @@ $(OBJS)\basedll_regex.obj : .AUTODEPEND ..\src\common\regex.cpp $(OBJS)\basedll_registry.obj : .AUTODEPEND ..\src\msw\registry.cpp $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< -$(OBJS)\basedll_sckaddr.obj : .AUTODEPEND ..\src\common\sckaddr.cpp - $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_sckfile.obj : .AUTODEPEND ..\src\common\sckfile.cpp - $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_sckipc.obj : .AUTODEPEND ..\src\common\sckipc.cpp - $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_sckstrm.obj : .AUTODEPEND ..\src\common\sckstrm.cpp - $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - $(OBJS)\basedll_snglinst.obj : .AUTODEPEND ..\src\msw\snglinst.cpp $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< -$(OBJS)\basedll_socket.obj : .AUTODEPEND ..\src\common\socket.cpp - $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - $(OBJS)\basedll_stopwatch.obj : .AUTODEPEND ..\src\common\stopwatch.cpp $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< @@ -2811,9 +2818,6 @@ $(OBJS)\basedll_txtstrm.obj : .AUTODEPEND ..\src\common\txtstrm.cpp $(OBJS)\basedll_unzip.obj : .AUTODEPEND ..\src\common\unzip.c $(CC) -zq -fo=$^@ $(BASEDLL_CFLAGS) $< -$(OBJS)\basedll_url.obj : .AUTODEPEND ..\src\common\url.cpp - $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - $(OBJS)\basedll_utils.obj : .AUTODEPEND ..\src\msw\utils.cpp $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< @@ -2922,33 +2926,18 @@ $(OBJS)\baselib_filesys.obj : .AUTODEPEND ..\src\common\filesys.cpp $(OBJS)\baselib_fmapbase.obj : .AUTODEPEND ..\src\common\fmapbase.cpp $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< -$(OBJS)\baselib_fs_inet.obj : .AUTODEPEND ..\src\common\fs_inet.cpp - $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - $(OBJS)\baselib_fs_mem.obj : .AUTODEPEND ..\src\common\fs_mem.cpp $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< $(OBJS)\baselib_fs_zip.obj : .AUTODEPEND ..\src\common\fs_zip.cpp $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< -$(OBJS)\baselib_ftp.obj : .AUTODEPEND ..\src\common\ftp.cpp - $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_gsocket.obj : .AUTODEPEND ..\src\msw\gsocket.c - $(CC) -zq -fo=$^@ $(BASELIB_CFLAGS) $< - -$(OBJS)\baselib_gsockmsw.obj : .AUTODEPEND ..\src\msw\gsockmsw.c - $(CC) -zq -fo=$^@ $(BASELIB_CFLAGS) $< - $(OBJS)\baselib_hash.obj : .AUTODEPEND ..\src\common\hash.cpp $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< $(OBJS)\baselib_hashmap.obj : .AUTODEPEND ..\src\common\hashmap.cpp $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< -$(OBJS)\baselib_http.obj : .AUTODEPEND ..\src\common\http.cpp - $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - $(OBJS)\baselib_init.obj : .AUTODEPEND ..\src\common\init.cpp $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< @@ -2997,9 +2986,6 @@ $(OBJS)\baselib_object.obj : .AUTODEPEND ..\src\common\object.cpp $(OBJS)\baselib_process.obj : .AUTODEPEND ..\src\common\process.cpp $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< -$(OBJS)\baselib_protocol.obj : .AUTODEPEND ..\src\common\protocol.cpp - $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - $(OBJS)\baselib_regconf.obj : .AUTODEPEND ..\src\msw\regconf.cpp $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< @@ -3009,24 +2995,9 @@ $(OBJS)\baselib_regex.obj : .AUTODEPEND ..\src\common\regex.cpp $(OBJS)\baselib_registry.obj : .AUTODEPEND ..\src\msw\registry.cpp $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< -$(OBJS)\baselib_sckaddr.obj : .AUTODEPEND ..\src\common\sckaddr.cpp - $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_sckfile.obj : .AUTODEPEND ..\src\common\sckfile.cpp - $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_sckipc.obj : .AUTODEPEND ..\src\common\sckipc.cpp - $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_sckstrm.obj : .AUTODEPEND ..\src\common\sckstrm.cpp - $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - $(OBJS)\baselib_snglinst.obj : .AUTODEPEND ..\src\msw\snglinst.cpp $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< -$(OBJS)\baselib_socket.obj : .AUTODEPEND ..\src\common\socket.cpp - $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - $(OBJS)\baselib_stopwatch.obj : .AUTODEPEND ..\src\common\stopwatch.cpp $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< @@ -3060,9 +3031,6 @@ $(OBJS)\baselib_txtstrm.obj : .AUTODEPEND ..\src\common\txtstrm.cpp $(OBJS)\baselib_unzip.obj : .AUTODEPEND ..\src\common\unzip.c $(CC) -zq -fo=$^@ $(BASELIB_CFLAGS) $< -$(OBJS)\baselib_url.obj : .AUTODEPEND ..\src\common\url.cpp - $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - $(OBJS)\baselib_utils.obj : .AUTODEPEND ..\src\msw\utils.cpp $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< @@ -8956,6 +8924,84 @@ $(OBJS)\monolib_zipstrm.obj : .AUTODEPEND ..\src\common\zipstrm.cpp $(OBJS)\monolib_zstream.obj : .AUTODEPEND ..\src\common\zstream.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\netdll_dummy.obj : .AUTODEPEND ..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< + +$(OBJS)\netdll_fs_inet.obj : .AUTODEPEND ..\src\common\fs_inet.cpp + $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< + +$(OBJS)\netdll_ftp.obj : .AUTODEPEND ..\src\common\ftp.cpp + $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< + +$(OBJS)\netdll_gsocket.obj : .AUTODEPEND ..\src\msw\gsocket.c + $(CC) -zq -fo=$^@ $(NETDLL_CFLAGS) $< + +$(OBJS)\netdll_gsockmsw.obj : .AUTODEPEND ..\src\msw\gsockmsw.c + $(CC) -zq -fo=$^@ $(NETDLL_CFLAGS) $< + +$(OBJS)\netdll_http.obj : .AUTODEPEND ..\src\common\http.cpp + $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< + +$(OBJS)\netdll_protocol.obj : .AUTODEPEND ..\src\common\protocol.cpp + $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< + +$(OBJS)\netdll_sckaddr.obj : .AUTODEPEND ..\src\common\sckaddr.cpp + $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< + +$(OBJS)\netdll_sckfile.obj : .AUTODEPEND ..\src\common\sckfile.cpp + $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< + +$(OBJS)\netdll_sckipc.obj : .AUTODEPEND ..\src\common\sckipc.cpp + $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< + +$(OBJS)\netdll_sckstrm.obj : .AUTODEPEND ..\src\common\sckstrm.cpp + $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< + +$(OBJS)\netdll_socket.obj : .AUTODEPEND ..\src\common\socket.cpp + $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< + +$(OBJS)\netdll_url.obj : .AUTODEPEND ..\src\common\url.cpp + $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< + +$(OBJS)\netlib_dummy.obj : .AUTODEPEND ..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< + +$(OBJS)\netlib_fs_inet.obj : .AUTODEPEND ..\src\common\fs_inet.cpp + $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< + +$(OBJS)\netlib_ftp.obj : .AUTODEPEND ..\src\common\ftp.cpp + $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< + +$(OBJS)\netlib_gsocket.obj : .AUTODEPEND ..\src\msw\gsocket.c + $(CC) -zq -fo=$^@ $(NETLIB_CFLAGS) $< + +$(OBJS)\netlib_gsockmsw.obj : .AUTODEPEND ..\src\msw\gsockmsw.c + $(CC) -zq -fo=$^@ $(NETLIB_CFLAGS) $< + +$(OBJS)\netlib_http.obj : .AUTODEPEND ..\src\common\http.cpp + $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< + +$(OBJS)\netlib_protocol.obj : .AUTODEPEND ..\src\common\protocol.cpp + $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< + +$(OBJS)\netlib_sckaddr.obj : .AUTODEPEND ..\src\common\sckaddr.cpp + $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< + +$(OBJS)\netlib_sckfile.obj : .AUTODEPEND ..\src\common\sckfile.cpp + $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< + +$(OBJS)\netlib_sckipc.obj : .AUTODEPEND ..\src\common\sckipc.cpp + $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< + +$(OBJS)\netlib_sckstrm.obj : .AUTODEPEND ..\src\common\sckstrm.cpp + $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< + +$(OBJS)\netlib_socket.obj : .AUTODEPEND ..\src\common\socket.cpp + $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< + +$(OBJS)\netlib_url.obj : .AUTODEPEND ..\src\common\url.cpp + $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< + $(OBJS)\wxexpat_xmlparse.obj : .AUTODEPEND ..\src\expat\lib\xmlparse.c $(CC) -zq -fo=$^@ $(WXEXPAT_CFLAGS) $< @@ -9321,12 +9367,12 @@ $(OBJS)\xmllib_xml.obj : .AUTODEPEND ..\src\xml\xml.cpp !ifeq MONOLITHIC 0 !ifeq SHARED 1 -$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll : $(BASEDLL_OBJECTS) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib +$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll : $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib @%create $(OBJS)\basedll.lbc @%append $(OBJS)\basedll.lbc option quiet @%append $(OBJS)\basedll.lbc name $^@ @%append $(OBJS)\basedll.lbc option incremental - @%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGFLAG_5) libpath $(LIBDIRNAME) + @%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGFLAG_7) libpath $(LIBDIRNAME) @for %i in ($(BASEDLL_OBJECTS)) do @%append $(OBJS)\basedll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\basedll.lbc library %i @%append $(OBJS)\basedll.lbc @@ -9362,6 +9408,9 @@ clean : .SYMBOLIC -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib + -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib + -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_wat$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib @@ -9383,7 +9432,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_w @%append $(OBJS)\coredll.lbc option quiet @%append $(OBJS)\coredll.lbc name $^@ @%append $(OBJS)\coredll.lbc option incremental - @%append $(OBJS)\coredll.lbc $(LDFLAGS) $(__DEBUGFLAG_5) libpath $(LIBDIRNAME) + @%append $(OBJS)\coredll.lbc $(LDFLAGS) $(__DEBUGFLAG_7) libpath $(LIBDIRNAME) @for %i in ($(COREDLL_OBJECTS)) do @%append $(OBJS)\coredll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\coredll.lbc library %i @%append $(OBJS)\coredll.lbc @@ -9413,7 +9462,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat @%append $(OBJS)\gldll.lbc option quiet @%append $(OBJS)\gldll.lbc name $^@ @%append $(OBJS)\gldll.lbc option incremental - @%append $(OBJS)\gldll.lbc $(LDFLAGS) $(__DEBUGFLAG_5) libpath $(LIBDIRNAME) + @%append $(OBJS)\gldll.lbc $(LDFLAGS) $(__DEBUGFLAG_7) libpath $(LIBDIRNAME) @for %i in ($(GLDLL_OBJECTS)) do @%append $(OBJS)\gldll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib) do @%append $(OBJS)\gldll.lbc library %i @%append $(OBJS)\gldll.lbc @@ -9443,7 +9492,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_w @%append $(OBJS)\htmldll.lbc option quiet @%append $(OBJS)\htmldll.lbc name $^@ @%append $(OBJS)\htmldll.lbc option incremental - @%append $(OBJS)\htmldll.lbc $(LDFLAGS) $(__DEBUGFLAG_5) libpath $(LIBDIRNAME) + @%append $(OBJS)\htmldll.lbc $(LDFLAGS) $(__DEBUGFLAG_7) libpath $(LIBDIRNAME) @for %i in ($(HTMLDLL_OBJECTS)) do @%append $(OBJS)\htmldll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\htmldll.lbc library %i @%append $(OBJS)\htmldll.lbc @@ -9478,7 +9527,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(V @%append $(OBJS)\monodll.lbc option quiet @%append $(OBJS)\monodll.lbc name $^@ @%append $(OBJS)\monodll.lbc option incremental - @%append $(OBJS)\monodll.lbc $(LDFLAGS) $(__DEBUGFLAG_5) libpath $(LIBDIRNAME) + @%append $(OBJS)\monodll.lbc $(LDFLAGS) $(__DEBUGFLAG_7) libpath $(LIBDIRNAME) @for %i in ($(MONODLL_OBJECTS)) do @%append $(OBJS)\monodll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\monodll.lbc library %i @%append $(OBJS)\monodll.lbc @@ -9500,6 +9549,32 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib : ..\include\wx\msw\setup.h : if not exist ..\include\wx\msw\setup.h copy ..\include\wx\msw\setup0.h ..\include\wx\msw\setup.h +!ifeq MONOLITHIC 0 +!ifeq SHARED 1 +$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll : $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) + @%create $(OBJS)\netdll.lbc + @%append $(OBJS)\netdll.lbc option quiet + @%append $(OBJS)\netdll.lbc name $^@ + @%append $(OBJS)\netdll.lbc option incremental + @%append $(OBJS)\netdll.lbc $(LDFLAGS) $(__DEBUGFLAG_7) libpath $(LIBDIRNAME) + @for %i in ($(NETDLL_OBJECTS)) do @%append $(OBJS)\netdll.lbc file %i + @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\netdll.lbc library %i + @%append $(OBJS)\netdll.lbc + @%append $(OBJS)\netdll.lbc system nt_dll + wlink @$(OBJS)\netdll.lbc + wlib -q -n -b $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib +$^@ +!endif +!endif + +!ifeq MONOLITHIC 0 +!ifeq SHARED 0 +$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib : $(NETLIB_OBJECTS) + @%create $(OBJS)\netlib.lbc + @for %i in ($(NETLIB_OBJECTS)) do @%append $(OBJS)\netlib.lbc +%i + wlib -q -p2048 -n -b $^@ @$(OBJS)\netlib.lbc +!endif +!endif + $(LIBDIRNAME)\wx\setup.h : if not exist $(LIBDIRNAME)\wx\setup.h copy ..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h @@ -9543,12 +9618,12 @@ $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib : $(WXZLIB_OBJECTS) !ifeq MONOLITHIC 0 !ifeq SHARED 1 -$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll : $(XMLDLL_OBJECTS) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) +$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll : $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) @%create $(OBJS)\xmldll.lbc @%append $(OBJS)\xmldll.lbc option quiet @%append $(OBJS)\xmldll.lbc name $^@ @%append $(OBJS)\xmldll.lbc option incremental - @%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGFLAG_5) libpath $(LIBDIRNAME) + @%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGFLAG_7) libpath $(LIBDIRNAME) @for %i in ($(XMLDLL_OBJECTS)) do @%append $(OBJS)\xmldll.lbc file %i @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\xmldll.lbc library %i @%append $(OBJS)\xmldll.lbc diff --git a/configure b/configure index 462b72ef86..a6c1ccf514 100755 --- a/configure +++ b/configure @@ -312,7 +312,7 @@ ac_includes_default="\ #endif" ac_subdirs_all="$ac_subdirs_all src/expat" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS EXTRALIBS_XML EXTRALIBS_GUI EXTRALIBS_OPENGL UNICODE BUILD SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG HOST_SUFFIX SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX DLLPREFIX AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_BUILD_DEBUG COND_BUILD_RELEASE COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_OS2 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_UNICODE_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WXUNIV_1 COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_PLATFORM_MAC_1 COND_SHARED_1 COND_SHARED_0 COND_WXUSE_EXPAT_BUILTIN COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY ESD_LINK LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS EXTRALIBS_XML EXTRALIBS_GUI EXTRALIBS_OPENGL UNICODE BUILD SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG HOST_SUFFIX SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX DLLPREFIX AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_BUILD_DEBUG COND_BUILD_RELEASE COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_OS2 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_UNICODE_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WXUNIV_1 COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_PLATFORM_MAC_1 COND_SHARED_1 COND_SHARED_0 LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY ESD_LINK LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -34909,6 +34909,21 @@ fi COND_USE_GUI_1_WXUNIV_1="" fi + COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#" + if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then + COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="" + fi + + COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#" + if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then + COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="" + fi + + COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#" + if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then + COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="" + fi + COND_USE_SOSYMLINKS_1="#" if test "x$USE_SOSYMLINKS" = "x1" ; then COND_USE_SOSYMLINKS_1="" @@ -34934,6 +34949,11 @@ fi COND_WXUNIV_1="" fi + COND_WXUSE_EXPAT_BUILTIN="#" + if test "x$wxUSE_EXPAT" = "xbuiltin" ; then + COND_WXUSE_EXPAT_BUILTIN="" + fi + COND_WXUSE_LIBJPEG_BUILTIN="#" if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then COND_WXUSE_LIBJPEG_BUILTIN="" @@ -34979,26 +34999,6 @@ fi COND_SHARED_0="" fi - COND_WXUSE_EXPAT_BUILTIN="#" - if test "x$wxUSE_EXPAT" = "xbuiltin" ; then - COND_WXUSE_EXPAT_BUILTIN="" - fi - - COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#" - if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then - COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="" - fi - - COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#" - if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then - COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="" - fi - - COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#" - if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then - COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="" - fi - @@ -35967,11 +35967,15 @@ s,@COND_USE_GUI_0@,$COND_USE_GUI_0,;t t s,@COND_USE_GUI_1@,$COND_USE_GUI_1,;t t s,@COND_USE_GUI_1_WXUNIV_0@,$COND_USE_GUI_1_WXUNIV_0,;t t s,@COND_USE_GUI_1_WXUNIV_1@,$COND_USE_GUI_1_WXUNIV_1,;t t +s,@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN,;t t +s,@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN,;t t +s,@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN,;t t s,@COND_USE_SOSYMLINKS_1@,$COND_USE_SOSYMLINKS_1,;t t s,@COND_USE_SOVERLINUX_1@,$COND_USE_SOVERLINUX_1,;t t s,@COND_USE_SOVERSION_0@,$COND_USE_SOVERSION_0,;t t s,@COND_USE_SOVERSOLARIS_1@,$COND_USE_SOVERSOLARIS_1,;t t s,@COND_WXUNIV_1@,$COND_WXUNIV_1,;t t +s,@COND_WXUSE_EXPAT_BUILTIN@,$COND_WXUSE_EXPAT_BUILTIN,;t t s,@COND_WXUSE_LIBJPEG_BUILTIN@,$COND_WXUSE_LIBJPEG_BUILTIN,;t t s,@COND_WXUSE_LIBPNG_BUILTIN@,$COND_WXUSE_LIBPNG_BUILTIN,;t t s,@COND_WXUSE_LIBTIFF_BUILTIN@,$COND_WXUSE_LIBTIFF_BUILTIN,;t t @@ -35981,10 +35985,6 @@ s,@COND_WXUSE_ZLIB_BUILTIN@,$COND_WXUSE_ZLIB_BUILTIN,;t t s,@COND_PLATFORM_MAC_1@,$COND_PLATFORM_MAC_1,;t t s,@COND_SHARED_1@,$COND_SHARED_1,;t t s,@COND_SHARED_0@,$COND_SHARED_0,;t t -s,@COND_WXUSE_EXPAT_BUILTIN@,$COND_WXUSE_EXPAT_BUILTIN,;t t -s,@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN,;t t -s,@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN,;t t -s,@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN,;t t s,@LEX_STEM@,$LEX_STEM,;t t s,@PATH_IFS@,$PATH_IFS,;t t s,@WX_MAJOR_VERSION_NUMBER@,$WX_MAJOR_VERSION_NUMBER,;t t -- 2.45.2