From 83a9be3427d830e767a5bcec2bc40a06d2d463a8 Mon Sep 17 00:00:00 2001 From: David Elliott Date: Wed, 4 Aug 2004 03:22:44 +0000 Subject: [PATCH 1/1] Use new C++ sockets for everything except OS/2 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 172 +++++++++++++++++++------------------- build/bakefiles/files.bkl | 18 ++-- build/msw/makefile.bcc | 54 ++++-------- build/msw/makefile.gcc | 52 ++++-------- build/msw/makefile.vc | 64 ++++---------- build/msw/makefile.wat | 54 ++++-------- build/msw/wx_core.dsp | 3 +- build/msw/wx_net.dsp | 3 +- include/wx/gsocket.h | 9 +- src/wxWindows.dsp | 6 +- 10 files changed, 169 insertions(+), 266 deletions(-) diff --git a/Makefile.in b/Makefile.in index 931c6c55d6..08f9cd64cf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -436,8 +436,8 @@ ALL_BASE_SOURCES = \ src/common/sckstrm.cpp \ src/common/socket.cpp \ src/common/url.cpp \ - src/unix/gsocket.c \ - src/msw/gsocket.c \ + src/unix/gsocket.cpp \ + src/msw/gsocket.cpp \ src/msw/urlmsw.cpp \ $(NET_WINCE_SRC) \ src/xml/xml.cpp \ @@ -8156,8 +8156,8 @@ monodll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(MONODLL_ODEP) monodll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -monodll_gsockmot.o: $(srcdir)/src/motif/gsockmot.c $(MONODLL_ODEP) - $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< +monodll_gsockmot.o: $(srcdir)/src/motif/gsockmot.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< monodll_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(MONODLL_ODEP) $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< @@ -8570,18 +8570,18 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_main.o: $(srcdir)/src/os2/main.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_PLATFORM_UNIX_1@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.c $(MONODLL_ODEP) -@COND_PLATFORM_UNIX_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< +@COND_PLATFORM_UNIX_1@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONODLL_ODEP) +@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_PLATFORM_MACOSX_1@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.c $(MONODLL_ODEP) -@COND_PLATFORM_MACOSX_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< +@COND_PLATFORM_MACOSX_1@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_PLATFORM_WIN32_1@monodll_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(MONODLL_ODEP) +@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_PLATFORM_OS2_1@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.c $(MONODLL_ODEP) @COND_PLATFORM_OS2_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< -@COND_PLATFORM_WIN32_1@monodll_gsocket.o: $(srcdir)/src/msw/gsocket.c $(MONODLL_ODEP) -@COND_PLATFORM_WIN32_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -9110,8 +9110,8 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1@monodll_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.c $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monodll_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@monodll_icon.o: $(srcdir)/src/gtk/icon.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -9416,11 +9416,11 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@monodll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c $(MONODLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@monodll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c $(MONODLL_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< +@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@monodll_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -9503,8 +9503,8 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_dirdlg.o: $(srcdir)/src/mac/carbon/dirdlg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_X11_USE_GUI_1@monodll_gsockx11.o: $(srcdir)/src/x11/gsockx11.c $(MONODLL_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< +@COND_TOOLKIT_X11_USE_GUI_1@monodll_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@monodll_nanox.o: $(srcdir)/src/x11/nanox.c $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< @@ -10505,11 +10505,11 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.c $(MONODLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.c $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11135,8 +11135,8 @@ monolib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(MONOLIB_ODEP) monolib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -monolib_gsockmot.o: $(srcdir)/src/motif/gsockmot.c $(MONOLIB_ODEP) - $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< +monolib_gsockmot.o: $(srcdir)/src/motif/gsockmot.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< monolib_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(MONOLIB_ODEP) $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< @@ -11549,18 +11549,18 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_main.o: $(srcdir)/src/os2/main.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_PLATFORM_UNIX_1@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.c $(MONOLIB_ODEP) -@COND_PLATFORM_UNIX_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< +@COND_PLATFORM_UNIX_1@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_PLATFORM_MACOSX_1@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.c $(MONOLIB_ODEP) -@COND_PLATFORM_MACOSX_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< +@COND_PLATFORM_MACOSX_1@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_PLATFORM_WIN32_1@monolib_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_PLATFORM_OS2_1@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.c $(MONOLIB_ODEP) @COND_PLATFORM_OS2_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< -@COND_PLATFORM_WIN32_1@monolib_gsocket.o: $(srcdir)/src/msw/gsocket.c $(MONOLIB_ODEP) -@COND_PLATFORM_WIN32_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -12089,8 +12089,8 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1@monolib_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.c $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monolib_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@monolib_icon.o: $(srcdir)/src/gtk/icon.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -12395,11 +12395,11 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@monolib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c $(MONOLIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@monolib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c $(MONOLIB_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< +@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@monolib_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -12482,8 +12482,8 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_dirdlg.o: $(srcdir)/src/mac/carbon/dirdlg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_X11_USE_GUI_1@monolib_gsockx11.o: $(srcdir)/src/x11/gsockx11.c $(MONOLIB_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< +@COND_TOOLKIT_X11_USE_GUI_1@monolib_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@monolib_nanox.o: $(srcdir)/src/x11/nanox.c $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< @@ -13484,11 +13484,11 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.c $(MONOLIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.c $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14564,18 +14564,18 @@ netdll_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(NETDLL_ODEP) netdll_net.o: $(srcdir)/src/msw/wince/net.cpp $(NETDLL_ODEP) $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $< -@COND_PLATFORM_UNIX_1@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.c $(NETDLL_ODEP) -@COND_PLATFORM_UNIX_1@ $(CCC) -c -o $@ $(NETDLL_CFLAGS) $< +@COND_PLATFORM_UNIX_1@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETDLL_ODEP) +@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $< + +@COND_PLATFORM_MACOSX_1@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETDLL_ODEP) +@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $< -@COND_PLATFORM_MACOSX_1@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.c $(NETDLL_ODEP) -@COND_PLATFORM_MACOSX_1@ $(CCC) -c -o $@ $(NETDLL_CFLAGS) $< +@COND_PLATFORM_WIN32_1@netdll_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(NETDLL_ODEP) +@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $< @COND_PLATFORM_OS2_1@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.c $(NETDLL_ODEP) @COND_PLATFORM_OS2_1@ $(CCC) -c -o $@ $(NETDLL_CFLAGS) $< -@COND_PLATFORM_WIN32_1@netdll_gsocket.o: $(srcdir)/src/msw/gsocket.c $(NETDLL_ODEP) -@COND_PLATFORM_WIN32_1@ $(CCC) -c -o $@ $(NETDLL_CFLAGS) $< - netlib_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(NETLIB_ODEP) $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $< @@ -14612,18 +14612,18 @@ netlib_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(NETLIB_ODEP) netlib_net.o: $(srcdir)/src/msw/wince/net.cpp $(NETLIB_ODEP) $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $< -@COND_PLATFORM_UNIX_1@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.c $(NETLIB_ODEP) -@COND_PLATFORM_UNIX_1@ $(CCC) -c -o $@ $(NETLIB_CFLAGS) $< +@COND_PLATFORM_UNIX_1@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETLIB_ODEP) +@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $< + +@COND_PLATFORM_MACOSX_1@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETLIB_ODEP) +@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $< -@COND_PLATFORM_MACOSX_1@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.c $(NETLIB_ODEP) -@COND_PLATFORM_MACOSX_1@ $(CCC) -c -o $@ $(NETLIB_CFLAGS) $< +@COND_PLATFORM_WIN32_1@netlib_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(NETLIB_ODEP) +@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $< @COND_PLATFORM_OS2_1@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.c $(NETLIB_ODEP) @COND_PLATFORM_OS2_1@ $(CCC) -c -o $@ $(NETLIB_CFLAGS) $< -@COND_PLATFORM_WIN32_1@netlib_gsocket.o: $(srcdir)/src/msw/gsocket.c $(NETLIB_ODEP) -@COND_PLATFORM_WIN32_1@ $(CCC) -c -o $@ $(NETLIB_CFLAGS) $< - coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -14660,8 +14660,8 @@ coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(COREDLL_ODEP) coredll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -coredll_gsockmot.o: $(srcdir)/src/motif/gsockmot.c $(COREDLL_ODEP) - $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< +coredll_gsockmot.o: $(srcdir)/src/motif/gsockmot.cpp $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< coredll_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(COREDLL_ODEP) $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< @@ -15368,8 +15368,8 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1@coredll_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.c $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@coredll_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@coredll_icon.o: $(srcdir)/src/gtk/icon.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -15674,11 +15674,11 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@coredll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c $(COREDLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@coredll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c $(COREDLL_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< +@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@coredll_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -15761,8 +15761,8 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_dirdlg.o: $(srcdir)/src/mac/carbon/dirdlg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_X11_USE_GUI_1@coredll_gsockx11.o: $(srcdir)/src/x11/gsockx11.c $(COREDLL_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< +@COND_TOOLKIT_X11_USE_GUI_1@coredll_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@coredll_nanox.o: $(srcdir)/src/x11/nanox.c $(COREDLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< @@ -16763,11 +16763,11 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.c $(COREDLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.c $(COREDLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -17093,8 +17093,8 @@ corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(CORELIB_ODEP) corelib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -corelib_gsockmot.o: $(srcdir)/src/motif/gsockmot.c $(CORELIB_ODEP) - $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< +corelib_gsockmot.o: $(srcdir)/src/motif/gsockmot.cpp $(CORELIB_ODEP) + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< corelib_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(CORELIB_ODEP) $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< @@ -17801,8 +17801,8 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1@corelib_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.c $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@corelib_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@corelib_icon.o: $(srcdir)/src/gtk/icon.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -18107,11 +18107,11 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@corelib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c $(CORELIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@corelib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.c $(CORELIB_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< +@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@corelib_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -18194,8 +18194,8 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_dirdlg.o: $(srcdir)/src/mac/carbon/dirdlg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_X11_USE_GUI_1@corelib_gsockx11.o: $(srcdir)/src/x11/gsockx11.c $(CORELIB_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< +@COND_TOOLKIT_X11_USE_GUI_1@corelib_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@corelib_nanox.o: $(srcdir)/src/x11/nanox.c $(CORELIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< @@ -19196,11 +19196,11 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.c $(CORELIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.c $(CORELIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_gsockosx.o: $(srcdir)/src/mac/carbon/gsockosx.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index ce69a56bf8..17201d03d9 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -307,14 +307,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! - src/unix/gsocket.c + src/unix/gsocket.cpp wx/unix/gsockunx.h - src/msw/gsocket.c + src/msw/gsocket.cpp src/msw/urlmsw.cpp @@ -329,7 +329,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! - src/unix/gsocket.c + src/unix/gsocket.cpp wx/unix/gsockunx.h @@ -686,7 +686,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/gtk/evtloop.cpp src/gtk/font.cpp src/gtk/gdiobj.cpp - src/gtk/gsockgtk.c + src/gtk/gsockgtk.cpp src/gtk/icon.cpp src/gtk/main.cpp src/gtk/minifram.cpp @@ -873,7 +873,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/motif/frame.cpp src/motif/gauge.cpp src/motif/gdiobj.cpp - src/motif/gsockmot.c + src/motif/gsockmot.cpp src/motif/icon.cpp src/motif/listbox.cpp src/motif/main.cpp @@ -1005,7 +1005,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/x11/evtloop.cpp src/x11/font.cpp src/x11/gdiobj.cpp - src/x11/gsockx11.c + src/x11/gsockx11.cpp src/x11/icon.cpp src/x11/main.cpp src/x11/minifram.cpp @@ -1085,7 +1085,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/msw/fontutil.cpp src/msw/gdiimage.cpp src/msw/gdiobj.cpp - src/msw/gsockmsw.c + src/msw/gsockmsw.cpp src/msw/icon.cpp src/msw/minifram.cpp src/msw/ole/dataobj.cpp @@ -1606,7 +1606,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/mac/carbon/frame.cpp src/mac/carbon/gauge.cpp src/mac/carbon/gdiobj.cpp - src/mac/carbon/gsockosx.c + src/mac/carbon/gsockosx.cpp src/mac/carbon/icon.cpp src/mac/carbon/listbox.cpp src/mac/carbon/mdi.cpp @@ -1928,7 +1928,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/tabg.cpp src/generic/timer.cpp - src/mac/carbon/gsockosx.c + src/mac/carbon/gsockosx.cpp wx/cocoa/NSApplication.h diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index e998e71dd8..28b123d085 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -536,12 +536,6 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_main.obj \ $(OBJS)\baselib_mslu.obj \ $(OBJS)\baselib_volume.obj -NETDLL_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET \ - $(CPPFLAGS) $(CFLAGS) NETDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \ @@ -562,11 +556,6 @@ NETDLL_OBJECTS = \ $(OBJS)\netdll_url.obj \ $(OBJS)\netdll_gsocket.obj \ $(OBJS)\netdll_urlmsw.obj -NETLIB_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 $(CPPFLAGS) $(CFLAGS) NETLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \ @@ -587,12 +576,6 @@ NETLIB_OBJECTS = \ $(OBJS)\netlib_url.obj \ $(OBJS)\netlib_gsocket.obj \ $(OBJS)\netlib_urlmsw.obj -COREDLL_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 \ - $(CPPFLAGS) $(CFLAGS) COREDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \ @@ -609,11 +592,6 @@ COREDLL_OBJECTS = \ $(OBJS)\coredll_mslu.obj \ $(OBJS)\coredll_volume.obj \ $(____CORE_SRC_FILENAMES_2_OBJECTS) -CORELIB_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS) CORELIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \ @@ -3589,8 +3567,8 @@ $(OBJS)\monodll_socket.obj: ..\..\src\common\socket.cpp $(OBJS)\monodll_url.obj: ..\..\src\common\url.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.c - $(CC) -q -c -P- -o$@ $(MONODLL_CFLAGS) $** +$(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -3972,8 +3950,8 @@ $(OBJS)\monodll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.c - $(CC) -q -c -P- -o$@ $(MONODLL_CFLAGS) $** +$(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" @@ -5059,8 +5037,8 @@ $(OBJS)\monolib_socket.obj: ..\..\src\common\socket.cpp $(OBJS)\monolib_url.obj: ..\..\src\common\url.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.c - $(CC) -q -c -P- -o$@ $(MONOLIB_CFLAGS) $** +$(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -5442,8 +5420,8 @@ $(OBJS)\monolib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.c - $(CC) -q -c -P- -o$@ $(MONOLIB_CFLAGS) $** +$(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" @@ -6745,8 +6723,8 @@ $(OBJS)\netdll_socket.obj: ..\..\src\common\socket.cpp $(OBJS)\netdll_url.obj: ..\..\src\common\url.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_gsocket.obj: ..\..\src\msw\gsocket.cpp + $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $** $(OBJS)\netdll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $** @@ -6784,8 +6762,8 @@ $(OBJS)\netlib_socket.obj: ..\..\src\common\socket.cpp $(OBJS)\netlib_url.obj: ..\..\src\common\url.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_gsocket.obj: ..\..\src\msw\gsocket.cpp + $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $** $(OBJS)\netlib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $** @@ -7068,8 +7046,8 @@ $(OBJS)\coredll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gsockmsw.obj: ..\..\src\msw\gsockmsw.c - $(CC) -q -c -P- -o$@ $(COREDLL_CFLAGS) $** +$(OBJS)\coredll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" @@ -8190,8 +8168,8 @@ $(OBJS)\corelib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gsockmsw.obj: ..\..\src\msw\gsockmsw.c - $(CC) -q -c -P- -o$@ $(CORELIB_CFLAGS) $** +$(OBJS)\corelib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index ff1cd502d8..f8591201db 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -521,11 +521,6 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_main.o \ $(OBJS)\baselib_mslu.o \ $(OBJS)\baselib_volume.o -NETDLL_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ - -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ - -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(CPPFLAGS) $(CFLAGS) NETDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ @@ -546,11 +541,6 @@ NETDLL_OBJECTS = \ $(OBJS)\netdll_url.o \ $(OBJS)\netdll_gsocket.o \ $(OBJS)\netdll_urlmsw.o -NETLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ - -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ - -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_GUI=0 $(CPPFLAGS) $(CFLAGS) NETLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ @@ -571,11 +561,6 @@ NETLIB_OBJECTS = \ $(OBJS)\netlib_url.o \ $(OBJS)\netlib_gsocket.o \ $(OBJS)\netlib_urlmsw.o -COREDLL_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ - -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ - -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS) COREDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ @@ -592,11 +577,6 @@ COREDLL_OBJECTS = \ $(OBJS)\coredll_mslu.o \ $(OBJS)\coredll_volume.o \ $(____CORE_SRC_FILENAMES_2_OBJECTS) -CORELIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ - -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ - -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -DwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS) CORELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ @@ -3629,8 +3609,8 @@ $(OBJS)\monodll_socket.o: ../../src/common/socket.cpp $(OBJS)\monodll_url.o: ../../src/common/url.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_gsocket.o: ../../src/msw/gsocket.c - $(CC) -c -o $@ $(MONODLL_CFLAGS) $< +$(OBJS)\monodll_gsocket.o: ../../src/msw/gsocket.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_urlmsw.o: ../../src/msw/urlmsw.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -4012,8 +3992,8 @@ $(OBJS)\monodll_gdiobj.o: ../../src/msw/gdiobj.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\monodll_gsockmsw.o: ../../src/msw/gsockmsw.c - $(CC) -c -o $@ $(MONODLL_CFLAGS) $< +$(OBJS)\monodll_gsockmsw.o: ../../src/msw/gsockmsw.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) @@ -5199,8 +5179,8 @@ $(OBJS)\monolib_socket.o: ../../src/common/socket.cpp $(OBJS)\monolib_url.o: ../../src/common/url.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_gsocket.o: ../../src/msw/gsocket.c - $(CC) -c -o $@ $(MONOLIB_CFLAGS) $< +$(OBJS)\monolib_gsocket.o: ../../src/msw/gsocket.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_urlmsw.o: ../../src/msw/urlmsw.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -5582,8 +5562,8 @@ $(OBJS)\monolib_gdiobj.o: ../../src/msw/gdiobj.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\monolib_gsockmsw.o: ../../src/msw/gsockmsw.c - $(CC) -c -o $@ $(MONOLIB_CFLAGS) $< +$(OBJS)\monolib_gsockmsw.o: ../../src/msw/gsockmsw.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) @@ -6985,8 +6965,8 @@ $(OBJS)\netdll_socket.o: ../../src/common/socket.cpp $(OBJS)\netdll_url.o: ../../src/common/url.cpp $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $< -$(OBJS)\netdll_gsocket.o: ../../src/msw/gsocket.c - $(CC) -c -o $@ $(NETDLL_CFLAGS) $< +$(OBJS)\netdll_gsocket.o: ../../src/msw/gsocket.cpp + $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $< $(OBJS)\netdll_urlmsw.o: ../../src/msw/urlmsw.cpp $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $< @@ -7024,8 +7004,8 @@ $(OBJS)\netlib_socket.o: ../../src/common/socket.cpp $(OBJS)\netlib_url.o: ../../src/common/url.cpp $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $< -$(OBJS)\netlib_gsocket.o: ../../src/msw/gsocket.c - $(CC) -c -o $@ $(NETLIB_CFLAGS) $< +$(OBJS)\netlib_gsocket.o: ../../src/msw/gsocket.cpp + $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $< $(OBJS)\netlib_urlmsw.o: ../../src/msw/urlmsw.cpp $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $< @@ -7308,8 +7288,8 @@ $(OBJS)\coredll_gdiobj.o: ../../src/msw/gdiobj.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\coredll_gsockmsw.o: ../../src/msw/gsockmsw.c - $(CC) -c -o $@ $(COREDLL_CFLAGS) $< +$(OBJS)\coredll_gsockmsw.o: ../../src/msw/gsockmsw.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) @@ -8530,8 +8510,8 @@ $(OBJS)\corelib_gdiobj.o: ../../src/msw/gdiobj.cpp endif ifeq ($(USE_GUI),1) -$(OBJS)\corelib_gsockmsw.o: ../../src/msw/gsockmsw.c - $(CC) -c -o $@ $(CORELIB_CFLAGS) $< +$(OBJS)\corelib_gsockmsw.o: ../../src/msw/gsockmsw.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< endif ifeq ($(USE_GUI),1) diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 79d0985706..b1f1646ae7 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -555,14 +555,6 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_main.obj \ $(OBJS)\baselib_mslu.obj \ $(OBJS)\baselib_volume.obj -NETDLL_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_126) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME_125_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \ - /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ - /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_NET $(CPPFLAGS) $(CFLAGS) NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_126) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb \ @@ -587,14 +579,6 @@ NETDLL_OBJECTS = \ $(OBJS)\netdll_url.obj \ $(OBJS)\netdll_gsocket.obj \ $(OBJS)\netdll_urlmsw.obj -NETLIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_138) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.pdb \ - $(____DEBUGRUNTIME_137_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \ - /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ - /DwxUSE_GUI=0 $(CPPFLAGS) $(CFLAGS) NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_138) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.pdb \ @@ -618,14 +602,6 @@ NETLIB_OBJECTS = \ $(OBJS)\netlib_url.obj \ $(OBJS)\netlib_gsocket.obj \ $(OBJS)\netlib_urlmsw.obj -COREDLL_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_151) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME_150_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \ - /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ - /DWXUSINGDLL /DWXMAKINGDLL_CORE /DwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS) COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_151) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).pdb \ @@ -646,14 +622,6 @@ COREDLL_OBJECTS = \ $(OBJS)\coredll_mslu.obj \ $(OBJS)\coredll_volume.obj \ $(____CORE_SRC_FILENAMES_2_OBJECTS) -CORELIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_163) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.pdb \ - $(____DEBUGRUNTIME_162_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - /I..\..\include /I$(SETUPHDIR) /W4 /I..\..\src\tiff /I..\..\src\jpeg \ - /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ - /DwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS) CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_163) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.pdb \ @@ -4144,8 +4112,8 @@ $(OBJS)\monodll_socket.obj: ..\..\src\common\socket.cpp $(OBJS)\monodll_url.obj: ..\..\src\common\url.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.c - $(CC) /c /nologo /TC /Fo$@ $(MONODLL_CFLAGS) $** +$(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -4527,8 +4495,8 @@ $(OBJS)\monodll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.c - $(CC) /c /nologo /TC /Fo$@ $(MONODLL_CFLAGS) $** +$(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" @@ -5614,8 +5582,8 @@ $(OBJS)\monolib_socket.obj: ..\..\src\common\socket.cpp $(OBJS)\monolib_url.obj: ..\..\src\common\url.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.c - $(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) $** +$(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -5997,8 +5965,8 @@ $(OBJS)\monolib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.c - $(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) $** +$(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" @@ -7300,8 +7268,8 @@ $(OBJS)\netdll_socket.obj: ..\..\src\common\socket.cpp $(OBJS)\netdll_url.obj: ..\..\src\common\url.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_gsocket.obj: ..\..\src\msw\gsocket.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $** $(OBJS)\netdll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $** @@ -7339,8 +7307,8 @@ $(OBJS)\netlib_socket.obj: ..\..\src\common\socket.cpp $(OBJS)\netlib_url.obj: ..\..\src\common\url.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_gsocket.obj: ..\..\src\msw\gsocket.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $** $(OBJS)\netlib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $** @@ -7623,8 +7591,8 @@ $(OBJS)\coredll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gsockmsw.obj: ..\..\src\msw\gsockmsw.c - $(CC) /c /nologo /TC /Fo$@ $(COREDLL_CFLAGS) $** +$(OBJS)\coredll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" @@ -8745,8 +8713,8 @@ $(OBJS)\corelib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gsockmsw.obj: ..\..\src\msw\gsockmsw.c - $(CC) /c /nologo /TC /Fo$@ $(CORELIB_CFLAGS) $** +$(OBJS)\corelib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif !if "$(USE_GUI)" == "1" diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index 6e96922b02..2be53976b6 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -2525,12 +2525,6 @@ BASELIB_OBJECTS = & $(OBJS)\baselib_main.obj & $(OBJS)\baselib_mslu.obj & $(OBJS)\baselib_volume.obj -NETDLL_CFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & - -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & - -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET & - $(CPPFLAGS) $(CFLAGS) NETDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg & @@ -2551,11 +2545,6 @@ NETDLL_OBJECTS = & $(OBJS)\netdll_url.obj & $(OBJS)\netdll_gsocket.obj & $(OBJS)\netdll_urlmsw.obj -NETLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & - -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & - -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dwxUSE_GUI=0 $(CPPFLAGS) $(CFLAGS) NETLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg & @@ -2576,12 +2565,6 @@ NETLIB_OBJECTS = & $(OBJS)\netlib_url.obj & $(OBJS)\netlib_gsocket.obj & $(OBJS)\netlib_urlmsw.obj -COREDLL_CFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & - -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & - -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_CORE -dwxUSE_BASE=0 & - $(CPPFLAGS) $(CFLAGS) COREDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg & @@ -2598,11 +2581,6 @@ COREDLL_OBJECTS = & $(OBJS)\coredll_mslu.obj & $(OBJS)\coredll_volume.obj & $(____CORE_SRC_FILENAMES_2_OBJECTS) -CORELIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & - -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & - -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg & - -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex & - -i=..\..\src\expat\lib -dwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS) CORELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg & @@ -3819,8 +3797,8 @@ $(OBJS)\monodll_socket.obj : .AUTODEPEND ..\..\src\common\socket.cpp $(OBJS)\monodll_url.obj : .AUTODEPEND ..\..\src\common\url.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.c - $(CC) -zq -fo=$^@ $(MONODLL_CFLAGS) $< +$(OBJS)\monodll_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -4202,8 +4180,8 @@ $(OBJS)\monodll_gdiobj.obj : .AUTODEPEND ..\..\src\msw\gdiobj.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monodll_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.c - $(CC) -zq -fo=$^@ $(MONODLL_CFLAGS) $< +$(OBJS)\monodll_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.cpp + $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 @@ -5389,8 +5367,8 @@ $(OBJS)\monolib_socket.obj : .AUTODEPEND ..\..\src\common\socket.cpp $(OBJS)\monolib_url.obj : .AUTODEPEND ..\..\src\common\url.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.c - $(CC) -zq -fo=$^@ $(MONOLIB_CFLAGS) $< +$(OBJS)\monolib_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -5772,8 +5750,8 @@ $(OBJS)\monolib_gdiobj.obj : .AUTODEPEND ..\..\src\msw\gdiobj.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\monolib_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.c - $(CC) -zq -fo=$^@ $(MONOLIB_CFLAGS) $< +$(OBJS)\monolib_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.cpp + $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 @@ -7175,8 +7153,8 @@ $(OBJS)\netdll_socket.obj : .AUTODEPEND ..\..\src\common\socket.cpp $(OBJS)\netdll_url.obj : .AUTODEPEND ..\..\src\common\url.cpp $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< -$(OBJS)\netdll_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.c - $(CC) -zq -fo=$^@ $(NETDLL_CFLAGS) $< +$(OBJS)\netdll_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.cpp + $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< $(OBJS)\netdll_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp $(CXX) -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< @@ -7214,8 +7192,8 @@ $(OBJS)\netlib_socket.obj : .AUTODEPEND ..\..\src\common\socket.cpp $(OBJS)\netlib_url.obj : .AUTODEPEND ..\..\src\common\url.cpp $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< -$(OBJS)\netlib_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.c - $(CC) -zq -fo=$^@ $(NETLIB_CFLAGS) $< +$(OBJS)\netlib_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.cpp + $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< $(OBJS)\netlib_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp $(CXX) -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< @@ -7498,8 +7476,8 @@ $(OBJS)\coredll_gdiobj.obj : .AUTODEPEND ..\..\src\msw\gdiobj.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\coredll_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.c - $(CC) -zq -fo=$^@ $(COREDLL_CFLAGS) $< +$(OBJS)\coredll_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.cpp + $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif !ifeq USE_GUI 1 @@ -8720,8 +8698,8 @@ $(OBJS)\corelib_gdiobj.obj : .AUTODEPEND ..\..\src\msw\gdiobj.cpp !endif !ifeq USE_GUI 1 -$(OBJS)\corelib_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.c - $(CC) -zq -fo=$^@ $(CORELIB_CFLAGS) $< +$(OBJS)\corelib_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.cpp + $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif !ifeq USE_GUI 1 diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index ddf93b1367..26dbbee794 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -1953,8 +1953,7 @@ SOURCE=..\..\src\msw\gdiobj.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\gsockmsw.c -# SUBTRACT CPP /YX /Yc /Yu +SOURCE=..\..\src\msw\gsockmsw.cpp # End Source File # Begin Source File diff --git a/build/msw/wx_net.dsp b/build/msw/wx_net.dsp index aee8c3f8fa..a4f77a13be 100644 --- a/build/msw/wx_net.dsp +++ b/build/msw/wx_net.dsp @@ -502,8 +502,7 @@ SOURCE=..\..\src\msw\dummy.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\gsocket.c -# SUBTRACT CPP /YX /Yc /Yu +SOURCE=..\..\src\msw\gsocket.cpp # End Source File # Begin Source File diff --git a/include/wx/gsocket.h b/include/wx/gsocket.h index e466deed27..8ccedd46da 100644 --- a/include/wx/gsocket.h +++ b/include/wx/gsocket.h @@ -11,10 +11,13 @@ #ifndef __GSOCKET_H #define __GSOCKET_H -/* DFE: Define this and compile gsocket.cpp instead of gsocket.c and - compile existing GUI gsock*.c as C++ to try out the new GSocket. */ -/* #define wxUSE_GSOCKET_CPLUSPLUS 1 */ +// FIXME: OS/2 needs to move to modern C++ GSocket +#if defined(__OS2__) #undef wxUSE_GSOCKET_CPLUSPLUS +#else +#define wxUSE_GSOCKET_CPLUSPLUS 1 +#endif + #if !defined(__cplusplus) && defined(wxUSE_GSOCKET_CPLUSPLUS) #error "You need to compile this file (probably a GUI gsock peice) as C++" #endif diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index e96d2621a1..ae50411cfb 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -1288,13 +1288,11 @@ SOURCE=.\msw\glcanvas.cpp # End Source File # Begin Source File -SOURCE=.\msw\gsocket.c -# SUBTRACT CPP /YX /Yc /Yu +SOURCE=.\msw\gsocket.cpp # End Source File # Begin Source File -SOURCE=.\msw\gsockmsw.c -# SUBTRACT CPP /YX /Yc /Yu +SOURCE=.\msw\gsockmsw.cpp # End Source File # Begin Source File -- 2.45.2