Rebake after the previous commit

This just separates the automatically-generated changes from the manual
ones in the parent commit.

autoconf_inc.m4

@@ -944,7 +944,7 @@ dnl ### begin block 20_COND_USE_SOVERSOLARIS_1[wx.bkl] ###
         COND_USE_SOVERSOLARIS_1=""
     fi
     AC_SUBST(COND_USE_SOVERSOLARIS_1)
-dnl ### begin block 20_COND_USE_STC_1[wx.bkl] ###
+dnl ### begin block 20_COND_USE_STC_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/archive/archive.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/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/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/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/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.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/secretstore/secretstore.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/taskbarbutton/taskbarbutton.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/webrequest/webrequest.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/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_USE_STC_1="#"
     if test "x$USE_STC" = "x1" ; then
         COND_USE_STC_1=""

demos/bombs/Makefile.in

@@ -114,11 +114,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

demos/bombs/makefile.gcc

@@ -148,9 +148,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

demos/bombs/makefile.vc

@@ -377,7 +377,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

demos/forty/Makefile.in

@@ -126,11 +126,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

demos/forty/makefile.gcc

@@ -161,9 +161,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

demos/forty/makefile.vc

@@ -390,7 +390,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

demos/fractal/Makefile.in

@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

demos/fractal/makefile.gcc

@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

demos/fractal/makefile.vc

@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

demos/life/Makefile.in

@@ -115,11 +115,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

demos/life/makefile.gcc

@@ -149,9 +149,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

demos/life/makefile.vc

@@ -378,7 +378,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

demos/poem/Makefile.in

@@ -116,11 +116,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

demos/poem/makefile.gcc

@@ -150,9 +150,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

demos/poem/makefile.vc

@@ -379,7 +379,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/access/Makefile.in

@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/access/makefile.gcc

@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/access/makefile.vc

@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/animate/Makefile.in

@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/animate/makefile.gcc

@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/animate/makefile.vc

@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/artprov/Makefile.in

@@ -113,11 +113,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/artprov/makefile.gcc

@@ -147,9 +147,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/artprov/makefile.vc

@@ -376,7 +376,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/aui/Makefile.in

@@ -122,11 +122,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/aui/makefile.gcc

@@ -158,9 +158,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/aui/makefile.vc

@@ -387,7 +387,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/calendar/Makefile.in

@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/calendar/makefile.gcc

@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/calendar/makefile.vc

@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/caret/Makefile.in

@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/caret/makefile.gcc

@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/caret/makefile.vc

@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/clipboard/Makefile.in

@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/clipboard/makefile.gcc

@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/clipboard/makefile.vc

@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/collpane/Makefile.in

@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/collpane/makefile.gcc

@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/collpane/makefile.vc

@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/combo/Makefile.in

@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/combo/makefile.gcc

@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/combo/makefile.vc

@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/config/Makefile.in

@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/config/makefile.gcc

@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/config/makefile.vc

@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/dataview/Makefile.in

@@ -113,11 +113,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/dataview/makefile.gcc

@@ -147,9 +147,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/dataview/makefile.vc

@@ -376,7 +376,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/debugrpt/Makefile.in

@@ -118,11 +118,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/debugrpt/makefile.gcc

@@ -154,9 +154,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/debugrpt/makefile.vc

@@ -383,7 +383,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/dialogs/Makefile.in

@@ -121,11 +121,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/dialogs/makefile.gcc

@@ -156,9 +156,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/dialogs/makefile.vc

@@ -383,7 +383,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/dialup/Makefile.in

@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/dialup/makefile.gcc

@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/dialup/makefile.vc

@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/display/Makefile.in

@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/display/makefile.gcc

@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/display/makefile.vc

@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/dll/Makefile.in

@@ -88,6 +88,9 @@ SDK_EXE_OBJECTS =  \
 @COND_PLATFORM_OS2_1@	$(LIBPREFIX)my_dll.$(DLLIMP_SUFFIX)
 @COND_WINDOWS_IMPLIB_1@__my_dll___importlib = \
 @COND_WINDOWS_IMPLIB_1@	-Wl,--out-implib=$(LIBPREFIX)my_dll.$(DLLIMP_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 @COND_PLATFORM_WIN32_1_SHARED_0@__wx_exe___depname = wx_exe$(EXEEXT)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_3 = --define __WXUNIVERSAL__
 @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_3 = --define wxDEBUG_LEVEL=0
@@ -119,6 +122,9 @@ COND_PLATFORM_OS2_1___wx_exe___os2_emxbindcmd = $(NM) wx_exe$(EXEEXT) | if grep
 @COND_TOOLKIT_OSX_IPHONE@	= $(__wx_exe_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____wx_exe_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@	$(__wx_exe_app_Contents_PkgInfo___depname)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p_1 \
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p)
 @COND_PLATFORM_WIN32_1@__sdk_exe___depname = sdk_exe$(EXEEXT)
 COND_PLATFORM_OS2_1___sdk_exe___os2_emxbindcmd = $(NM) sdk_exe$(EXEEXT) | if \
 	grep -q pmwin.763 ; then emxbind -ep sdk_exe$(EXEEXT) ; fi
@@ -138,12 +144,10 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@@ -186,7 +190,7 @@ distclean: clean
 @COND_PLATFORM_WIN32_1@	$(SHARED_LD_CXX) $@ $(MY_DLL_OBJECTS)  $(__my_dll___importlib)   -L$(LIBDIRNAME) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
 
 @COND_PLATFORM_WIN32_1_SHARED_0@wx_exe$(EXEEXT): $(WX_EXE_OBJECTS) $(__wx_exe___win32rc) $(__my_dll___depname)
-@COND_PLATFORM_WIN32_1_SHARED_0@	$(CXX) -o $@ $(WX_EXE_OBJECTS) -L.    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lmy_dll $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+@COND_PLATFORM_WIN32_1_SHARED_0@	$(CXX) -o $@ $(WX_EXE_OBJECTS) -L.    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lmy_dll $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p_1) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
 @COND_PLATFORM_WIN32_1_SHARED_0@	$(__wx_exe___os2_emxbindcmd)
 
 @COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@wx_exe.app/Contents/PkgInfo: $(__wx_exe___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns

samples/dll/makefile.gcc

@@ -74,6 +74,11 @@ endif
 ifeq ($(MONOLITHIC),1)
 EXTRALIBS_FOR_BASE =   
 endif
+ifeq ($(MONOLITHIC),1)
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+endif
+endif
 ifeq ($(SHARED),0)
 __wx_exe___depname = $(OBJS)\wx_exe.exe
 endif
@@ -101,6 +106,11 @@ endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p_3 = --define WXUSINGDLL
 endif
+ifeq ($(MONOLITHIC),1)
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p)
+endif
+endif
 ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 endif
@@ -141,10 +151,8 @@ ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)
 endif
 endif
-ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
-endif
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
 endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
@@ -229,7 +237,7 @@ ifeq ($(SHARED),0)
 $(OBJS)\wx_exe.exe: $(WX_EXE_OBJECTS) $(OBJS)\wx_exe_sample_rc.o $(OBJS)\my_dll.dll
 	$(foreach f,$(subst \,/,$(WX_EXE_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
 	@move /y $@.rsp.tmp $@.rsp >nul
-	$(CXX) -o $@ @$@.rsp  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(OBJS)\libmy_dll.a $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
+	$(CXX) -o $@ @$@.rsp  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(OBJS)\libmy_dll.a $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
 	@-del $@.rsp
 endif
 

samples/dll/makefile.vc

@@ -199,6 +199,9 @@ __RUNTIME_LIBS_11 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_11 = $(__THREADSFLAG)
 !endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
 !if "$(SHARED)" == "0"
 __wx_exe___depname = $(OBJS)\wx_exe.exe
 !endif
@@ -274,6 +277,9 @@ ____CAIRO_INCLUDEDIR_FILENAMES_3_p = /i $(CAIRO_ROOT)\include\cairo
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_3 = /d WXUSINGDLL
 !endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p)
+!endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO_33 = $(__DEBUGRUNTIME_1)
 !endif
@@ -334,8 +340,8 @@ __WXLIB_MONO_p = \
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
-!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
@@ -484,7 +490,7 @@ $(OBJS)\my_dll.dll: $(MY_DLL_OBJECTS)
 !if "$(SHARED)" == "0"
 $(OBJS)\wx_exe.exe: $(WX_EXE_OBJECTS) $(OBJS)\wx_exe_sample.res $(OBJS)\my_dll.dll
 	link /NOLOGO /OUT:$@  $(__DEBUGINFO) /pdb:"$(OBJS)\wx_exe.pdb" $(__DEBUGINFO_17)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
-	$(WX_EXE_OBJECTS) $(WX_EXE_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(OBJS)\my_dll.lib $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregexu$(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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
+	$(WX_EXE_OBJECTS) $(WX_EXE_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(OBJS)\my_dll.lib $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregexu$(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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
 <<
 !endif
 

samples/dnd/Makefile.in

@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/dnd/makefile.gcc

@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/dnd/makefile.vc

@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/docview/Makefile.in

@@ -117,11 +117,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/docview/makefile.gcc

@@ -152,9 +152,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/docview/makefile.vc

@@ -381,7 +381,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/dragimag/Makefile.in

@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/dragimag/makefile.gcc

@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/dragimag/makefile.vc

@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/drawing/Makefile.in

@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/drawing/makefile.gcc

@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/drawing/makefile.vc

@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/erase/Makefile.in

@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/erase/makefile.gcc

@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/erase/makefile.vc

@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/event/Makefile.in

@@ -114,11 +114,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/event/makefile.gcc

@@ -148,9 +148,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/event/makefile.vc

@@ -377,7 +377,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/except/Makefile.in

@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/except/makefile.gcc

@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/except/makefile.vc

@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/exec/Makefile.in

@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/exec/makefile.gcc

@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/exec/makefile.vc

@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/font/Makefile.in

@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/font/makefile.gcc

@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/font/makefile.vc

@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/fswatcher/Makefile.in

@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/fswatcher/makefile.gcc

@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/fswatcher/makefile.vc

@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/grid/Makefile.in

@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/grid/makefile.gcc

@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/grid/makefile.vc

@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

samples/help/Makefile.in

@@ -116,11 +116,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

samples/help/makefile.gcc

@@ -150,9 +150,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif

samples/help/makefile.vc

@@ -379,7 +379,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib