Make a couple virtuals protected so they can be overridden.

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

diff --git a/samples/sockets/makefile.wat b/samples/sockets/makefile.wat
index c51cfdfca26854cdf28ea1bfe658190b09f889a3..2e8c5ab4e22d24c8487d7a755c845727ccd8c107 100644 (file)
--- a/samples/sockets/makefile.wat
+++ b/samples/sockets/makefile.wat
@@ -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
@@ -66,7 +66,7 @@ EXTRALIBS_FOR_BASE =
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
+EXTRALIBS_FOR_BASE =   \r
 !endif\r
 __client___depname =\r
 !ifeq USE_GUI 1\r
@@ -76,6 +76,14 @@ __server___depname =
 !ifeq USE_GUI 1\r
 __server___depname = $(OBJS)\server.exe\r
 !endif\r
+__LIB_PNG_IF_MONO_p =\r
+!ifeq MONOLITHIC 1\r
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)\r
+!endif\r
+__LIB_PNG_IF_MONO_p_1 =\r
+!ifeq MONOLITHIC 1\r
+__LIB_PNG_IF_MONO_p_1 = $(__LIB_PNG_p)\r
+!endif\r
 __WXLIB_CORE_p =\r
 !ifeq MONOLITHIC 0\r
 __WXLIB_CORE_p = &\r
@@ -89,10 +97,6 @@ __LIB_JPEG_p =
 !ifeq USE_GUI 1\r
 __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
 !endif\r
-__LIB_PNG_p =\r
-!ifeq USE_GUI 1\r
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
-!endif\r
 __DEBUGINFO =\r
 !ifeq BUILD debug\r
 !ifeq DEBUG_INFO default\r
@@ -216,6 +220,10 @@ __WXLIB_MONO_p =
 __WXLIB_MONO_p = &\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
+__LIB_PNG_p =\r
+!ifeq USE_GUI 1\r
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
+!endif\r
 __CAIRO_LIB_p =\r
 !ifeq USE_CAIRO 1\r
 __CAIRO_LIB_p = cairo.lib\r
@@ -292,7 +300,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\baseserver.exe del $(OBJS)\baseserver.exe\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\client.exe :  $(CLIENT_OBJECTS) $(OBJS)\client_client.res\r
+$(OBJS)\client.exe :  $(CLIENT_OBJECTS) $(OBJS)\client_sample.res\r
        @%create $(OBJS)\client.lbc\r
        @%append $(OBJS)\client.lbc option quiet\r
        @%append $(OBJS)\client.lbc name $^@\r
@@ -300,13 +308,13 @@ $(OBJS)\client.exe :  $(CLIENT_OBJECTS) $(OBJS)\client_client.res
        @%append $(OBJS)\client.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(CLIENT_OBJECTS)) do @%append $(OBJS)\client.lbc file %i\r
        @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\client.lbc library %i\r
-       @%append $(OBJS)\client.lbc option resource=$(OBJS)\client_client.res\r
+       @%append $(OBJS)\client.lbc option resource=$(OBJS)\client_sample.res\r
        @for %i in () do @%append $(OBJS)\client.lbc option stack=%i\r
        wlink @$(OBJS)\client.lbc\r
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\server.exe :  $(SERVER_OBJECTS) $(OBJS)\server_server.res\r
+$(OBJS)\server.exe :  $(SERVER_OBJECTS) $(OBJS)\server_sample.res\r
        @%create $(OBJS)\server.lbc\r
        @%append $(OBJS)\server.lbc option quiet\r
        @%append $(OBJS)\server.lbc name $^@\r
@@ -314,7 +322,7 @@ $(OBJS)\server.exe :  $(SERVER_OBJECTS) $(OBJS)\server_server.res
        @%append $(OBJS)\server.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(SERVER_OBJECTS)) do @%append $(OBJS)\server.lbc file %i\r
        @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\server.lbc library %i\r
-       @%append $(OBJS)\server.lbc option resource=$(OBJS)\server_server.res\r
+       @%append $(OBJS)\server.lbc option resource=$(OBJS)\server_sample.res\r
        @for %i in () do @%append $(OBJS)\server.lbc option stack=%i\r
        wlink @$(OBJS)\server.lbc\r
 !endif\r
@@ -326,7 +334,7 @@ $(OBJS)\baseclient.exe :  $(BASECLIENT_OBJECTS)
        @%append $(OBJS)\baseclient.lbc option caseexact\r
        @%append $(OBJS)\baseclient.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt ref 'main_' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(BASECLIENT_OBJECTS)) do @%append $(OBJS)\baseclient.lbc file %i\r
-       @for %i in ( $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\baseclient.lbc library %i\r
+       @for %i in ( $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\baseclient.lbc library %i\r
        @%append $(OBJS)\baseclient.lbc\r
        @for %i in () do @%append $(OBJS)\baseclient.lbc option stack=%i\r
        wlink @$(OBJS)\baseclient.lbc\r
@@ -338,23 +346,23 @@ $(OBJS)\baseserver.exe :  $(BASESERVER_OBJECTS)
        @%append $(OBJS)\baseserver.lbc option caseexact\r
        @%append $(OBJS)\baseserver.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt ref 'main_' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(BASESERVER_OBJECTS)) do @%append $(OBJS)\baseserver.lbc file %i\r
-       @for %i in ( $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\baseserver.lbc library %i\r
+       @for %i in ( $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\baseserver.lbc library %i\r
        @%append $(OBJS)\baseserver.lbc\r
        @for %i in () do @%append $(OBJS)\baseserver.lbc option stack=%i\r
        wlink @$(OBJS)\baseserver.lbc\r
 \r
+$(OBJS)\client_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
+\r
 $(OBJS)\client_client.obj :  .AUTODEPEND .\client.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CLIENT_CXXFLAGS) $<\r
 \r
-$(OBJS)\client_client.res :  .AUTODEPEND .\client.rc\r
+$(OBJS)\server_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
        wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
 \r
 $(OBJS)\server_server.obj :  .AUTODEPEND .\server.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(SERVER_CXXFLAGS) $<\r
 \r
-$(OBJS)\server_server.res :  .AUTODEPEND .\server.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r
 $(OBJS)\baseclient_baseclient.obj :  .AUTODEPEND .\baseclient.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(BASECLIENT_CXXFLAGS) $<\r
 \r