Fix return value of wxGenericTreeCtrl::FindItem().

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

diff --git a/samples/widgets/makefile.wat b/samples/widgets/makefile.wat
index 8aa77c86206b9746ddc12da05f6eebc9ba0fdbb2..d81982d6e4675eac8067794c6ef039356a11a365 100644 (file)
--- a/samples/widgets/makefile.wat
+++ b/samples/widgets/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
@@ -222,8 +226,9 @@ __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
 WIDGETS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
@@ -260,7 +265,7 @@ WIDGETS_OBJECTS =  &
        $(OBJS)\widgets_static.obj &\r
        $(OBJS)\widgets_statbmp.obj &\r
        $(OBJS)\widgets_textctrl.obj &\r
-       $(OBJS)\widgets_timepick.obj &
+       $(OBJS)\widgets_timepick.obj &\r
        $(OBJS)\widgets_toggle.obj &\r
        $(OBJS)\widgets_widgets.obj\r
 \r
@@ -371,9 +376,9 @@ $(OBJS)\widgets_statbmp.obj :  .AUTODEPEND .\statbmp.cpp
 $(OBJS)\widgets_textctrl.obj :  .AUTODEPEND .\textctrl.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
 \r
-$(OBJS)\widgets_timepick.obj :  .AUTODEPEND .\timepick.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
-
+$(OBJS)\widgets_timepick.obj :  .AUTODEPEND .\timepick.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
+\r
 $(OBJS)\widgets_toggle.obj :  .AUTODEPEND .\toggle.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<\r
 \r