Rebake after webview-related changes in common.bkl.

Forgot to rebake all files (and not just library ones) after changes of
r69589.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index d6c611eed2be62ee7a1c567e20f22c90afcb157c..fd83cb7bd0902e77198d0ff430232d389b5b08c0 100644 (file)
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -374,7 +374,7 @@ dnl ### begin block 20_COND_MONOLITHIC_0_USE_STC_1[wx.bkl] ###
         COND_MONOLITHIC_0_USE_STC_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_USE_STC_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_USE_WEBVIEW_1[../../tests/test.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_0_USE_WEBVIEW_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_MONOLITHIC_0_USE_WEBVIEW_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_WEBVIEW" = "x1" ; then
         COND_MONOLITHIC_0_USE_WEBVIEW_1=""

diff --git a/samples/treelist/makefile.bcc b/samples/treelist/makefile.bcc
index f39b8f27427811a9159d8d3e05e8cd93908e9c91..7707b7d6e9eea6a121e88276fbc6abb81394dfb7 100644 (file)
--- a/samples/treelist/makefile.bcc
+++ b/samples/treelist/makefile.bcc
@@ -65,10 +65,10 @@ LIBTYPE_SUFFIX = lib
 LIBTYPE_SUFFIX = dll
 !endif
 !if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE = 
+EXTRALIBS_FOR_BASE =
 !endif
 !if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =  
+EXTRALIBS_FOR_BASE =
 !endif
 !if "$(BUILD)" == "debug"
 __OPTIMIZEFLAG_2 = -Od
@@ -77,13 +77,13 @@ __OPTIMIZEFLAG_2 = -Od
 __OPTIMIZEFLAG_2 = -O2
 !endif
 !if "$(USE_THREADS)" == "0"
-__THREADSFLAG_5 = 
+__THREADSFLAG_5 =
 !endif
 !if "$(USE_THREADS)" == "1"
 __THREADSFLAG_5 = mt
 !endif
 !if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 = 
+__THREADSFLAG_6 =
 !endif
 !if "$(USE_THREADS)" == "1"
 __THREADSFLAG_6 = -tWM
@@ -92,13 +92,13 @@ __THREADSFLAG_6 = -tWM
 __RUNTIME_LIBS_7 = -tWR
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 = 
+__RUNTIME_LIBS_7 =
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 __RUNTIME_LIBS_8 = i
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 = 
+__RUNTIME_LIBS_8 =
 !endif
 !if "$(WXUNIV)" == "1"
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -222,7 +222,7 @@ $(OBJS):
 
 all: $(OBJS)\treelist.exe
 
-clean: 
+clean:
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
@@ -243,4 +243,3 @@ $(OBJS)\treelist_sample.res: .\..\..\samples\sample.rc
 
 $(OBJS)\treelist_treelist.obj: .\treelist.cpp
        $(CXX) -q -c -P -o$@ $(TREELIST_CXXFLAGS) .\treelist.cpp
-

diff --git a/samples/treelist/makefile.gcc b/samples/treelist/makefile.gcc
index f4936fd802b67f366d9ba821a38ae6a25e88be84..c930d9827dd003fcdfa3fa70d4012452ca92daf5 100644 (file)
--- a/samples/treelist/makefile.gcc
+++ b/samples/treelist/makefile.gcc
@@ -62,10 +62,10 @@ ifeq ($(SHARED),1)
 LIBTYPE_SUFFIX = dll
 endif
 ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE = 
+EXTRALIBS_FOR_BASE =
 endif
 ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =  
+EXTRALIBS_FOR_BASE =
 endif
 ifeq ($(BUILD),debug)
 __OPTIMIZEFLAG_2 = -O0
@@ -77,13 +77,13 @@ ifeq ($(USE_RTTI),0)
 __RTTIFLAG_5 = -fno-rtti
 endif
 ifeq ($(USE_RTTI),1)
-__RTTIFLAG_5 = 
+__RTTIFLAG_5 =
 endif
 ifeq ($(USE_EXCEPTIONS),0)
 __EXCEPTIONSFLAG_6 = -fno-exceptions
 endif
 ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_6 = 
+__EXCEPTIONSFLAG_6 =
 endif
 ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -192,17 +192,17 @@ endif
 endif
 ifeq ($(BUILD),release)
 ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = 
+__DEBUGINFO =
 endif
 endif
 ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO = 
+__DEBUGINFO =
 endif
 ifeq ($(DEBUG_INFO),1)
 __DEBUGINFO = -g
 endif
 ifeq ($(USE_THREADS),0)
-__THREADSFLAG = 
+__THREADSFLAG =
 endif
 ifeq ($(USE_THREADS),1)
 __THREADSFLAG = -mthreads
@@ -217,7 +217,7 @@ $(OBJS):
 
 all: $(OBJS)\treelist.exe
 
-clean: 
+clean:
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\*.d del $(OBJS)\*.d
        -if exist $(OBJS)\treelist.exe del $(OBJS)\treelist.exe

diff --git a/samples/treelist/makefile.vc b/samples/treelist/makefile.vc
index b99d461de278ada4f06f98cabf77e65fbfb43cb8..33866c3e531e1ac393be636312e521c6cbe7a794 100644 (file)
--- a/samples/treelist/makefile.vc
+++ b/samples/treelist/makefile.vc
@@ -88,19 +88,19 @@ LINK_TARGET_CPU = /MACHINE:X64
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
 !if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE = 
+EXTRALIBS_FOR_BASE =
 !endif
 !if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =  
+EXTRALIBS_FOR_BASE =
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO_0 = /Zi
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = 
+__DEBUGINFO_0 =
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 = 
+__DEBUGINFO_0 =
 !endif
 !if "$(DEBUG_INFO)" == "1"
 __DEBUGINFO_0 = /Zi
@@ -109,10 +109,10 @@ __DEBUGINFO_0 = /Zi
 __DEBUGINFO_1 = /DEBUG
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = 
+__DEBUGINFO_1 =
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 = 
+__DEBUGINFO_1 =
 !endif
 !if "$(DEBUG_INFO)" == "1"
 __DEBUGINFO_1 = /DEBUG
@@ -121,10 +121,10 @@ __DEBUGINFO_1 = /DEBUG
 __DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = 
+__DEBUGINFO_2 =
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_2 = 
+__DEBUGINFO_2 =
 !endif
 !if "$(DEBUG_INFO)" == "1"
 __DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
@@ -133,10 +133,10 @@ __DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
 ____DEBUGRUNTIME_3_p = /D_DEBUG
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p = 
+____DEBUGRUNTIME_3_p =
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p = 
+____DEBUGRUNTIME_3_p =
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 ____DEBUGRUNTIME_3_p = /D_DEBUG
@@ -145,10 +145,10 @@ ____DEBUGRUNTIME_3_p = /D_DEBUG
 ____DEBUGRUNTIME_3_p_1 = /d _DEBUG
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 = 
+____DEBUGRUNTIME_3_p_1 =
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p_1 = 
+____DEBUGRUNTIME_3_p_1 =
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 ____DEBUGRUNTIME_3_p_1 = /d _DEBUG
@@ -157,16 +157,16 @@ ____DEBUGRUNTIME_3_p_1 = /d _DEBUG
 __DEBUGRUNTIME_4 = d
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_4 = 
+__DEBUGRUNTIME_4 =
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_4 = 
+__DEBUGRUNTIME_4 =
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 __DEBUGRUNTIME_4 = d
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_5 = 
+__DEBUGRUNTIME_5 =
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
 __DEBUGRUNTIME_5 = /opt:ref /opt:icf
@@ -175,7 +175,7 @@ __DEBUGRUNTIME_5 = /opt:ref /opt:icf
 __DEBUGRUNTIME_5 = /opt:ref /opt:icf
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_5 = 
+__DEBUGRUNTIME_5 =
 !endif
 !if "$(BUILD)" == "debug"
 __OPTIMIZEFLAG_6 = /Od
@@ -196,13 +196,13 @@ __RUNTIME_LIBS_10 = D
 __RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
 !endif
 !if "$(USE_RTTI)" == "0"
-__RTTIFLAG_11 = 
+__RTTIFLAG_11 =
 !endif
 !if "$(USE_RTTI)" == "1"
 __RTTIFLAG_11 = /GR
 !endif
 !if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_12 = 
+__EXCEPTIONSFLAG_12 =
 !endif
 !if "$(USE_EXCEPTIONS)" == "1"
 __EXCEPTIONSFLAG_12 = /EHsc
@@ -335,7 +335,7 @@ $(OBJS):
 
 all: $(OBJS)\treelist.exe
 
-clean: 
+clean:
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
@@ -353,4 +353,3 @@ $(OBJS)\treelist_sample.res: .\..\..\samples\sample.rc
 
 $(OBJS)\treelist_treelist.obj: .\treelist.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TREELIST_CXXFLAGS) .\treelist.cpp
-

diff --git a/samples/treelist/makefile.wat b/samples/treelist/makefile.wat
index 5ba51d4a80f4b346cc5cc71d9e8c894cbbd5ee85..3efad3b09eb90032c78b2a7f0e9b14750378c2b2 100644 (file)
--- a/samples/treelist/makefile.wat
+++ b/samples/treelist/makefile.wat
@@ -63,10 +63,10 @@ LIBTYPE_SUFFIX = dll
 !endif
 EXTRALIBS_FOR_BASE =
 !ifeq MONOLITHIC 0
-EXTRALIBS_FOR_BASE = 
+EXTRALIBS_FOR_BASE =
 !endif
 !ifeq MONOLITHIC 1
-EXTRALIBS_FOR_BASE =  
+EXTRALIBS_FOR_BASE =
 !endif
 __DEBUGINFO_0 =
 !ifeq BUILD debug
@@ -93,11 +93,11 @@ __DEBUGINFO_1 = debug all
 !endif
 !ifeq BUILD release
 !ifeq DEBUG_INFO default
-__DEBUGINFO_1 = 
+__DEBUGINFO_1 =
 !endif
 !endif
 !ifeq DEBUG_INFO 0
-__DEBUGINFO_1 = 
+__DEBUGINFO_1 =
 !endif
 !ifeq DEBUG_INFO 1
 __DEBUGINFO_1 = debug all
@@ -111,7 +111,7 @@ __OPTIMIZEFLAG_2 = -ot -ox
 !endif
 __THREADSFLAG_5 =
 !ifeq USE_THREADS 0
-__THREADSFLAG_5 = 
+__THREADSFLAG_5 =
 !endif
 !ifeq USE_THREADS 1
 __THREADSFLAG_5 = -bm
@@ -121,18 +121,18 @@ __RUNTIME_LIBS_6 =
 __RUNTIME_LIBS_6 = -br
 !endif
 !ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS_6 = 
+__RUNTIME_LIBS_6 =
 !endif
 __RTTIFLAG_7 =
 !ifeq USE_RTTI 0
-__RTTIFLAG_7 = 
+__RTTIFLAG_7 =
 !endif
 !ifeq USE_RTTI 1
 __RTTIFLAG_7 = -xr
 !endif
 __EXCEPTIONSFLAG_8 =
 !ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG_8 = 
+__EXCEPTIONSFLAG_8 =
 !endif
 !ifeq USE_EXCEPTIONS 1
 __EXCEPTIONSFLAG_8 = -xs
@@ -245,7 +245,7 @@ $(OBJS) :
 
 all : .SYMBOLIC $(OBJS)\treelist.exe
 
-clean : .SYMBOLIC 
+clean : .SYMBOLIC
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
@@ -270,4 +270,3 @@ $(OBJS)\treelist_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
 
 $(OBJS)\treelist_treelist.obj :  .AUTODEPEND .\treelist.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(TREELIST_CXXFLAGS) $<
-

diff --git a/samples/webview/Makefile.in b/samples/webview/Makefile.in
index da27af189281a096eb50029dd9da28a3d43c4100..537b957a6cb5759125ef4de2ec790d2cabc2d339 100644 (file)
--- a/samples/webview/Makefile.in
+++ b/samples/webview/Makefile.in
@@ -102,9 +102,9 @@ COND_PLATFORM_OS2_1___webview___os2_emxbindcmd = $(NM) webview$(EXEEXT) | if \
 @COND_TOOLKIT_OSX_IPHONE@      = $(__webview_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____webview_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__webview_app_Contents_PkgInfo___depname)
-COND_MONOLITHIC_0___WXLIB_WEBVIEW_p = \
+COND_MONOLITHIC_0_USE_WEBVIEW_1___WXLIB_WEBVIEW_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_WEBVIEW_p = $(COND_MONOLITHIC_0___WXLIB_WEBVIEW_p)
+@COND_MONOLITHIC_0_USE_WEBVIEW_1@__WXLIB_WEBVIEW_p = $(COND_MONOLITHIC_0_USE_WEBVIEW_1___WXLIB_WEBVIEW_p)
 COND_MONOLITHIC_0___WXLIB_STC_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_STC_p = $(COND_MONOLITHIC_0___WXLIB_STC_p)

diff --git a/samples/webview/makefile.bcc b/samples/webview/makefile.bcc
index 1f59e68eb1e5bcfb8b19db9e3cc16cdbb90845b7..5d45dfeb0321aa26911d0db61bb5cea0e0fc5b26 100644 (file)
--- a/samples/webview/makefile.bcc
+++ b/samples/webview/makefile.bcc
@@ -166,7 +166,7 @@ __DLLFLAG_p = -DWXUSINGDLL
 !if "$(SHARED)" == "1"\r
 __DLLFLAG_p_1 = -dWXUSINGDLL\r
 !endif\r
-!if "$(MONOLITHIC)" == "0"\r
+!if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1"
 __WXLIB_WEBVIEW_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib\r
 !endif\r

diff --git a/samples/webview/makefile.gcc b/samples/webview/makefile.gcc
index 25220f5d29d7f3988cc86d78dde3251b56ecbae9..3071fa5efcdcda25b4edf6b6ba01accd519ec213 100644 (file)
--- a/samples/webview/makefile.gcc
+++ b/samples/webview/makefile.gcc
@@ -152,9 +152,11 @@ ifeq ($(SHARED),1)
 __DLLFLAG_p_1 = --define WXUSINGDLL\r
 endif\r
 ifeq ($(MONOLITHIC),0)\r
+ifeq ($(USE_WEBVIEW),1)
 __WXLIB_WEBVIEW_p = \\r
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview\r
 endif\r
+endif
 ifeq ($(MONOLITHIC),0)\r
 __WXLIB_STC_p = \\r
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc\r

diff --git a/samples/webview/makefile.vc b/samples/webview/makefile.vc
index 8370670cdaf6241fd6c86973b6f439a916205c6a..5cf13328ec3450faa39f390046be2aa73afd703f 100644 (file)
--- a/samples/webview/makefile.vc
+++ b/samples/webview/makefile.vc
@@ -88,19 +88,19 @@ LINK_TARGET_CPU = /MACHINE:X64
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
 !if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE = 
+EXTRALIBS_FOR_BASE =
 !endif
 !if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =  
+EXTRALIBS_FOR_BASE =
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO_0 = /Zi
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = 
+__DEBUGINFO_0 =
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 = 
+__DEBUGINFO_0 =
 !endif
 !if "$(DEBUG_INFO)" == "1"
 __DEBUGINFO_0 = /Zi
@@ -109,10 +109,10 @@ __DEBUGINFO_0 = /Zi
 __DEBUGINFO_1 = /DEBUG
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = 
+__DEBUGINFO_1 =
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 = 
+__DEBUGINFO_1 =
 !endif
 !if "$(DEBUG_INFO)" == "1"
 __DEBUGINFO_1 = /DEBUG
@@ -121,10 +121,10 @@ __DEBUGINFO_1 = /DEBUG
 __DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = 
+__DEBUGINFO_2 =
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_2 = 
+__DEBUGINFO_2 =
 !endif
 !if "$(DEBUG_INFO)" == "1"
 __DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
@@ -133,10 +133,10 @@ __DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
 ____DEBUGRUNTIME_3_p = /D_DEBUG
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p = 
+____DEBUGRUNTIME_3_p =
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p = 
+____DEBUGRUNTIME_3_p =
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 ____DEBUGRUNTIME_3_p = /D_DEBUG
@@ -145,10 +145,10 @@ ____DEBUGRUNTIME_3_p = /D_DEBUG
 ____DEBUGRUNTIME_3_p_1 = /d _DEBUG
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 = 
+____DEBUGRUNTIME_3_p_1 =
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p_1 = 
+____DEBUGRUNTIME_3_p_1 =
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 ____DEBUGRUNTIME_3_p_1 = /d _DEBUG
@@ -157,16 +157,16 @@ ____DEBUGRUNTIME_3_p_1 = /d _DEBUG
 __DEBUGRUNTIME_4 = d
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_4 = 
+__DEBUGRUNTIME_4 =
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_4 = 
+__DEBUGRUNTIME_4 =
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 __DEBUGRUNTIME_4 = d
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_5 = 
+__DEBUGRUNTIME_5 =
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
 __DEBUGRUNTIME_5 = /opt:ref /opt:icf
@@ -175,7 +175,7 @@ __DEBUGRUNTIME_5 = /opt:ref /opt:icf
 __DEBUGRUNTIME_5 = /opt:ref /opt:icf
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_5 = 
+__DEBUGRUNTIME_5 =
 !endif
 !if "$(BUILD)" == "debug"
 __OPTIMIZEFLAG_6 = /Od
@@ -196,13 +196,13 @@ __RUNTIME_LIBS_10 = D
 __RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
 !endif
 !if "$(USE_RTTI)" == "0"
-__RTTIFLAG_11 = 
+__RTTIFLAG_11 =
 !endif
 !if "$(USE_RTTI)" == "1"
 __RTTIFLAG_11 = /GR
 !endif
 !if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_12 = 
+__EXCEPTIONSFLAG_12 =
 !endif
 !if "$(USE_EXCEPTIONS)" == "1"
 __EXCEPTIONSFLAG_12 = /EHsc
@@ -291,7 +291,7 @@ __DLLFLAG_p = /DWXUSINGDLL
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_1 = /d WXUSINGDLL
 !endif
-!if "$(MONOLITHIC)" == "0"
+!if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1"
 __WXLIB_WEBVIEW_p = \
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib
 !endif
@@ -343,7 +343,7 @@ $(OBJS):
 
 all: $(OBJS)\webview.exe
 
-clean: 
+clean:
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
@@ -361,4 +361,3 @@ $(OBJS)\webview_webview.obj: .\webview.cpp
 
 $(OBJS)\webview_sample.res: .\..\sample.rc
        rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /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) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc
-

diff --git a/samples/webview/makefile.wat b/samples/webview/makefile.wat
index b97da590d82cb2443e385ce49711e9ed7715bb4c..444fbc2346e798beed4ccb87e1038a7e3c31e4f2 100644 (file)
--- a/samples/webview/makefile.wat
+++ b/samples/webview/makefile.wat
@@ -139,9 +139,11 @@ __EXCEPTIONSFLAG_8 = -xs
 !endif\r
 __WXLIB_WEBVIEW_p =\r
 !ifeq MONOLITHIC 0\r
+!ifeq USE_WEBVIEW 1
 __WXLIB_WEBVIEW_p = &\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib\r
 !endif\r
+!endif
 __WXLIB_STC_p =\r
 !ifeq MONOLITHIC 0\r
 __WXLIB_STC_p = &\r