Fix return value of wxGenericTreeCtrl::FindItem().

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

diff --git a/samples/webview/makefile.bcc b/samples/webview/makefile.bcc
index a1e35413e853dd2ea6c5c4c90ec400b6c269acc7..19c634cb10ee1a770c3ab6c57636ee9d4d419294 100644 (file)
--- a/samples/webview/makefile.bcc
+++ b/samples/webview/makefile.bcc
@@ -24,19 +24,20 @@ BCCDIR = $(MAKEDIR)\..
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = bcc\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 = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
+WEBVIEW_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
        $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
        $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \\r
        $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \\r
        $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \\r
        -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
-WEB_OBJECTS =  \\r
-       $(OBJS)\web_web.obj\r
+WEBVIEW_OBJECTS =  \\r
+       $(OBJS)\webview_webview.obj\r
 \r
 ### Conditionally set variables: ###\r
 \r
@@ -46,6 +47,9 @@ PORTNAME = base
 !if "$(USE_GUI)" == "1"\r
 PORTNAME = msw\r
 !endif\r
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
 !if "$(BUILD)" == "debug"\r
 WXDEBUGFLAG = d\r
 !endif\r
@@ -68,7 +72,7 @@ LIBTYPE_SUFFIX = dll
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
+EXTRALIBS_FOR_BASE =   \r
 !endif\r
 !if "$(BUILD)" == "debug"\r
 __OPTIMIZEFLAG_2 = -Od\r
@@ -166,9 +170,9 @@ __DLLFLAG_p = -DWXUSINGDLL
 !if "$(SHARED)" == "1"\r
 __DLLFLAG_p_1 = -dWXUSINGDLL\r
 !endif\r
-!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_WEB_p = \\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_web.lib\r
+!if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1"\r
+__WXLIB_WEBVIEW_p = \\r
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib\r
 !endif\r
 !if "$(MONOLITHIC)" == "0"\r
 __WXLIB_STC_p = \\r
@@ -228,27 +232,27 @@ $(OBJS):
 \r
 ### Targets: ###\r
 \r
-all: $(OBJS)\web.exe\r
+all: $(OBJS)\webview.exe\r
 \r
 clean: \r
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
        -if exist $(OBJS)\*.res del $(OBJS)\*.res\r
        -if exist $(OBJS)\*.csm del $(OBJS)\*.csm\r
-       -if exist $(OBJS)\web.exe del $(OBJS)\web.exe\r
-       -if exist $(OBJS)\web.tds del $(OBJS)\web.tds\r
-       -if exist $(OBJS)\web.ilc del $(OBJS)\web.ilc\r
-       -if exist $(OBJS)\web.ild del $(OBJS)\web.ild\r
-       -if exist $(OBJS)\web.ilf del $(OBJS)\web.ilf\r
-       -if exist $(OBJS)\web.ils del $(OBJS)\web.ils\r
-\r
-$(OBJS)\web.exe: $(WEB_OBJECTS)  $(OBJS)\web_sample.res\r
+       -if exist $(OBJS)\webview.exe del $(OBJS)\webview.exe\r
+       -if exist $(OBJS)\webview.tds del $(OBJS)\webview.tds\r
+       -if exist $(OBJS)\webview.ilc del $(OBJS)\webview.ilc\r
+       -if exist $(OBJS)\webview.ild del $(OBJS)\webview.ild\r
+       -if exist $(OBJS)\webview.ilf del $(OBJS)\webview.ilf\r
+       -if exist $(OBJS)\webview.ils del $(OBJS)\webview.ils\r
+\r
+$(OBJS)\webview.exe: $(WEBVIEW_OBJECTS)  $(OBJS)\webview_sample.res\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r
-       c0w32.obj $(WEB_OBJECTS),$@,, $(__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) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\web_sample.res\r
+       c0w32.obj $(WEBVIEW_OBJECTS),$@,, $(__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) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\webview_sample.res\r
 |\r
 \r
-$(OBJS)\web_web.obj: .\web.cpp\r
-       $(CXX) -q -c -P -o$@ $(WEB_CXXFLAGS) .\web.cpp\r
+$(OBJS)\webview_webview.obj: .\webview.cpp\r
+       $(CXX) -q -c -P -o$@ $(WEBVIEW_CXXFLAGS) .\webview.cpp\r
 \r
-$(OBJS)\web_sample.res: .\..\sample.rc\r
+$(OBJS)\webview_sample.res: .\..\sample.rc\r
        brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\sample.rc\r
 \r