Convert back to UNIX line endings (again)

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

diff --git a/samples/ipc/makefile.wat b/samples/ipc/makefile.wat
index 5414f315d4a0fb6420ddcb6d7bbf8d050f77ee07..27b42bf25d2f399002807af5a478253ab31b7dc4 100644 (file)
--- a/samples/ipc/makefile.wat
+++ b/samples/ipc/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)

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


@@ -43,10 +43,6 @@ WXDEBUGFLAG = d
 !ifeq DEBUG_FLAG 1
 WXDEBUGFLAG = d
 !endif
 !ifeq DEBUG_FLAG 1
 WXDEBUGFLAG = d
 !endif

-WXDLLFLAG =
-!ifeq SHARED 1
-WXDLLFLAG = dll
-!endif

 WXUNICODEFLAG =
 !ifeq UNICODE 1
 WXUNICODEFLAG = u
 WXUNICODEFLAG =
 !ifeq UNICODE 1
 WXUNICODEFLAG = u


@@ -55,64 +51,43 @@ WXUNIVNAME =
 !ifeq WXUNIV 1
 WXUNIVNAME = univ
 !endif
 !ifeq WXUNIV 1
 WXUNIVNAME = univ
 !endif

+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif

 __DEBUGINFO =
 !ifeq BUILD debug
 !ifeq DEBUG_INFO default
 __DEBUGINFO =
 !ifeq BUILD debug
 !ifeq DEBUG_INFO default

-__DEBUGINFO = debug all
+__DEBUGINFO = -d2

 !endif
 !endif
 !ifeq BUILD release
 !ifeq DEBUG_INFO default
 !endif
 !endif
 !ifeq BUILD release
 !ifeq DEBUG_INFO default

-__DEBUGINFO = 
+__DEBUGINFO = -d0

 !endif
 !endif
 !ifeq DEBUG_INFO 0
 !endif
 !endif
 !ifeq DEBUG_INFO 0

-__DEBUGINFO = 
+__DEBUGINFO = -d0

 !endif
 !ifeq DEBUG_INFO 1
 !endif
 !ifeq DEBUG_INFO 1

-__DEBUGINFO = debug all
+__DEBUGINFO = -d2

 !endif
 !endif

-__DEBUGINFO_2 =
+__DEBUGINFO_1 =

 !ifeq BUILD debug
 !ifeq DEBUG_INFO default
 !ifeq BUILD debug
 !ifeq DEBUG_INFO default

-__DEBUGINFO_2 = -d2
+__DEBUGINFO_1 = debug all

 !endif
 !endif
 !ifeq BUILD release
 !ifeq DEBUG_INFO default
 !endif
 !endif
 !ifeq BUILD release
 !ifeq DEBUG_INFO default

-__DEBUGINFO_2 = -d0
+__DEBUGINFO_1 = 

 !endif
 !endif
 !ifeq DEBUG_INFO 0
 !endif
 !endif
 !ifeq DEBUG_INFO 0

-__DEBUGINFO_2 = -d0
+__DEBUGINFO_1 = 

 !endif
 !ifeq DEBUG_INFO 1
 !endif
 !ifeq DEBUG_INFO 1

-__DEBUGINFO_2 = -d2
-!endif
-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-__DLLFLAG_p =
-!ifeq SHARED 1
-__DLLFLAG_p = -dWXUSINGDLL
-!endif
-__LIB_JPEG_p =
-!ifeq USE_GUI 1
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-__LIB_PNG_p =
-!ifeq USE_GUI 1
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-__LIB_TIFF_p =
-!ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+__DEBUGINFO_1 = debug all

 !endif
 __OPTIMIZEFLAG =
 !ifeq BUILD debug
 !endif
 __OPTIMIZEFLAG =
 !ifeq BUILD debug


@@ -128,53 +103,91 @@ __RUNTIME_LIBS = -br
 !ifeq RUNTIME_LIBS static
 __RUNTIME_LIBS = 
 !endif
 !ifeq RUNTIME_LIBS static
 __RUNTIME_LIBS = 
 !endif

-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1
+__EXCEPTIONSFLAG =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG = 

 !endif
 !endif

-__WXLIB_BASE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG = -xs
+!endif
+LIBDIRNAME =
+!ifeq SHARED 0
+LIBDIRNAME = .\..\..\lib\wat_lib$(CFG)
+!endif
+!ifeq SHARED 1
+LIBDIRNAME = .\..\..\lib\wat_dll$(CFG)

 !endif
 __WXLIB_CORE_p =
 !ifeq MONOLITHIC 0
 __WXLIB_CORE_p = &
 !endif
 __WXLIB_CORE_p =
 !ifeq MONOLITHIC 0
 __WXLIB_CORE_p = &

-       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_NET_p =
+!ifeq MONOLITHIC 0
+__WXLIB_NET_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib

 !endif
 __WXLIB_MONO_p =
 !ifeq MONOLITHIC 1
 __WXLIB_MONO_p = &
 !endif
 __WXLIB_MONO_p =
 !ifeq MONOLITHIC 1
 __WXLIB_MONO_p = &

-       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib

 !endif
 !endif

-__WXLIB_NET_p =
-!ifeq MONOLITHIC 0
-__WXLIB_NET_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib

 !endif
 __WXUNIV_DEFINE_p =
 !ifeq WXUNIV 1
 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 !endif
 !endif
 __WXUNIV_DEFINE_p =
 !ifeq WXUNIV 1
 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 !endif

+__DEBUG_DEFINE_p =
+!ifeq BUILD debug
+!ifeq DEBUG_FLAG default
+__DEBUG_DEFINE_p = -d__WXDEBUG__
+!endif
+!endif
+!ifeq DEBUG_FLAG 1
+__DEBUG_DEFINE_p = -d__WXDEBUG__
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif

 
 ### Variables: ###
 
 
 ### Variables: ###
 

-CLIENT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_2) $(__OPTIMIZEFLAG) -bm &
-       $(__RUNTIME_LIBS) -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) -i=..\..\samples $(CXXFLAGS)
-CLIENT_OBJECTS =  &
-       $(OBJS)\client_client.obj
-LIBDIRNAME = &
-       .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+WX_RELEASE_NODOT = 25

 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

-SERVER_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_2) $(__OPTIMIZEFLAG) -bm &
-       $(__RUNTIME_LIBS) -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) -i=..\..\samples $(CXXFLAGS)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+CLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
+       -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
+       -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples &
+       -dNOPCH $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+CLIENT_OBJECTS =  &
+       $(OBJS)\client_client.obj
+SERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
+       -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
+       -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples &
+       -dNOPCH $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)

 SERVER_OBJECTS =  &
        $(OBJS)\server_server.obj
 
 SERVER_OBJECTS =  &
        $(OBJS)\server_server.obj
 


@@ -187,18 +200,6 @@ $(OBJS) :
 
 all : .SYMBOLIC $(OBJS)\client.exe $(OBJS)\server.exe
 
 
 all : .SYMBOLIC $(OBJS)\client.exe $(OBJS)\server.exe
 

-$(OBJS)\client_client.obj :  .AUTODEPEND .\client.cpp
-       $(CXX) -zq -fo=$^@ $(CLIENT_CXXFLAGS) $<
-
-$(OBJS)\client_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
-       wrc -q -ad -bt=nt -r -fo=$^@ -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) -i=..\..\samples $<
-
-$(OBJS)\server_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
-       wrc -q -ad -bt=nt -r -fo=$^@ -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) -i=..\..\samples $<
-
-$(OBJS)\server_server.obj :  .AUTODEPEND .\server.cpp
-       $(CXX) -zq -fo=$^@ $(SERVER_CXXFLAGS) $<
-

 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res


@@ -211,10 +212,10 @@ $(OBJS)\client.exe :  $(CLIENT_OBJECTS) $(OBJS)\client_sample.res
        @%create $(OBJS)\client.lbc
        @%append $(OBJS)\client.lbc option quiet
        @%append $(OBJS)\client.lbc name $^@
        @%create $(OBJS)\client.lbc
        @%append $(OBJS)\client.lbc option quiet
        @%append $(OBJS)\client.lbc name $^@

-       @%append $(OBJS)\client.lbc option incremental
-       @%append $(OBJS)\client.lbc $(LDFLAGS) $(__DEBUGINFO)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+       @%append $(OBJS)\client.lbc option caseexact
+       @%append $(OBJS)\client.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'

        @for %i in ($(CLIENT_OBJECTS)) do @%append $(OBJS)\client.lbc file %i
        @for %i in ($(CLIENT_OBJECTS)) do @%append $(OBJS)\client.lbc file %i

-       @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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\client.lbc library %i
+       @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   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 odbc32.lib ) do @%append $(OBJS)\client.lbc library %i

        @%append $(OBJS)\client.lbc option resource=$(OBJS)\client_sample.res
        wlink @$(OBJS)\client.lbc
 
        @%append $(OBJS)\client.lbc option resource=$(OBJS)\client_sample.res
        wlink @$(OBJS)\client.lbc
 


@@ -222,9 +223,21 @@ $(OBJS)\server.exe :  $(SERVER_OBJECTS) $(OBJS)\server_sample.res
        @%create $(OBJS)\server.lbc
        @%append $(OBJS)\server.lbc option quiet
        @%append $(OBJS)\server.lbc name $^@
        @%create $(OBJS)\server.lbc
        @%append $(OBJS)\server.lbc option quiet
        @%append $(OBJS)\server.lbc name $^@

-       @%append $(OBJS)\server.lbc option incremental
-       @%append $(OBJS)\server.lbc $(LDFLAGS) $(__DEBUGINFO)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+       @%append $(OBJS)\server.lbc option caseexact
+       @%append $(OBJS)\server.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'

        @for %i in ($(SERVER_OBJECTS)) do @%append $(OBJS)\server.lbc file %i
        @for %i in ($(SERVER_OBJECTS)) do @%append $(OBJS)\server.lbc file %i

-       @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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\server.lbc library %i
+       @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   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 odbc32.lib ) do @%append $(OBJS)\server.lbc library %i

        @%append $(OBJS)\server.lbc option resource=$(OBJS)\server_sample.res
        wlink @$(OBJS)\server.lbc
        @%append $(OBJS)\server.lbc option resource=$(OBJS)\server_sample.res
        wlink @$(OBJS)\server.lbc

+
+$(OBJS)\client_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<
+
+$(OBJS)\client_client.obj :  .AUTODEPEND .\client.cpp
+       $(CXX) -zq -fo=$^@ $(CLIENT_CXXFLAGS) $<
+
+$(OBJS)\server_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<
+
+$(OBJS)\server_server.obj :  .AUTODEPEND .\server.cpp
+       $(CXX) -zq -fo=$^@ $(SERVER_CXXFLAGS) $<