Fix return value of wxGenericTreeCtrl::FindItem().

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

diff --git a/samples/webview/makefile.wat b/samples/webview/makefile.wat
index 9eb31ba089d43188d2f946a8ea4a96ecfbbdbcc7..3890469f4980be79ad6efebecd48e7ad471f1a11 100644 (file)
--- a/samples/webview/makefile.wat
+++ b/samples/webview/makefile.wat
@@ -38,6 +38,10 @@ PORTNAME = base
 !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
@@ -66,7 +70,7 @@ EXTRALIBS_FOR_BASE =
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !ifeq MONOLITHIC 1\r
-EXTRALIBS_FOR_BASE =  \r
+EXTRALIBS_FOR_BASE =   \r
 !endif\r
 __DEBUGINFO_0 =\r
 !ifeq BUILD debug\r
@@ -137,10 +141,12 @@ __EXCEPTIONSFLAG_8 =
 !ifeq USE_EXCEPTIONS 1\r
 __EXCEPTIONSFLAG_8 = -xs\r
 !endif\r
-__WXLIB_WEB_p =\r
+__WXLIB_WEBVIEW_p =\r
 !ifeq MONOLITHIC 0\r
-__WXLIB_WEB_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_web.lib\r
+!ifeq USE_WEBVIEW 1\r
+__WXLIB_WEBVIEW_p = &\r
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib\r
+!endif\r
 !endif\r
 __WXLIB_STC_p =\r
 !ifeq MONOLITHIC 0\r
@@ -232,19 +238,20 @@ __DLLFLAG_p = -dWXUSINGDLL
 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
-WEB_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
+WEBVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
        $(__RUNTIME_LIBS_6) -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) -i=$(SETUPHDIR) &\r
        -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &\r
        -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &\r
        $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
-WEB_OBJECTS =  &\r
-       $(OBJS)\web_web.obj\r
+WEBVIEW_OBJECTS =  &\r
+       $(OBJS)\webview_webview.obj\r
 \r
 \r
 all : $(OBJS)\r
@@ -253,7 +260,7 @@ $(OBJS) :
 \r
 ### Targets: ###\r
 \r
-all : .SYMBOLIC $(OBJS)\web.exe\r
+all : .SYMBOLIC $(OBJS)\webview.exe\r
 \r
 clean : .SYMBOLIC \r
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
@@ -261,23 +268,23 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc\r
        -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
-       -if exist $(OBJS)\web.exe del $(OBJS)\web.exe\r
+       -if exist $(OBJS)\webview.exe del $(OBJS)\webview.exe\r
 \r
-$(OBJS)\web.exe :  $(WEB_OBJECTS) $(OBJS)\web_sample.res\r
-       @%create $(OBJS)\web.lbc\r
-       @%append $(OBJS)\web.lbc option quiet\r
-       @%append $(OBJS)\web.lbc name $^@\r
-       @%append $(OBJS)\web.lbc option caseexact\r
-       @%append $(OBJS)\web.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
-       @for %i in ($(WEB_OBJECTS)) do @%append $(OBJS)\web.lbc file %i\r
-       @for %i in ( $(__WXLIB_WEB_p)  $(__WXLIB_STC_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  wxscintilla$(WXDEBUGFLAG).lib $(__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)\web.lbc library %i\r
-       @%append $(OBJS)\web.lbc option resource=$(OBJS)\web_sample.res\r
-       @for %i in () do @%append $(OBJS)\web.lbc option stack=%i\r
-       wlink @$(OBJS)\web.lbc\r
+$(OBJS)\webview.exe :  $(WEBVIEW_OBJECTS) $(OBJS)\webview_sample.res\r
+       @%create $(OBJS)\webview.lbc\r
+       @%append $(OBJS)\webview.lbc option quiet\r
+       @%append $(OBJS)\webview.lbc name $^@\r
+       @%append $(OBJS)\webview.lbc option caseexact\r
+       @%append $(OBJS)\webview.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
+       @for %i in ($(WEBVIEW_OBJECTS)) do @%append $(OBJS)\webview.lbc file %i\r
+       @for %i in ( $(__WXLIB_WEBVIEW_p)  $(__WXLIB_STC_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  wxscintilla$(WXDEBUGFLAG).lib $(__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)\webview.lbc library %i\r
+       @%append $(OBJS)\webview.lbc option resource=$(OBJS)\webview_sample.res\r
+       @for %i in () do @%append $(OBJS)\webview.lbc option stack=%i\r
+       wlink @$(OBJS)\webview.lbc\r
 \r
-$(OBJS)\web_web.obj :  .AUTODEPEND .\web.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(WEB_CXXFLAGS) $<\r
+$(OBJS)\webview_webview.obj :  .AUTODEPEND .\webview.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(WEBVIEW_CXXFLAGS) $<\r
 \r
-$(OBJS)\web_sample.res :  .AUTODEPEND .\..\sample.rc\r
+$(OBJS)\webview_sample.res :  .AUTODEPEND .\..\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