Fixed problems caused by duplicated names across different style types.

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

diff --git a/samples/sockets/makefile.gcc b/samples/sockets/makefile.gcc
index 8ee3f404c222f8d493ef1c99cf10067e8b1eb396..93f4573c2a3450fbfc8253affd8df7ab84335caf 100644 (file)
--- a/samples/sockets/makefile.gcc
+++ b/samples/sockets/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================\r
 #     This makefile was generated by\r
-#     Bakefile 0.2.8 (http://www.bakefile.org)\r
+#     Bakefile 0.2.9 (http://www.bakefile.org)\r
 #     Do not modify, all changes will be overwritten!\r
 # =========================================================================\r
 \r
@@ -22,29 +22,29 @@ SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 CLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \\r
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
        -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \\r
        -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG) \\r
        $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 CLIENT_OBJECTS =  \\r
-       $(OBJS)\client_client.o \\r
-       $(OBJS)\client_client_rc.o\r
+       $(OBJS)\client_sample_rc.o \\r
+       $(OBJS)\client_client.o\r
 SERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \\r
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
-       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
        -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \\r
        -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG) \\r
        $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 SERVER_OBJECTS =  \\r
-       $(OBJS)\server_server.o \\r
-       $(OBJS)\server_server_rc.o\r
+       $(OBJS)\server_sample_rc.o \\r
+       $(OBJS)\server_server.o\r
 BASECLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \\r
        $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \\r
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \\r
+       $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \\r
        $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \\r
        $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \\r
        $(CXXFLAGS)\r
@@ -52,9 +52,9 @@ BASECLIENT_OBJECTS =  \
        $(OBJS)\baseclient_baseclient.o\r
 BASESERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \\r
        $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \\r
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \\r
+       $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \\r
        $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \\r
        $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \\r
        $(CXXFLAGS)\r
@@ -102,12 +102,21 @@ endif
 ifeq ($(USE_GUI),1)\r
 __server___depname = $(OBJS)\server.exe\r
 endif\r
+ifeq ($(MONOLITHIC),1)\r
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)\r
+endif\r
+ifeq ($(MONOLITHIC),1)\r
+__LIB_PNG_IF_MONO_p_1 = $(__LIB_PNG_p)\r
+endif\r
 ifeq ($(WXUNIV),1)\r
 __WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__\r
 endif\r
 ifeq ($(DEBUG_FLAG),0)\r
 __DEBUG_DEFINE_p_0 = --define wxDEBUG_LEVEL=0\r
 endif\r
+ifeq ($(BUILD),release)\r
+__NDEBUG_DEFINE_p_0 = --define NDEBUG\r
+endif\r
 ifeq ($(USE_EXCEPTIONS),0)\r
 __EXCEPTIONS_DEFINE_p_0 = --define wxNO_EXCEPTIONS\r
 endif\r
@@ -126,9 +135,6 @@ endif
 ifeq ($(MSLU),1)\r
 __MSLU_DEFINE_p_0 = --define wxUSE_UNICODE_MSLU=1\r
 endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p_0 = --define wxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
 ifeq ($(USE_CAIRO),1)\r
 __CAIRO_INCLUDEDIR_p = --include-dir $(CAIRO_ROOT)/include/cairo\r
 endif\r
@@ -145,9 +151,6 @@ endif
 ifeq ($(USE_GUI),1)\r
 __LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
 endif\r
-ifeq ($(USE_GUI),1)\r
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
-endif\r
 ifeq ($(BUILD),debug)\r
 __OPTIMIZEFLAG = -O0\r
 endif\r
@@ -172,6 +175,9 @@ endif
 ifeq ($(DEBUG_FLAG),0)\r
 __DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
 endif\r
+ifeq ($(BUILD),release)\r
+__NDEBUG_DEFINE_p = -DNDEBUG\r
+endif\r
 ifeq ($(USE_EXCEPTIONS),0)\r
 __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
 endif\r
@@ -190,9 +196,6 @@ endif
 ifeq ($(MSLU),1)\r
 __MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
 endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
 ifeq ($(USE_CAIRO),1)\r
 ____CAIRO_INCLUDEDIR_FILENAMES = -I$(CAIRO_ROOT)\include\cairo\r
 endif\r
@@ -211,12 +214,12 @@ ifeq ($(MONOLITHIC),1)
 __WXLIB_MONO_p = \\r
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
 endif\r
+ifeq ($(USE_GUI),1)\r
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
+endif\r
 ifeq ($(MSLU),1)\r
 __UNICOWS_LIB_p = -lunicows\r
 endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
 ifeq ($(USE_CAIRO),1)\r
 __CAIRO_LIB_p = -lcairo\r
 endif\r
@@ -264,33 +267,33 @@ clean:
        -if exist $(OBJS)\baseserver.exe del $(OBJS)\baseserver.exe\r
 \r
 ifeq ($(USE_GUI),1)\r
-$(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_client_rc.o\r
-       $(CXX) -o $@ $(CLIENT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__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) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
+$(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_sample_rc.o\r
+       $(CXX) -o $@ $(CLIENT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__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) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
 endif\r
 \r
 ifeq ($(USE_GUI),1)\r
-$(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_server_rc.o\r
-       $(CXX) -o $@ $(SERVER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__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) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
+$(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_sample_rc.o\r
+       $(CXX) -o $@ $(SERVER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__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) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
 endif\r
 \r
 $(OBJS)\baseclient.exe: $(BASECLIENT_OBJECTS)\r
-       $(CXX) -o $@ $(BASECLIENT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
+       $(CXX) -o $@ $(BASECLIENT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
 \r
 $(OBJS)\baseserver.exe: $(BASESERVER_OBJECTS)\r
-       $(CXX) -o $@ $(BASESERVER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
+       $(CXX) -o $@ $(BASESERVER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
+\r
+$(OBJS)\client_sample_rc.o: ./../../samples/sample.rc\r
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__NDEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_0) --include-dir ./../../samples --define NOPCH\r
 \r
 $(OBJS)\client_client.o: ./client.cpp\r
        $(CXX) -c -o $@ $(CLIENT_CXXFLAGS) $(CPPDEPS) $<\r
 \r
-$(OBJS)\client_client_rc.o: ./client.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_0) --include-dir ./../../samples --define NOPCH\r
+$(OBJS)\server_sample_rc.o: ./../../samples/sample.rc\r
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__NDEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_0) --include-dir ./../../samples --define NOPCH\r
 \r
 $(OBJS)\server_server.o: ./server.cpp\r
        $(CXX) -c -o $@ $(SERVER_CXXFLAGS) $(CPPDEPS) $<\r
 \r
-$(OBJS)\server_server_rc.o: ./server.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_0) --include-dir ./../../samples --define NOPCH\r
-\r
 $(OBJS)\baseclient_baseclient.o: ./baseclient.cpp\r
        $(CXX) -c -o $@ $(BASECLIENT_CXXFLAGS) $(CPPDEPS) $<\r
 \r