X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9877ed3a8b530696d51dc80fdb308aa09c8f563..1c0f361be288df133c766e04cc857b3e4682b31a:/samples/sockets/makefile.gcc

diff --git a/samples/sockets/makefile.gcc b/samples/sockets/makefile.gcc
index fc9bb93a3b..8f97911984 100644
--- a/samples/sockets/makefile.gcc
+++ b/samples/sockets/makefile.gcc
@@ -1,10 +1,10 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.3 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
-include ../../build/config.gcc
+include ../../build/msw/config.gcc
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
@@ -12,29 +12,21 @@ include ../../build/config.gcc
 
 ### Variables: ###
 
-CLIENT_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 -I. $(__DLLFLAG_p) $(CXXFLAGS)
-CLIENT_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 -I. $(__DLLFLAG_p) $(CXXFLAGS)
-CLIENT_OBJECTS =  $(OBJS)\client_client.o $(OBJS)\client_client_rc.o
+OBJS = \
+	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+SETUPHDIR = \
+	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
+	-D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+	-I.\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \
+	$(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
 CLIENT_OBJECTS =  \
 	$(OBJS)\client_client.o \
 	$(OBJS)\client_client_rc.o
-LIBDIRNAME = .\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = \
-	.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-SERVER_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 -I. $(__DLLFLAG_p) $(CXXFLAGS)
-SERVER_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 -I. $(__DLLFLAG_p) $(CXXFLAGS)
-SERVER_OBJECTS =  $(OBJS)\server_server.o $(OBJS)\server_server_rc.o
+SERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
+	-D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+	-I.\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \
+	$(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
 SERVER_OBJECTS =  \
 	$(OBJS)\server_server.o \
 	$(OBJS)\server_server_rc.o
@@ -51,10 +43,12 @@ ifeq ($(USE_GUI),1)
 PORTNAME = msw
 endif
 ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_FLAG),default)
 WXDEBUGFLAG = d
 endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
+endif
+ifeq ($(DEBUG_FLAG),1)
+WXDEBUGFLAG = d
 endif
 ifeq ($(UNICODE),1)
 WXUNICODEFLAG = u
@@ -62,64 +56,108 @@ endif
 ifeq ($(WXUNIV),1)
 WXUNIVNAME = univ
 endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
 ifeq ($(BUILD),debug)
-__DEBUGFLAG = -g
+__OPTIMIZEFLAG = -O0
 endif
 ifeq ($(BUILD),release)
-__DEBUGFLAG = 
+__OPTIMIZEFLAG = -O2
 endif
-ifeq ($(BUILD),debug)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG = -fno-rtti
 endif
-ifeq ($(BUILD),debug)
-__DEBUG_DEFINE_p_0 = --define __WXDEBUG__
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG = 
 endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_0 = -fno-exceptions
 endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_0 = --define WXUSINGDLL
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_0 = 
 endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_FLAG),default)
+__DEBUG_DEFINE_p = -D__WXDEBUG__
 endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(DEBUG_FLAG),1)
+__DEBUG_DEFINE_p = -D__WXDEBUG__
 endif
 ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG = -O0
+ifeq ($(DEBUG_FLAG),default)
+__DEBUG_DEFINE_p_0 = --define __WXDEBUG__
 endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG = -O2
+endif
+ifeq ($(DEBUG_FLAG),1)
+__DEBUG_DEFINE_p_0 = --define __WXDEBUG__
 endif
 ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -D_UNICODE
 endif
 ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_0 = --define wxUSE_UNICODE=1
+__UNICODE_DEFINE_p_0 = --define _UNICODE
 endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ifeq ($(SHARED),0)
+LIBDIRNAME = .\..\..\lib\gcc_lib$(CFG)
+endif
+ifeq ($(SHARED),1)
+LIBDIRNAME = .\..\..\lib\gcc_dll$(CFG)
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_0 = --define WXUSINGDLL
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_CORE_p = \
 	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core
 endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_NET_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+endif
 ifeq ($(MONOLITHIC),1)
 __WXLIB_MONO_p = \
 	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_NET_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
 endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
 endif
 
 
@@ -131,27 +169,27 @@ $(OBJS):
 
 all: $(OBJS)\client.exe $(OBJS)\server.exe
 
-$(OBJS)\client_client.o: .\client.cpp
-	$(CXX) -c -o $@ $(CLIENT_CXXFLAGS) $<
-
-$(OBJS)\client_client_rc.o: .\client.rc
-	windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) --include-dir ./../../include --include-dir $(LIBDIRNAME) --include-dir ./../../src/tiff --include-dir ./../../src/jpeg --include-dir ./../../src/png --include-dir ./../../src/zlib  --include-dir ./../../src/regex --include-dir ./../../src/expat/lib --include-dir . $(__DLLFLAG_p_0)
-
-$(OBJS)\server_server.o: .\server.cpp
-	$(CXX) -c -o $@ $(SERVER_CXXFLAGS) $<
-
-$(OBJS)\server_server_rc.o: .\server.rc
-	windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) --include-dir ./../../include --include-dir $(LIBDIRNAME) --include-dir ./../../src/tiff --include-dir ./../../src/jpeg --include-dir ./../../src/png --include-dir ./../../src/zlib  --include-dir ./../../src/regex --include-dir ./../../src/expat/lib --include-dir . $(__DLLFLAG_p_0)
-
 clean: 
 	-if exist $(OBJS)\*.o del $(OBJS)\*.o
 	-if exist $(OBJS)\client.exe del $(OBJS)\client.exe
 	-if exist $(OBJS)\server.exe del $(OBJS)\server.exe
 
 $(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_client_rc.o
-	$(CXX) -o $@ $(CLIENT_OBJECTS) $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__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
+	$(CXX) -o $@ $(CLIENT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
 
 $(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_server_rc.o
-	$(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__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
+	$(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
+
+$(OBJS)\client_client.o: ./client.cpp
+	$(CXX) -c -o $@ $(CLIENT_CXXFLAGS) $<
+
+$(OBJS)\client_client_rc.o: ./client.rc
+	windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_0) --include-dir ./../../samples
+
+$(OBJS)\server_server.o: ./server.cpp
+	$(CXX) -c -o $@ $(SERVER_CXXFLAGS) $<
+
+$(OBJS)\server_server_rc.o: ./server.rc
+	windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_0) --include-dir ./../../samples
 
 .PHONY: all clean