Support using GetTextExtent() with empty string to get descent in wxOSX.

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

diff --git a/samples/ipc/makefile.wat b/samples/ipc/makefile.wat
index 28438bbf51c958531b403e6e4818461c366ce7a0..c8630a4f0babd7bbbc3ea810899581558ff97774 100644 (file)
--- a/samples/ipc/makefile.wat
+++ b/samples/ipc/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================\r
 #     This makefile was generated by\r
 # =========================================================================\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
 #     Do not modify, all changes will be overwritten!\r
 # =========================================================================\r
 \r


@@ -36,7 +36,11 @@ PORTNAME =
 PORTNAME = base\r
 !endif\r
 !ifeq USE_GUI 1\r
 PORTNAME = base\r
 !endif\r
 !ifeq USE_GUI 1\r

-PORTNAME = msw\r
+PORTNAME = msw$(TOOLKIT_VERSION)\r
+!endif\r
+COMPILER_VERSION =\r
+!ifeq OFFICIAL_BUILD 1\r
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD\r

 !endif\r
 WXDEBUGFLAG =\r
 !ifeq BUILD debug\r
 !endif\r
 WXDEBUGFLAG =\r
 !ifeq BUILD debug\r


@@ -66,7 +70,7 @@ EXTRALIBS_FOR_BASE =
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !ifeq MONOLITHIC 1\r
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !ifeq MONOLITHIC 1\r

-EXTRALIBS_FOR_BASE =  \r
+EXTRALIBS_FOR_BASE =   \r

 !endif\r
 __ipcclient___depname =\r
 !ifeq USE_GUI 1\r
 !endif\r
 __ipcclient___depname =\r
 !ifeq USE_GUI 1\r


@@ -76,11 +80,25 @@ __ipcserver___depname =
 !ifeq USE_GUI 1\r
 __ipcserver___depname = $(OBJS)\ipcserver.exe\r
 !endif\r
 !ifeq USE_GUI 1\r
 __ipcserver___depname = $(OBJS)\ipcserver.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
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
 !endif\r
 __WXLIB_CORE_p =\r
 !ifeq MONOLITHIC 0\r
 __WXLIB_CORE_p = &\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
 !endif\r

+__LIB_SCINTILLA_IF_MONO_p =\r
+!ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
+!endif\r
+!endif

 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r


@@ -89,10 +107,6 @@ __LIB_JPEG_p =
 !ifeq USE_GUI 1\r
 __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
 !endif\r
 !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
 __DEBUGINFO =\r
 !ifeq BUILD debug\r
 !ifeq DEBUG_INFO default\r


@@ -193,10 +207,6 @@ __UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
 !ifeq UNICODE 1\r
 __UNICODE_DEFINE_p = -d_UNICODE\r
 !endif\r
 !ifeq UNICODE 1\r
 __UNICODE_DEFINE_p = -d_UNICODE\r
 !endif\r

-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r

 ____CAIRO_INCLUDEDIR_FILENAMES =\r
 !ifeq USE_CAIRO 1\r
 ____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo\r
 ____CAIRO_INCLUDEDIR_FILENAMES =\r
 !ifeq USE_CAIRO 1\r
 ____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo\r


@@ -220,9 +230,9 @@ __WXLIB_MONO_p =
 __WXLIB_MONO_p = &\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
 __WXLIB_MONO_p = &\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r

-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\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
 !endif\r
 __CAIRO_LIB_p =\r
 !ifeq USE_CAIRO 1\r


@@ -238,44 +248,45 @@ ____CAIRO_LIBDIR_FILENAMES = libpath $(CAIRO_ROOT)\lib
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = wat\r
 OBJS = &\r
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = wat\r
 OBJS = &\r

-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
+       $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
+LIBDIRNAME = &\r
+       .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)\r

 SETUPHDIR = &\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 IPCCLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
        $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r
 SETUPHDIR = &\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 IPCCLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
        $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r

-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &\r
-       -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx &\r
-       -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples &\r
-       -dNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &\r
+       -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &\r
+       -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $(__RTTIFLAG) &\r
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r

 IPCCLIENT_OBJECTS =  &\r
        $(OBJS)\ipcclient_client.obj\r
 IPCSERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
        $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r
 IPCCLIENT_OBJECTS =  &\r
        $(OBJS)\ipcclient_client.obj\r
 IPCSERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
        $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r

-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &\r
-       -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx &\r
-       -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples &\r
-       -dNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &\r
+       -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &\r
+       -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $(__RTTIFLAG) &\r
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r

 IPCSERVER_OBJECTS =  &\r
        $(OBJS)\ipcserver_server.obj\r
 BASEIPCCLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
        $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r
 IPCSERVER_OBJECTS =  &\r
        $(OBJS)\ipcserver_server.obj\r
 BASEIPCCLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
        $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r

-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &\r
-       -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx &\r
-       -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -dwxUSE_GUI=0 &\r
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &\r
+       -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &\r
+       -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -dwxUSE_GUI=0 $(__RTTIFLAG) &\r
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r

 BASEIPCCLIENT_OBJECTS =  &\r
        $(OBJS)\baseipcclient_baseclient.obj\r
 BASEIPCSERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
        $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r
 BASEIPCCLIENT_OBJECTS =  &\r
        $(OBJS)\baseipcclient_baseclient.obj\r
 BASEIPCSERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
        $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r

-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &\r
-       -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx &\r
-       -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -dwxUSE_GUI=0 &\r
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &\r
+       -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &\r
+       -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -dwxUSE_GUI=0 $(__RTTIFLAG) &\r
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r

 BASEIPCSERVER_OBJECTS =  &\r
        $(OBJS)\baseipcserver_baseserver.obj\r
 \r
 BASEIPCSERVER_OBJECTS =  &\r
        $(OBJS)\baseipcserver_baseserver.obj\r
 \r


@@ -307,7 +318,7 @@ $(OBJS)\ipcclient.exe :  $(IPCCLIENT_OBJECTS) $(OBJS)\ipcclient_sample.res
        @%append $(OBJS)\ipcclient.lbc option caseexact\r
        @%append $(OBJS)\ipcclient.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(IPCCLIENT_OBJECTS)) do @%append $(OBJS)\ipcclient.lbc file %i\r
        @%append $(OBJS)\ipcclient.lbc option caseexact\r
        @%append $(OBJS)\ipcclient.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(IPCCLIENT_OBJECTS)) do @%append $(OBJS)\ipcclient.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)  $(__GDIPLUS_LIB_p) $(__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)\ipcclient.lbc library %i\r
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_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)\ipcclient.lbc library %i\r

        @%append $(OBJS)\ipcclient.lbc option resource=$(OBJS)\ipcclient_sample.res\r
        @for %i in () do @%append $(OBJS)\ipcclient.lbc option stack=%i\r
        wlink @$(OBJS)\ipcclient.lbc\r
        @%append $(OBJS)\ipcclient.lbc option resource=$(OBJS)\ipcclient_sample.res\r
        @for %i in () do @%append $(OBJS)\ipcclient.lbc option stack=%i\r
        wlink @$(OBJS)\ipcclient.lbc\r


@@ -321,7 +332,7 @@ $(OBJS)\ipcserver.exe :  $(IPCSERVER_OBJECTS) $(OBJS)\ipcserver_sample.res
        @%append $(OBJS)\ipcserver.lbc option caseexact\r
        @%append $(OBJS)\ipcserver.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(IPCSERVER_OBJECTS)) do @%append $(OBJS)\ipcserver.lbc file %i\r
        @%append $(OBJS)\ipcserver.lbc option caseexact\r
        @%append $(OBJS)\ipcserver.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(IPCSERVER_OBJECTS)) do @%append $(OBJS)\ipcserver.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)  $(__GDIPLUS_LIB_p) $(__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)\ipcserver.lbc library %i\r
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_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)\ipcserver.lbc library %i\r

        @%append $(OBJS)\ipcserver.lbc option resource=$(OBJS)\ipcserver_sample.res\r
        @for %i in () do @%append $(OBJS)\ipcserver.lbc option stack=%i\r
        wlink @$(OBJS)\ipcserver.lbc\r
        @%append $(OBJS)\ipcserver.lbc option resource=$(OBJS)\ipcserver_sample.res\r
        @for %i in () do @%append $(OBJS)\ipcserver.lbc option stack=%i\r
        wlink @$(OBJS)\ipcserver.lbc\r


@@ -334,7 +345,7 @@ $(OBJS)\baseipcclient.exe :  $(BASEIPCCLIENT_OBJECTS)
        @%append $(OBJS)\baseipcclient.lbc option caseexact\r
        @%append $(OBJS)\baseipcclient.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt ref 'main_' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(BASEIPCCLIENT_OBJECTS)) do @%append $(OBJS)\baseipcclient.lbc file %i\r
        @%append $(OBJS)\baseipcclient.lbc option caseexact\r
        @%append $(OBJS)\baseipcclient.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt ref 'main_' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(BASEIPCCLIENT_OBJECTS)) do @%append $(OBJS)\baseipcclient.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)  $(__GDIPLUS_LIB_p) $(__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)\baseipcclient.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)\baseipcclient.lbc library %i\r

        @%append $(OBJS)\baseipcclient.lbc\r
        @for %i in () do @%append $(OBJS)\baseipcclient.lbc option stack=%i\r
        wlink @$(OBJS)\baseipcclient.lbc\r
        @%append $(OBJS)\baseipcclient.lbc\r
        @for %i in () do @%append $(OBJS)\baseipcclient.lbc option stack=%i\r
        wlink @$(OBJS)\baseipcclient.lbc\r


@@ -346,19 +357,19 @@ $(OBJS)\baseipcserver.exe :  $(BASEIPCSERVER_OBJECTS)
        @%append $(OBJS)\baseipcserver.lbc option caseexact\r
        @%append $(OBJS)\baseipcserver.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt ref 'main_' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(BASEIPCSERVER_OBJECTS)) do @%append $(OBJS)\baseipcserver.lbc file %i\r
        @%append $(OBJS)\baseipcserver.lbc option caseexact\r
        @%append $(OBJS)\baseipcserver.lbc  $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) system nt ref 'main_' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(BASEIPCSERVER_OBJECTS)) do @%append $(OBJS)\baseipcserver.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)  $(__GDIPLUS_LIB_p) $(__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)\baseipcserver.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)\baseipcserver.lbc library %i\r

        @%append $(OBJS)\baseipcserver.lbc\r
        @for %i in () do @%append $(OBJS)\baseipcserver.lbc option stack=%i\r
        wlink @$(OBJS)\baseipcserver.lbc\r
 \r
 $(OBJS)\ipcclient_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
        @%append $(OBJS)\baseipcserver.lbc\r
        @for %i in () do @%append $(OBJS)\baseipcserver.lbc option stack=%i\r
        wlink @$(OBJS)\baseipcserver.lbc\r
 \r
 $(OBJS)\ipcclient_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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\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)\ipcclient_client.obj :  .AUTODEPEND .\client.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(IPCCLIENT_CXXFLAGS) $<\r
 \r
 $(OBJS)\ipcserver_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
 \r
 $(OBJS)\ipcclient_client.obj :  .AUTODEPEND .\client.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(IPCCLIENT_CXXFLAGS) $<\r
 \r
 $(OBJS)\ipcserver_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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\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)\ipcserver_server.obj :  .AUTODEPEND .\server.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(IPCSERVER_CXXFLAGS) $<\r
 \r
 $(OBJS)\ipcserver_server.obj :  .AUTODEPEND .\server.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(IPCSERVER_CXXFLAGS) $<\r