more socket cleanup to allow using wxSocket from both wxBase and wxCore (replaces patch 1756260)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-12-19 16:45:08 +00:00
parent 4813bb8d72
commit 2804f77d88
54 changed files with 3817 additions and 1933 deletions

View File

@@ -62,6 +62,14 @@ SERVER_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
$(CXXFLAGS)
SERVER_OBJECTS = \
server_server.o
BASECLIENT_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` \
$(CPPFLAGS) $(CXXFLAGS)
BASECLIENT_OBJECTS = \
baseclient_baseclient.o
BASESERVER_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` \
$(CPPFLAGS) $(CXXFLAGS)
BASESERVER_OBJECTS = \
baseserver_baseserver.o
### Conditionally set variables: ###
@@ -87,7 +95,7 @@ endif
### Targets: ###
all: test_for_selected_wxbuild client server
all: test_for_selected_wxbuild client server baseclient baseserver
install: all
@@ -98,6 +106,8 @@ clean:
rm -f ./*.d
rm -f client
rm -f server
rm -f baseclient
rm -f baseserver
test_for_selected_wxbuild:
@$(WX_CONFIG) $(WX_CONFIG_FLAGS)
@@ -108,12 +118,24 @@ client: $(CLIENT_OBJECTS)
server: $(SERVER_OBJECTS)
$(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,net,base`
baseclient: $(BASECLIENT_OBJECTS)
$(CXX) -o $@ $(BASECLIENT_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs net,base`
baseserver: $(BASESERVER_OBJECTS)
$(CXX) -o $@ $(BASESERVER_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs net,base`
client_client.o: ./client.cpp
$(CXX) -c -o $@ $(CLIENT_CXXFLAGS) $(CPPDEPS) $<
server_server.o: ./server.cpp
$(CXX) -c -o $@ $(SERVER_CXXFLAGS) $(CPPDEPS) $<
baseclient_baseclient.o: ./baseclient.cpp
$(CXX) -c -o $@ $(BASECLIENT_CXXFLAGS) $(CPPDEPS) $<
baseserver_baseserver.o: ./baseserver.cpp
$(CXX) -c -o $@ $(BASESERVER_CXXFLAGS) $(CPPDEPS) $<
.PHONY: all install uninstall clean