Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed wxBase and GUI separation for sockets code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-07 12:35:39 +00:00
parent 38bb138f09
commit 0f009657bd
10 changed files with 245 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
build/msw/makefile.bcc
View File

@@ -228,6 +228,12 @@ BASELIB_OBJECTS = \
$(OBJS)\baselib_main.obj \
$(OBJS)\baselib_mslu.obj \
$(OBJS)\baselib_volume.obj
COREDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__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_CORE -DwxUSE_BASE=0 \
$(CFLAGS)
COREDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
@@ -244,6 +250,11 @@ COREDLL_OBJECTS = \
$(OBJS)\coredll_mslu.obj \
$(OBJS)\coredll_volume.obj \
$(____CORE_SRC_FILENAMES_2_OBJECTS)
CORELIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__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 -DwxUSE_BASE=0 $(CFLAGS)
CORELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
@@ -447,7 +458,6 @@ MONODLL_OBJECTS = \
$(OBJS)\monodll_socket.obj \
$(OBJS)\monodll_url.obj \
$(OBJS)\monodll_gsocket.obj \
$(OBJS)\monodll_gsockmsw.obj \
$(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
$(OBJS)\monodll_xml.obj
MONOLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
@@ -542,7 +552,6 @@ MONOLIB_OBJECTS = \
$(OBJS)\monolib_socket.obj \
$(OBJS)\monolib_url.obj \
$(OBJS)\monolib_gsocket.obj \
$(OBJS)\monolib_gsockmsw.obj \
$(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
$(OBJS)\monolib_xml.obj
NETDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
@@ -568,8 +577,7 @@ NETDLL_OBJECTS = \
$(OBJS)\netdll_sckstrm.obj \
$(OBJS)\netdll_socket.obj \
$(OBJS)\netdll_url.obj \
$(OBJS)\netdll_gsocket.obj \
$(OBJS)\netdll_gsockmsw.obj
$(OBJS)\netdll_gsocket.obj
NETLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
-tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
@@ -593,8 +601,7 @@ NETLIB_OBJECTS = \
$(OBJS)\netlib_sckstrm.obj \
$(OBJS)\netlib_socket.obj \
$(OBJS)\netlib_url.obj \
$(OBJS)\netlib_gsocket.obj \
$(OBJS)\netlib_gsockmsw.obj
$(OBJS)\netlib_gsocket.obj
OBJS = \
bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
ODBCDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
@@ -623,7 +630,7 @@ WXEXPAT_OBJECTS = \
$(OBJS)\wxexpat_xmlrole.obj \
$(OBJS)\wxexpat_xmltok.obj
WXJPEG_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
-tWM -I$(LIBDIRNAME) $(CFLAGS)
-tWM -I$(LIBDIRNAME) $(CFLAGS) -w-8004 -w-8008 -w-8057 -w-8066
WXJPEG_OBJECTS = \
$(OBJS)\wxjpeg_jcomapi.obj \
$(OBJS)\wxjpeg_jutils.obj \
@@ -672,7 +679,7 @@ WXJPEG_OBJECTS = \
$(OBJS)\wxjpeg_jquant2.obj \
$(OBJS)\wxjpeg_jdmerge.obj
WXPNG_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
-tWM -I..\..\src\zlib $(CFLAGS)
-tWM -I..\..\src\zlib $(CFLAGS) -w-8004
WXPNG_OBJECTS = \
$(OBJS)\wxpng_png.obj \
$(OBJS)\wxpng_pngerror.obj \
@@ -692,14 +699,14 @@ WXPNG_OBJECTS = \
$(OBJS)\wxpng_pngwtran.obj \
$(OBJS)\wxpng_pngwutil.obj
WXREGEX_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
-tWM $(CFLAGS)
-tWM $(CFLAGS) -w-8004 -w-8012 -w-8057 -w-8066
WXREGEX_OBJECTS = \
$(OBJS)\wxregex_regcomp.obj \
$(OBJS)\wxregex_regexec.obj \
$(OBJS)\wxregex_regerror.obj \
$(OBJS)\wxregex_regfree.obj
WXTIFF_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
-tWM $(CFLAGS)
-tWM $(CFLAGS) -w-8004 -w-8012 -w-8057 -w-8060 -w-8066
WXTIFF_OBJECTS = \
$(OBJS)\wxtiff_tif_win32.obj \
$(OBJS)\wxtiff_tif_aux.obj \
@@ -735,7 +742,7 @@ WXTIFF_OBJECTS = \
$(OBJS)\wxtiff_tif_write.obj \
$(OBJS)\wxtiff_tif_zip.obj
WXZLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
-tWM $(CFLAGS)
-tWM $(CFLAGS) -w-8004 -w-8012 -w-8057
WXZLIB_OBJECTS = \
$(OBJS)\wxzlib_adler32.obj \
$(OBJS)\wxzlib_compress.obj \
@@ -886,6 +893,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_fontutil.obj \
$(OBJS)\monolib_gdiimage.obj \
$(OBJS)\monolib_gdiobj.obj \
$(OBJS)\monolib_gsockmsw.obj \
$(OBJS)\monolib_helpchm.obj \
$(OBJS)\monolib_helpwin.obj \
$(OBJS)\monolib_icon.obj \
@@ -1075,6 +1083,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_fontutil.obj \
$(OBJS)\monolib_gdiimage.obj \
$(OBJS)\monolib_gdiobj.obj \
$(OBJS)\monolib_gsockmsw.obj \
$(OBJS)\monolib_helpchm.obj \
$(OBJS)\monolib_helpwin.obj \
$(OBJS)\monolib_icon.obj \
@@ -1264,6 +1273,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_fontutil.obj \
$(OBJS)\coredll_gdiimage.obj \
$(OBJS)\coredll_gdiobj.obj \
$(OBJS)\coredll_gsockmsw.obj \
$(OBJS)\coredll_helpchm.obj \
$(OBJS)\coredll_helpwin.obj \
$(OBJS)\coredll_icon.obj \
@@ -1453,6 +1463,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_fontutil.obj \
$(OBJS)\coredll_gdiimage.obj \
$(OBJS)\coredll_gdiobj.obj \
$(OBJS)\coredll_gsockmsw.obj \
$(OBJS)\coredll_helpchm.obj \
$(OBJS)\coredll_helpwin.obj \
$(OBJS)\coredll_icon.obj \
@@ -1642,6 +1653,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_fontutil.obj \
$(OBJS)\corelib_gdiimage.obj \
$(OBJS)\corelib_gdiobj.obj \
$(OBJS)\corelib_gsockmsw.obj \
$(OBJS)\corelib_helpchm.obj \
$(OBJS)\corelib_helpwin.obj \
$(OBJS)\corelib_icon.obj \
@@ -1831,6 +1843,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_fontutil.obj \
$(OBJS)\corelib_gdiimage.obj \
$(OBJS)\corelib_gdiobj.obj \
$(OBJS)\corelib_gsockmsw.obj \
$(OBJS)\corelib_helpchm.obj \
$(OBJS)\corelib_helpwin.obj \
$(OBJS)\corelib_icon.obj \
@@ -2020,6 +2033,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_fontutil.obj \
$(OBJS)\monodll_gdiimage.obj \
$(OBJS)\monodll_gdiobj.obj \
$(OBJS)\monodll_gsockmsw.obj \
$(OBJS)\monodll_helpchm.obj \
$(OBJS)\monodll_helpwin.obj \
$(OBJS)\monodll_icon.obj \
@@ -2209,6 +2223,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_fontutil.obj \
$(OBJS)\monodll_gdiimage.obj \
$(OBJS)\monodll_gdiobj.obj \
$(OBJS)\monodll_gsockmsw.obj \
$(OBJS)\monodll_helpchm.obj \
$(OBJS)\monodll_helpwin.obj \
$(OBJS)\monodll_icon.obj \
@@ -3550,6 +3565,11 @@ $(OBJS)\coredll_gifdecod.obj: ..\..\src\common\gifdecod.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
$(CC) -q -c -P- -o$@ $(COREDLL_CFLAGS) $**
!endif
$(OBJS)\coredll_gtk.obj: ..\..\src\univ\themes\gtk.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -4653,6 +4673,11 @@ $(OBJS)\corelib_gifdecod.obj: ..\..\src\common\gifdecod.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
$(CC) -q -c -P- -o$@ $(CORELIB_CFLAGS) $**
!endif
$(OBJS)\corelib_gtk.obj: ..\..\src\univ\themes\gtk.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -6023,8 +6048,10 @@ $(OBJS)\monodll_gridsel.obj: ..\..\src\generic\gridsel.cpp
$(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.c
$(CC) -q -c -P- -o$@ $(MONODLL_CFLAGS) $**
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
$(CC) -q -c -P- -o$@ $(MONODLL_CFLAGS) $**
!endif
$(OBJS)\monodll_gtk.obj: ..\..\src\univ\themes\gtk.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -7468,8 +7495,10 @@ $(OBJS)\monolib_gridsel.obj: ..\..\src\generic\gridsel.cpp
$(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.c
$(CC) -q -c -P- -o$@ $(MONOLIB_CFLAGS) $**
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
$(CC) -q -c -P- -o$@ $(MONOLIB_CFLAGS) $**
!endif
$(OBJS)\monolib_gtk.obj: ..\..\src\univ\themes\gtk.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -8341,9 +8370,6 @@ $(OBJS)\netdll_ftp.obj: ..\..\src\common\ftp.cpp
$(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) $**
@@ -8380,9 +8406,6 @@ $(OBJS)\netlib_ftp.obj: ..\..\src\common\ftp.cpp
$(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) $**