Fix return value of wxGenericTreeCtrl::FindItem().

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

diff --git a/samples/ipc/makefile.wat b/samples/ipc/makefile.wat
index a3b6a6fe2f8979e13c7d78340540a7de127738df..04812034c5d59e0c625744c7a305b80323be9971 100644 (file)
--- a/samples/ipc/makefile.wat
+++ b/samples/ipc/makefile.wat
@@ -38,6 +38,10 @@ PORTNAME = base
 !ifeq USE_GUI 1\r
 PORTNAME = msw\r
 !endif\r
 !ifeq USE_GUI 1\r
 PORTNAME = msw\r
 !endif\r

+COMPILER_VERSION =
+!ifeq OFFICIAL_BUILD 1
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif

 WXDEBUGFLAG =\r
 !ifeq BUILD debug\r
 WXDEBUGFLAG = d\r
 WXDEBUGFLAG =\r
 !ifeq BUILD debug\r
 WXDEBUGFLAG = d\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,6 +80,14 @@ __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
 __WXLIB_CORE_p =\r
 !ifeq MONOLITHIC 0\r
 __WXLIB_CORE_p = &\r


@@ -89,10 +101,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


@@ -216,6 +224,10 @@ __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

+__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
 __CAIRO_LIB_p =\r
 !ifeq USE_CAIRO 1\r
 __CAIRO_LIB_p = cairo.lib\r


@@ -230,8 +242,9 @@ ____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)
+LIBDIRNAME = &
+       .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)

 SETUPHDIR = &\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 IPCCLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
 SETUPHDIR = &\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 IPCCLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r


@@ -326,7 +339,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)  $(__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


@@ -338,7 +351,7 @@ $(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)  $(__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
        @%append $(OBJS)\baseipcserver.lbc\r
        @for %i in () do @%append $(OBJS)\baseipcserver.lbc option stack=%i\r
        wlink @$(OBJS)\baseipcserver.lbc\r