Make a couple virtuals protected so they can be overridden.

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

diff --git a/samples/webview/makefile.gcc b/samples/webview/makefile.gcc
index 25220f5d29d7f3988cc86d78dde3251b56ecbae9..dac23be85956199d6f53bda5c0012913601e2d5e 100644 (file)
--- a/samples/webview/makefile.gcc
+++ b/samples/webview/makefile.gcc
@@ -65,7 +65,7 @@ ifeq ($(MONOLITHIC),0)
 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
 ifeq ($(BUILD),debug)\r
 __OPTIMIZEFLAG_2 = -O0\r
 endif\r
 ifeq ($(BUILD),debug)\r
 __OPTIMIZEFLAG_2 = -O0\r


@@ -152,9 +152,11 @@ ifeq ($(SHARED),1)
 __DLLFLAG_p_1 = --define WXUSINGDLL\r
 endif\r
 ifeq ($(MONOLITHIC),0)\r
 __DLLFLAG_p_1 = --define WXUSINGDLL\r
 endif\r
 ifeq ($(MONOLITHIC),0)\r

+ifeq ($(USE_WEBVIEW),1)\r

 __WXLIB_WEBVIEW_p = \\r
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview\r
 endif\r
 __WXLIB_WEBVIEW_p = \\r
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview\r
 endif\r

+endif\r

 ifeq ($(MONOLITHIC),0)\r
 __WXLIB_STC_p = \\r
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc\r
 ifeq ($(MONOLITHIC),0)\r
 __WXLIB_STC_p = \\r
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc\r