Add CombineURIs implementation for wxWebFileProtocolHandler. Update the IE backend...

[wxWidgets.git] / samples / sockets / makefile.unx

diff --git a/samples/sockets/makefile.unx b/samples/sockets/makefile.unx
index f64f8bde60a410a626b087592f3b092bac3fd789..50f64fb3489ccae22ff67253d29eb7f49b4bda05 100644 (file)
--- a/samples/sockets/makefile.unx
+++ b/samples/sockets/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.9 (http://www.bakefile.org)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -11,22 +11,31 @@
 # -------------------------------------------------------------------------
 
 # C++ compiler 
 # -------------------------------------------------------------------------
 
 # C++ compiler 

-CXX = g++
+CXX = `$(WX_CONFIG) --cxx`

 
 # Standard flags for C++ 
 
 # Standard flags for C++ 

-CXXFLAGS = 
+CXXFLAGS ?= 

 
 # Standard preprocessor flags (common for CC and CXX) 
 
 # Standard preprocessor flags (common for CC and CXX) 

-CPPFLAGS = 
+CPPFLAGS ?= 

 
 # Standard linker flags 
 
 # Standard linker flags 

-LDFLAGS = 
+LDFLAGS ?= 

 
 # Location and arguments of wx-config script 
 
 # Location and arguments of wx-config script 

-WX_CONFIG = wx-config
+WX_CONFIG ?= wx-config

 
 

-# C++ flags to use with wxWidgets code 
-WX_CXXFLAGS = `$(WX_CONFIG) --cxxflags`
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
+
+# Use DLL build of wx library to use? [0,1]
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --query-linkage`; then echo 1; else echo 0; fi)
+
+# Compile Unicode build of wxWidgets? [0,1]
+WX_UNICODE ?= $(shell $(WX_CONFIG) --query-chartype | sed 's/unicode/1/;s/ansi/0/')
+
+# Version of the wx library to build against. 
+WX_VERSION ?= $(shell $(WX_CONFIG) --query-version | sed -e 's/\([0-9]*\)\.\([0-9]*\)/\1\2/')

 
 
 
 
 
 


@@ -36,23 +45,49 @@ WX_CXXFLAGS = `$(WX_CONFIG) --cxxflags`
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD
-CLIENT_CXXFLAGS =  -I.  $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP
+WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1)
+WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2)
+WX_CONFIG_FLAGS = $(WX_CONFIG_UNICODE_FLAG) $(WX_CONFIG_SHARED_FLAG) \
+       --toolkit=$(WX_PORT) --version=$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
+CLIENT_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
+       $(CXXFLAGS)

 CLIENT_OBJECTS =  \
        client_client.o
 CLIENT_OBJECTS =  \
        client_client.o

-SERVER_CXXFLAGS =  -I.  $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+SERVER_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
+       $(CXXFLAGS)

 SERVER_OBJECTS =  \
        server_server.o
 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: ###
 
 
 ### Conditionally set variables: ###
 

+ifeq ($(WX_UNICODE),0)
+WX_CONFIG_UNICODE_FLAG = --unicode=no
+endif
+ifeq ($(WX_UNICODE),1)
+WX_CONFIG_UNICODE_FLAG = --unicode=yes
+endif
+ifeq ($(WX_SHARED),0)
+WX_CONFIG_SHARED_FLAG = --static=yes
+endif
+ifeq ($(WX_SHARED),1)
+WX_CONFIG_SHARED_FLAG = --static=no
+endif

 
 
 ### Targets: ###
 
 
 
 ### Targets: ###
 

-all: client server
+all: test_for_selected_wxbuild client server baseclient baseserver

 
 

-install: all
+install: 

 
 uninstall: 
 
 
 uninstall: 
 


@@ -61,12 +96,23 @@ clean:
        rm -f ./*.d
        rm -f client
        rm -f server
        rm -f ./*.d
        rm -f client
        rm -f server

+       rm -f baseclient
+       rm -f baseserver
+
+test_for_selected_wxbuild: 
+       @$(WX_CONFIG) $(WX_CONFIG_FLAGS)

 
 client: $(CLIENT_OBJECTS)
 
 client: $(CLIENT_OBJECTS)

-       $(CXX) -o $@ $(CLIENT_OBJECTS) $(LDFLAGS)   `$(WX_CONFIG) --libs core,net,base`
+       $(CXX) -o $@ $(CLIENT_OBJECTS)   $(LDFLAGS)  `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,net,base`

 
 server: $(SERVER_OBJECTS)
 
 server: $(SERVER_OBJECTS)

-       $(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS)   `$(WX_CONFIG) --libs core,net,base`
+       $(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) $<
 
 client_client.o: ./client.cpp
        $(CXX) -c -o $@ $(CLIENT_CXXFLAGS) $(CPPDEPS) $<


@@ -74,6 +120,12 @@ client_client.o: ./client.cpp
 server_server.o: ./server.cpp
        $(CXX) -c -o $@ $(SERVER_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
 
 
 .PHONY: all install uninstall clean