From bd0f3ca69710e9648fc1f1b16ddb9602f5c4800b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 13 Jul 2013 02:33:00 +0000 Subject: [PATCH] Rebake all the samples and others makefiles too. The samples makefiles were not regenerated after the recent Scintilla changes (see r74425), do it now. There are no real changes for most of them (except stc sample), but it ensures that rerunning bakefile doesn't change anything. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- demos/bombs/makefile.bcc | 2 +- demos/bombs/makefile.gcc | 2 ++ demos/bombs/makefile.vc | 2 +- demos/bombs/makefile.wat | 2 ++ demos/forty/makefile.bcc | 2 +- demos/forty/makefile.gcc | 2 ++ demos/forty/makefile.vc | 2 +- demos/forty/makefile.wat | 2 ++ demos/fractal/makefile.bcc | 2 +- demos/fractal/makefile.gcc | 2 ++ demos/fractal/makefile.vc | 2 +- demos/fractal/makefile.wat | 2 ++ demos/life/makefile.bcc | 2 +- demos/life/makefile.gcc | 2 ++ demos/life/makefile.vc | 2 +- demos/life/makefile.wat | 2 ++ demos/poem/makefile.bcc | 2 +- demos/poem/makefile.gcc | 2 ++ demos/poem/makefile.vc | 2 +- demos/poem/makefile.wat | 2 ++ samples/access/makefile.bcc | 2 +- samples/access/makefile.gcc | 2 ++ samples/access/makefile.vc | 2 +- samples/access/makefile.wat | 2 ++ samples/animate/makefile.bcc | 2 +- samples/animate/makefile.gcc | 2 ++ samples/animate/makefile.vc | 2 +- samples/animate/makefile.wat | 2 ++ samples/artprov/makefile.bcc | 2 +- samples/artprov/makefile.gcc | 2 ++ samples/artprov/makefile.vc | 2 +- samples/artprov/makefile.wat | 2 ++ samples/aui/makefile.bcc | 2 +- samples/aui/makefile.gcc | 2 ++ samples/aui/makefile.vc | 2 +- samples/aui/makefile.wat | 2 ++ samples/calendar/makefile.bcc | 2 +- samples/calendar/makefile.gcc | 2 ++ samples/calendar/makefile.vc | 2 +- samples/calendar/makefile.wat | 2 ++ samples/caret/makefile.bcc | 2 +- samples/caret/makefile.gcc | 2 ++ samples/caret/makefile.vc | 2 +- samples/caret/makefile.wat | 2 ++ samples/clipboard/makefile.bcc | 2 +- samples/clipboard/makefile.gcc | 2 ++ samples/clipboard/makefile.vc | 2 +- samples/clipboard/makefile.wat | 2 ++ samples/collpane/makefile.bcc | 2 +- samples/collpane/makefile.gcc | 2 ++ samples/collpane/makefile.vc | 2 +- samples/collpane/makefile.wat | 2 ++ samples/combo/makefile.bcc | 2 +- samples/combo/makefile.gcc | 2 ++ samples/combo/makefile.vc | 2 +- samples/combo/makefile.wat | 2 ++ samples/config/makefile.bcc | 2 +- samples/config/makefile.gcc | 2 ++ samples/config/makefile.vc | 2 +- samples/config/makefile.wat | 2 ++ samples/controls/makefile.bcc | 2 +- samples/controls/makefile.gcc | 2 ++ samples/controls/makefile.vc | 2 +- samples/controls/makefile.wat | 2 ++ samples/dataview/makefile.bcc | 2 +- samples/dataview/makefile.gcc | 2 ++ samples/dataview/makefile.vc | 2 +- samples/dataview/makefile.wat | 2 ++ samples/debugrpt/makefile.bcc | 2 +- samples/debugrpt/makefile.gcc | 2 ++ samples/debugrpt/makefile.vc | 2 +- samples/debugrpt/makefile.wat | 2 ++ samples/dialogs/makefile.bcc | 2 +- samples/dialogs/makefile.gcc | 2 ++ samples/dialogs/makefile.vc | 2 +- samples/dialogs/makefile.wat | 2 ++ samples/dialup/makefile.bcc | 2 +- samples/dialup/makefile.gcc | 2 ++ samples/dialup/makefile.vc | 2 +- samples/dialup/makefile.wat | 2 ++ samples/display/makefile.bcc | 2 +- samples/display/makefile.gcc | 2 ++ samples/display/makefile.vc | 2 +- samples/display/makefile.wat | 2 ++ samples/dll/makefile.bcc | 2 +- samples/dll/makefile.gcc | 2 ++ samples/dll/makefile.vc | 2 +- samples/dll/makefile.wat | 2 ++ samples/dnd/makefile.bcc | 2 +- samples/dnd/makefile.gcc | 2 ++ samples/dnd/makefile.vc | 2 +- samples/dnd/makefile.wat | 2 ++ samples/docview/makefile.bcc | 2 +- samples/docview/makefile.gcc | 2 ++ samples/docview/makefile.vc | 2 +- samples/docview/makefile.wat | 2 ++ samples/dragimag/makefile.bcc | 2 +- samples/dragimag/makefile.gcc | 2 ++ samples/dragimag/makefile.vc | 2 +- samples/dragimag/makefile.wat | 2 ++ samples/drawing/makefile.bcc | 2 +- samples/drawing/makefile.gcc | 2 ++ samples/drawing/makefile.vc | 2 +- samples/drawing/makefile.wat | 2 ++ samples/erase/makefile.bcc | 2 +- samples/erase/makefile.gcc | 2 ++ samples/erase/makefile.vc | 2 +- samples/erase/makefile.wat | 2 ++ samples/event/makefile.bcc | 2 +- samples/event/makefile.gcc | 2 ++ samples/event/makefile.vc | 2 +- samples/event/makefile.wat | 2 ++ samples/except/makefile.bcc | 2 +- samples/except/makefile.gcc | 2 ++ samples/except/makefile.vc | 2 +- samples/except/makefile.wat | 2 ++ samples/exec/makefile.bcc | 2 +- samples/exec/makefile.gcc | 2 ++ samples/exec/makefile.vc | 2 +- samples/exec/makefile.wat | 2 ++ samples/flash/makefile.vc | 2 +- samples/font/makefile.bcc | 2 +- samples/font/makefile.gcc | 2 ++ samples/font/makefile.vc | 2 +- samples/font/makefile.wat | 2 ++ samples/fswatcher/makefile.bcc | 2 +- samples/fswatcher/makefile.gcc | 2 ++ samples/fswatcher/makefile.vc | 2 +- samples/fswatcher/makefile.wat | 2 ++ samples/grid/makefile.bcc | 2 +- samples/grid/makefile.gcc | 2 ++ samples/grid/makefile.vc | 2 +- samples/grid/makefile.wat | 2 ++ samples/help/makefile.bcc | 2 +- samples/help/makefile.gcc | 2 ++ samples/help/makefile.vc | 2 +- samples/help/makefile.wat | 2 ++ samples/htlbox/makefile.bcc | 2 +- samples/htlbox/makefile.gcc | 2 ++ samples/htlbox/makefile.vc | 2 +- samples/htlbox/makefile.wat | 2 ++ samples/html/about/makefile.bcc | 2 +- samples/html/about/makefile.gcc | 2 ++ samples/html/about/makefile.vc | 2 +- samples/html/about/makefile.wat | 2 ++ samples/html/help/makefile.bcc | 2 +- samples/html/help/makefile.gcc | 2 ++ samples/html/help/makefile.vc | 2 +- samples/html/help/makefile.wat | 2 ++ samples/html/helpview/makefile.bcc | 2 +- samples/html/helpview/makefile.gcc | 2 ++ samples/html/helpview/makefile.vc | 2 +- samples/html/helpview/makefile.wat | 2 ++ samples/html/printing/makefile.bcc | 2 +- samples/html/printing/makefile.gcc | 2 ++ samples/html/printing/makefile.vc | 2 +- samples/html/printing/makefile.wat | 2 ++ samples/html/test/makefile.bcc | 2 +- samples/html/test/makefile.gcc | 2 ++ samples/html/test/makefile.vc | 2 +- samples/html/test/makefile.wat | 2 ++ samples/html/virtual/makefile.bcc | 2 +- samples/html/virtual/makefile.gcc | 2 ++ samples/html/virtual/makefile.vc | 2 +- samples/html/virtual/makefile.wat | 2 ++ samples/html/widget/makefile.bcc | 2 +- samples/html/widget/makefile.gcc | 2 ++ samples/html/widget/makefile.vc | 2 +- samples/html/widget/makefile.wat | 2 ++ samples/html/zip/makefile.bcc | 2 +- samples/html/zip/makefile.gcc | 2 ++ samples/html/zip/makefile.vc | 2 +- samples/html/zip/makefile.wat | 2 ++ samples/image/makefile.bcc | 2 +- samples/image/makefile.gcc | 2 ++ samples/image/makefile.vc | 2 +- samples/image/makefile.wat | 2 ++ samples/internat/makefile.bcc | 2 +- samples/internat/makefile.gcc | 2 ++ samples/internat/makefile.vc | 2 +- samples/internat/makefile.wat | 2 ++ samples/ipc/makefile.bcc | 2 +- samples/ipc/makefile.gcc | 2 ++ samples/ipc/makefile.vc | 2 +- samples/ipc/makefile.wat | 2 ++ samples/joytest/makefile.bcc | 2 +- samples/joytest/makefile.gcc | 2 ++ samples/joytest/makefile.vc | 2 +- samples/joytest/makefile.wat | 2 ++ samples/keyboard/makefile.bcc | 2 +- samples/keyboard/makefile.gcc | 2 ++ samples/keyboard/makefile.vc | 2 +- samples/keyboard/makefile.wat | 2 ++ samples/layout/makefile.bcc | 2 +- samples/layout/makefile.gcc | 2 ++ samples/layout/makefile.vc | 2 +- samples/layout/makefile.wat | 2 ++ samples/listctrl/makefile.bcc | 2 +- samples/listctrl/makefile.gcc | 2 ++ samples/listctrl/makefile.vc | 2 +- samples/listctrl/makefile.wat | 2 ++ samples/mdi/makefile.bcc | 2 +- samples/mdi/makefile.gcc | 2 ++ samples/mdi/makefile.vc | 2 +- samples/mdi/makefile.wat | 2 ++ samples/mediaplayer/makefile.bcc | 2 +- samples/mediaplayer/makefile.gcc | 2 ++ samples/mediaplayer/makefile.vc | 2 +- samples/mediaplayer/makefile.wat | 2 ++ samples/memcheck/makefile.bcc | 2 +- samples/memcheck/makefile.gcc | 2 ++ samples/memcheck/makefile.vc | 2 +- samples/memcheck/makefile.wat | 2 ++ samples/menu/makefile.bcc | 2 +- samples/menu/makefile.gcc | 2 ++ samples/menu/makefile.vc | 2 +- samples/menu/makefile.wat | 2 ++ samples/mfc/makefile.vc | 2 +- samples/minimal/makefile.bcc | 2 +- samples/minimal/makefile.gcc | 2 ++ samples/minimal/makefile.vc | 2 +- samples/minimal/makefile.wat | 2 ++ samples/nativdlg/makefile.bcc | 2 +- samples/nativdlg/makefile.gcc | 2 ++ samples/nativdlg/makefile.vc | 2 +- samples/nativdlg/makefile.wat | 2 ++ samples/notebook/makefile.bcc | 2 +- samples/notebook/makefile.gcc | 2 ++ samples/notebook/makefile.vc | 2 +- samples/notebook/makefile.wat | 2 ++ samples/oleauto/makefile.bcc | 2 +- samples/oleauto/makefile.gcc | 2 ++ samples/oleauto/makefile.vc | 2 +- samples/oleauto/makefile.wat | 2 ++ samples/opengl/cube/makefile.bcc | 2 +- samples/opengl/cube/makefile.gcc | 2 ++ samples/opengl/cube/makefile.vc | 2 +- samples/opengl/cube/makefile.wat | 2 ++ samples/opengl/isosurf/makefile.bcc | 2 +- samples/opengl/isosurf/makefile.gcc | 2 ++ samples/opengl/isosurf/makefile.vc | 2 +- samples/opengl/isosurf/makefile.wat | 2 ++ samples/opengl/penguin/makefile.bcc | 2 +- samples/opengl/penguin/makefile.gcc | 2 ++ samples/opengl/penguin/makefile.vc | 2 +- samples/opengl/penguin/makefile.wat | 2 ++ samples/ownerdrw/makefile.bcc | 2 +- samples/ownerdrw/makefile.gcc | 2 ++ samples/ownerdrw/makefile.vc | 2 +- samples/ownerdrw/makefile.wat | 2 ++ samples/popup/makefile.bcc | 2 +- samples/popup/makefile.gcc | 2 ++ samples/popup/makefile.vc | 2 +- samples/popup/makefile.wat | 2 ++ samples/power/makefile.bcc | 2 +- samples/power/makefile.gcc | 2 ++ samples/power/makefile.vc | 2 +- samples/power/makefile.wat | 2 ++ samples/preferences/makefile.bcc | 2 +- samples/preferences/makefile.gcc | 2 ++ samples/preferences/makefile.vc | 2 +- samples/preferences/makefile.wat | 2 ++ samples/printing/makefile.bcc | 2 +- samples/printing/makefile.gcc | 2 ++ samples/printing/makefile.vc | 2 +- samples/printing/makefile.wat | 2 ++ samples/propgrid/makefile.bcc | 2 +- samples/propgrid/makefile.gcc | 2 ++ samples/propgrid/makefile.vc | 2 +- samples/propgrid/makefile.wat | 2 ++ samples/regtest/makefile.bcc | 2 +- samples/regtest/makefile.gcc | 2 ++ samples/regtest/makefile.vc | 2 +- samples/regtest/makefile.wat | 2 ++ samples/render/makefile.bcc | 2 +- samples/render/makefile.gcc | 2 ++ samples/render/makefile.vc | 2 +- samples/render/makefile.wat | 2 ++ samples/ribbon/makefile.bcc | 2 +- samples/ribbon/makefile.gcc | 2 ++ samples/ribbon/makefile.vc | 2 +- samples/ribbon/makefile.wat | 2 ++ samples/richtext/makefile.bcc | 2 +- samples/richtext/makefile.gcc | 2 ++ samples/richtext/makefile.vc | 2 +- samples/richtext/makefile.wat | 2 ++ samples/sashtest/makefile.bcc | 2 +- samples/sashtest/makefile.gcc | 2 ++ samples/sashtest/makefile.vc | 2 +- samples/sashtest/makefile.wat | 2 ++ samples/scroll/makefile.bcc | 2 +- samples/scroll/makefile.gcc | 2 ++ samples/scroll/makefile.vc | 2 +- samples/scroll/makefile.wat | 2 ++ samples/shaped/makefile.bcc | 2 +- samples/shaped/makefile.gcc | 2 ++ samples/shaped/makefile.vc | 2 +- samples/shaped/makefile.wat | 2 ++ samples/sockets/makefile.bcc | 2 +- samples/sockets/makefile.gcc | 2 ++ samples/sockets/makefile.vc | 2 +- samples/sockets/makefile.wat | 2 ++ samples/sound/makefile.bcc | 2 +- samples/sound/makefile.gcc | 2 ++ samples/sound/makefile.vc | 2 +- samples/sound/makefile.wat | 2 ++ samples/splash/makefile.bcc | 2 +- samples/splash/makefile.gcc | 2 ++ samples/splash/makefile.vc | 2 +- samples/splash/makefile.wat | 2 ++ samples/splitter/makefile.bcc | 2 +- samples/splitter/makefile.gcc | 2 ++ samples/splitter/makefile.vc | 2 +- samples/splitter/makefile.wat | 2 ++ samples/statbar/makefile.bcc | 2 +- samples/statbar/makefile.gcc | 2 ++ samples/statbar/makefile.vc | 2 +- samples/statbar/makefile.wat | 2 ++ samples/stc/makefile.bcc | 2 +- samples/stc/makefile.gcc | 2 ++ samples/stc/makefile.vc | 2 +- samples/stc/makefile.wat | 2 ++ samples/svg/makefile.bcc | 2 +- samples/svg/makefile.gcc | 2 ++ samples/svg/makefile.vc | 2 +- samples/svg/makefile.wat | 2 ++ samples/taborder/makefile.bcc | 2 +- samples/taborder/makefile.gcc | 2 ++ samples/taborder/makefile.vc | 2 +- samples/taborder/makefile.wat | 2 ++ samples/taskbar/makefile.bcc | 2 +- samples/taskbar/makefile.gcc | 2 ++ samples/taskbar/makefile.vc | 2 +- samples/taskbar/makefile.wat | 2 ++ samples/text/makefile.bcc | 2 +- samples/text/makefile.gcc | 2 ++ samples/text/makefile.vc | 2 +- samples/text/makefile.wat | 2 ++ samples/thread/makefile.bcc | 2 +- samples/thread/makefile.gcc | 2 ++ samples/thread/makefile.vc | 2 +- samples/thread/makefile.wat | 2 ++ samples/toolbar/makefile.bcc | 2 +- samples/toolbar/makefile.gcc | 2 ++ samples/toolbar/makefile.vc | 2 +- samples/toolbar/makefile.wat | 2 ++ samples/treectrl/makefile.bcc | 2 +- samples/treectrl/makefile.gcc | 2 ++ samples/treectrl/makefile.vc | 2 +- samples/treectrl/makefile.wat | 2 ++ samples/treelist/makefile.bcc | 2 +- samples/treelist/makefile.gcc | 2 ++ samples/treelist/makefile.vc | 2 +- samples/treelist/makefile.wat | 2 ++ samples/typetest/makefile.bcc | 2 +- samples/typetest/makefile.gcc | 2 ++ samples/typetest/makefile.vc | 2 +- samples/typetest/makefile.wat | 2 ++ samples/uiaction/makefile.bcc | 2 +- samples/uiaction/makefile.gcc | 2 ++ samples/uiaction/makefile.vc | 2 +- samples/uiaction/makefile.wat | 2 ++ samples/validate/makefile.bcc | 2 +- samples/validate/makefile.gcc | 2 ++ samples/validate/makefile.vc | 2 +- samples/validate/makefile.wat | 2 ++ samples/vscroll/makefile.bcc | 2 +- samples/vscroll/makefile.gcc | 2 ++ samples/vscroll/makefile.vc | 2 +- samples/vscroll/makefile.wat | 2 ++ samples/webview/makefile.bcc | 2 +- samples/webview/makefile.gcc | 2 ++ samples/webview/makefile.vc | 2 +- samples/webview/makefile.wat | 2 ++ samples/widgets/makefile.bcc | 2 +- samples/widgets/makefile.gcc | 2 ++ samples/widgets/makefile.vc | 2 +- samples/widgets/makefile.wat | 2 ++ samples/wizard/makefile.bcc | 2 +- samples/wizard/makefile.gcc | 2 ++ samples/wizard/makefile.vc | 2 +- samples/wizard/makefile.wat | 2 ++ samples/wrapsizer/makefile.bcc | 2 +- samples/wrapsizer/makefile.gcc | 2 ++ samples/wrapsizer/makefile.vc | 2 +- samples/wrapsizer/makefile.wat | 2 ++ samples/xrc/makefile.bcc | 2 +- samples/xrc/makefile.gcc | 2 ++ samples/xrc/makefile.vc | 2 +- samples/xrc/makefile.wat | 2 ++ samples/xti/makefile.bcc | 2 +- samples/xti/makefile.gcc | 2 ++ samples/xti/makefile.vc | 2 +- samples/xti/makefile.wat | 2 ++ tests/benchmarks/makefile.bcc | 2 +- tests/benchmarks/makefile.gcc | 2 ++ tests/benchmarks/makefile.vc | 2 +- tests/benchmarks/makefile.wat | 2 ++ tests/makefile.bcc | 2 +- tests/makefile.gcc | 2 ++ tests/makefile.vc | 2 +- tests/makefile.wat | 2 ++ utils/emulator/src/makefile.bcc | 2 +- utils/emulator/src/makefile.gcc | 2 ++ utils/emulator/src/makefile.vc | 2 +- utils/emulator/src/makefile.wat | 2 ++ utils/helpview/src/makefile.bcc | 2 +- utils/helpview/src/makefile.gcc | 2 ++ utils/helpview/src/makefile.vc | 2 +- utils/helpview/src/makefile.wat | 2 ++ utils/hhp2cached/makefile.bcc | 2 +- utils/hhp2cached/makefile.gcc | 2 ++ utils/hhp2cached/makefile.vc | 2 +- utils/hhp2cached/makefile.wat | 2 ++ utils/screenshotgen/src/makefile.bcc | 2 +- utils/screenshotgen/src/makefile.gcc | 2 ++ utils/screenshotgen/src/makefile.vc | 2 +- utils/screenshotgen/src/makefile.wat | 2 ++ 418 files changed, 626 insertions(+), 210 deletions(-) diff --git a/demos/bombs/makefile.bcc b/demos/bombs/makefile.bcc index b0148984e6..9210ce35df 100644 --- a/demos/bombs/makefile.bcc +++ b/demos/bombs/makefile.bcc @@ -184,7 +184,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/demos/bombs/makefile.gcc b/demos/bombs/makefile.gcc index e95b38c57e..7f1390b292 100644 --- a/demos/bombs/makefile.gcc +++ b/demos/bombs/makefile.gcc @@ -170,8 +170,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/demos/bombs/makefile.vc b/demos/bombs/makefile.vc index e67518e379..4a55a62c7d 100644 --- a/demos/bombs/makefile.vc +++ b/demos/bombs/makefile.vc @@ -321,7 +321,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/demos/bombs/makefile.wat b/demos/bombs/makefile.wat index c4a72c557c..978d987233 100644 --- a/demos/bombs/makefile.wat +++ b/demos/bombs/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/demos/forty/makefile.bcc b/demos/forty/makefile.bcc index a3ea505647..f55cff53e0 100644 --- a/demos/forty/makefile.bcc +++ b/demos/forty/makefile.bcc @@ -201,7 +201,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/demos/forty/makefile.gcc b/demos/forty/makefile.gcc index 1fb113831c..a153190a56 100644 --- a/demos/forty/makefile.gcc +++ b/demos/forty/makefile.gcc @@ -187,8 +187,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/demos/forty/makefile.vc b/demos/forty/makefile.vc index 7c82583378..2ba9cab116 100644 --- a/demos/forty/makefile.vc +++ b/demos/forty/makefile.vc @@ -338,7 +338,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/demos/forty/makefile.wat b/demos/forty/makefile.wat index 5eb506ad96..c7ce6adb58 100644 --- a/demos/forty/makefile.wat +++ b/demos/forty/makefile.wat @@ -173,8 +173,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/demos/fractal/makefile.bcc b/demos/fractal/makefile.bcc index df044092cc..b36dcaf10b 100644 --- a/demos/fractal/makefile.bcc +++ b/demos/fractal/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/demos/fractal/makefile.gcc b/demos/fractal/makefile.gcc index 45730cdbe8..13394beba5 100644 --- a/demos/fractal/makefile.gcc +++ b/demos/fractal/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/demos/fractal/makefile.vc b/demos/fractal/makefile.vc index 659692cbc4..4c1544948a 100644 --- a/demos/fractal/makefile.vc +++ b/demos/fractal/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/demos/fractal/makefile.wat b/demos/fractal/makefile.wat index b964cc6d5a..600dd113b4 100644 --- a/demos/fractal/makefile.wat +++ b/demos/fractal/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/demos/life/makefile.bcc b/demos/life/makefile.bcc index f572fc481a..14aca96672 100644 --- a/demos/life/makefile.bcc +++ b/demos/life/makefile.bcc @@ -185,7 +185,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/demos/life/makefile.gcc b/demos/life/makefile.gcc index e1cd79da29..34cad90b64 100644 --- a/demos/life/makefile.gcc +++ b/demos/life/makefile.gcc @@ -170,8 +170,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/demos/life/makefile.vc b/demos/life/makefile.vc index 028316e339..5b2729268a 100644 --- a/demos/life/makefile.vc +++ b/demos/life/makefile.vc @@ -322,7 +322,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/demos/life/makefile.wat b/demos/life/makefile.wat index 7d19226891..431ced137c 100644 --- a/demos/life/makefile.wat +++ b/demos/life/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/demos/poem/makefile.bcc b/demos/poem/makefile.bcc index b27fd50303..8fea06b03f 100644 --- a/demos/poem/makefile.bcc +++ b/demos/poem/makefile.bcc @@ -186,7 +186,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/demos/poem/makefile.gcc b/demos/poem/makefile.gcc index 52c4e301c2..ed5c24ee11 100644 --- a/demos/poem/makefile.gcc +++ b/demos/poem/makefile.gcc @@ -172,8 +172,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/demos/poem/makefile.vc b/demos/poem/makefile.vc index 1d48833c89..957d724912 100644 --- a/demos/poem/makefile.vc +++ b/demos/poem/makefile.vc @@ -323,7 +323,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/demos/poem/makefile.wat b/demos/poem/makefile.wat index 61bcdb60c2..c9b2edb80a 100644 --- a/demos/poem/makefile.wat +++ b/demos/poem/makefile.wat @@ -163,8 +163,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/access/makefile.bcc b/samples/access/makefile.bcc index c5da51bacb..d56a3c3cba 100644 --- a/samples/access/makefile.bcc +++ b/samples/access/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/access/makefile.gcc b/samples/access/makefile.gcc index c82579b663..5083b4197d 100644 --- a/samples/access/makefile.gcc +++ b/samples/access/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/access/makefile.vc b/samples/access/makefile.vc index 7864fdf5d4..b6d0d3d7b6 100644 --- a/samples/access/makefile.vc +++ b/samples/access/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/access/makefile.wat b/samples/access/makefile.wat index aaeda68198..0c5012c774 100644 --- a/samples/access/makefile.wat +++ b/samples/access/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/animate/makefile.bcc b/samples/animate/makefile.bcc index cc3872b7eb..17d7f0ed66 100644 --- a/samples/animate/makefile.bcc +++ b/samples/animate/makefile.bcc @@ -186,7 +186,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/animate/makefile.gcc b/samples/animate/makefile.gcc index 57046a07b2..5775268493 100644 --- a/samples/animate/makefile.gcc +++ b/samples/animate/makefile.gcc @@ -172,8 +172,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/animate/makefile.vc b/samples/animate/makefile.vc index 8dc0064d16..65533d74d0 100644 --- a/samples/animate/makefile.vc +++ b/samples/animate/makefile.vc @@ -323,7 +323,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/animate/makefile.wat b/samples/animate/makefile.wat index d7db7165f5..c82f9a9005 100644 --- a/samples/animate/makefile.wat +++ b/samples/animate/makefile.wat @@ -163,8 +163,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/artprov/makefile.bcc b/samples/artprov/makefile.bcc index 8988d40be5..509b5865af 100644 --- a/samples/artprov/makefile.bcc +++ b/samples/artprov/makefile.bcc @@ -183,7 +183,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/artprov/makefile.gcc b/samples/artprov/makefile.gcc index bada2ebcd7..e32567c882 100644 --- a/samples/artprov/makefile.gcc +++ b/samples/artprov/makefile.gcc @@ -169,8 +169,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/artprov/makefile.vc b/samples/artprov/makefile.vc index d8798ab7a8..2a4535eabe 100644 --- a/samples/artprov/makefile.vc +++ b/samples/artprov/makefile.vc @@ -320,7 +320,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/artprov/makefile.wat b/samples/artprov/makefile.wat index 6b51ca9a2f..a38ea4b231 100644 --- a/samples/artprov/makefile.wat +++ b/samples/artprov/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/aui/makefile.bcc b/samples/aui/makefile.bcc index 0597f46317..bb8f5ab901 100644 --- a/samples/aui/makefile.bcc +++ b/samples/aui/makefile.bcc @@ -198,7 +198,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/aui/makefile.gcc b/samples/aui/makefile.gcc index 8fa774ea33..5e9f21165f 100644 --- a/samples/aui/makefile.gcc +++ b/samples/aui/makefile.gcc @@ -184,8 +184,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/aui/makefile.vc b/samples/aui/makefile.vc index b0bfd6f403..64d2678bd2 100644 --- a/samples/aui/makefile.vc +++ b/samples/aui/makefile.vc @@ -335,7 +335,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/aui/makefile.wat b/samples/aui/makefile.wat index ee2d366981..3528fa5b8a 100644 --- a/samples/aui/makefile.wat +++ b/samples/aui/makefile.wat @@ -178,8 +178,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/calendar/makefile.bcc b/samples/calendar/makefile.bcc index 30781980bb..f253ead9a5 100644 --- a/samples/calendar/makefile.bcc +++ b/samples/calendar/makefile.bcc @@ -186,7 +186,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/calendar/makefile.gcc b/samples/calendar/makefile.gcc index 9b85b1acc7..e2c91a2e3b 100644 --- a/samples/calendar/makefile.gcc +++ b/samples/calendar/makefile.gcc @@ -172,8 +172,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/calendar/makefile.vc b/samples/calendar/makefile.vc index 0afc093a87..052031c846 100644 --- a/samples/calendar/makefile.vc +++ b/samples/calendar/makefile.vc @@ -323,7 +323,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/calendar/makefile.wat b/samples/calendar/makefile.wat index 9ad08bfc33..c7c66a27de 100644 --- a/samples/calendar/makefile.wat +++ b/samples/calendar/makefile.wat @@ -163,8 +163,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/caret/makefile.bcc b/samples/caret/makefile.bcc index 72e9e594f1..e917315622 100644 --- a/samples/caret/makefile.bcc +++ b/samples/caret/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/caret/makefile.gcc b/samples/caret/makefile.gcc index 7fb90e9180..1f51605d64 100644 --- a/samples/caret/makefile.gcc +++ b/samples/caret/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/caret/makefile.vc b/samples/caret/makefile.vc index dc4ae1a842..beea744491 100644 --- a/samples/caret/makefile.vc +++ b/samples/caret/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/caret/makefile.wat b/samples/caret/makefile.wat index 6c650f8bc4..6f3e0e003f 100644 --- a/samples/caret/makefile.wat +++ b/samples/caret/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/clipboard/makefile.bcc b/samples/clipboard/makefile.bcc index 230de0ea1b..a47aa2bb06 100644 --- a/samples/clipboard/makefile.bcc +++ b/samples/clipboard/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/clipboard/makefile.gcc b/samples/clipboard/makefile.gcc index a2411139bb..6b01f9d416 100644 --- a/samples/clipboard/makefile.gcc +++ b/samples/clipboard/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/clipboard/makefile.vc b/samples/clipboard/makefile.vc index 7bb1fb96c9..d987c02e7f 100644 --- a/samples/clipboard/makefile.vc +++ b/samples/clipboard/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/clipboard/makefile.wat b/samples/clipboard/makefile.wat index 7c8262baa2..35d2a2e854 100644 --- a/samples/clipboard/makefile.wat +++ b/samples/clipboard/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/collpane/makefile.bcc b/samples/collpane/makefile.bcc index 94b26ce1df..ba7b7fd40f 100644 --- a/samples/collpane/makefile.bcc +++ b/samples/collpane/makefile.bcc @@ -186,7 +186,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/collpane/makefile.gcc b/samples/collpane/makefile.gcc index 46d834eb49..7c248acd01 100644 --- a/samples/collpane/makefile.gcc +++ b/samples/collpane/makefile.gcc @@ -172,8 +172,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/collpane/makefile.vc b/samples/collpane/makefile.vc index 241244835d..aa1c303df0 100644 --- a/samples/collpane/makefile.vc +++ b/samples/collpane/makefile.vc @@ -323,7 +323,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/collpane/makefile.wat b/samples/collpane/makefile.wat index ad3bad4481..60fb5c6f04 100644 --- a/samples/collpane/makefile.wat +++ b/samples/collpane/makefile.wat @@ -163,8 +163,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/combo/makefile.bcc b/samples/combo/makefile.bcc index 0650ca2449..637390bbd1 100644 --- a/samples/combo/makefile.bcc +++ b/samples/combo/makefile.bcc @@ -186,7 +186,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/combo/makefile.gcc b/samples/combo/makefile.gcc index b76cac3f45..2eba840449 100644 --- a/samples/combo/makefile.gcc +++ b/samples/combo/makefile.gcc @@ -172,8 +172,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/combo/makefile.vc b/samples/combo/makefile.vc index 7966acffb9..c3a3eaa9fd 100644 --- a/samples/combo/makefile.vc +++ b/samples/combo/makefile.vc @@ -323,7 +323,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/combo/makefile.wat b/samples/combo/makefile.wat index 7982e2e144..f07c955446 100644 --- a/samples/combo/makefile.wat +++ b/samples/combo/makefile.wat @@ -163,8 +163,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/config/makefile.bcc b/samples/config/makefile.bcc index f34f20930b..841c8ce161 100644 --- a/samples/config/makefile.bcc +++ b/samples/config/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/config/makefile.gcc b/samples/config/makefile.gcc index ca41a9310f..925b664790 100644 --- a/samples/config/makefile.gcc +++ b/samples/config/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/config/makefile.vc b/samples/config/makefile.vc index b6c18638ba..51f53cad7c 100644 --- a/samples/config/makefile.vc +++ b/samples/config/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/config/makefile.wat b/samples/config/makefile.wat index ddb710d9e2..7ffc4187fc 100644 --- a/samples/config/makefile.wat +++ b/samples/config/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/controls/makefile.bcc b/samples/controls/makefile.bcc index e9378c1c44..6f443062e5 100644 --- a/samples/controls/makefile.bcc +++ b/samples/controls/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/controls/makefile.gcc b/samples/controls/makefile.gcc index 1cf8d01131..5c0b300985 100644 --- a/samples/controls/makefile.gcc +++ b/samples/controls/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/controls/makefile.vc b/samples/controls/makefile.vc index 86e3f47ee3..bef0130662 100644 --- a/samples/controls/makefile.vc +++ b/samples/controls/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/controls/makefile.wat b/samples/controls/makefile.wat index a81f57ad94..4900a695d7 100644 --- a/samples/controls/makefile.wat +++ b/samples/controls/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/dataview/makefile.bcc b/samples/dataview/makefile.bcc index 28a1c048a8..f50b910bc5 100644 --- a/samples/dataview/makefile.bcc +++ b/samples/dataview/makefile.bcc @@ -187,7 +187,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/dataview/makefile.gcc b/samples/dataview/makefile.gcc index 0c1823cee4..87b8ca224b 100644 --- a/samples/dataview/makefile.gcc +++ b/samples/dataview/makefile.gcc @@ -173,8 +173,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/dataview/makefile.vc b/samples/dataview/makefile.vc index 700a5beab2..f5b12c8b66 100644 --- a/samples/dataview/makefile.vc +++ b/samples/dataview/makefile.vc @@ -324,7 +324,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/dataview/makefile.wat b/samples/dataview/makefile.wat index d0b31e0546..a5d46a2a15 100644 --- a/samples/dataview/makefile.wat +++ b/samples/dataview/makefile.wat @@ -163,8 +163,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/debugrpt/makefile.bcc b/samples/debugrpt/makefile.bcc index f4c2609ba4..7432e5ea97 100644 --- a/samples/debugrpt/makefile.bcc +++ b/samples/debugrpt/makefile.bcc @@ -190,7 +190,7 @@ __WXLIB_XML_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/debugrpt/makefile.gcc b/samples/debugrpt/makefile.gcc index 8867c46d43..b3bcca4dc6 100644 --- a/samples/debugrpt/makefile.gcc +++ b/samples/debugrpt/makefile.gcc @@ -176,8 +176,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/debugrpt/makefile.vc b/samples/debugrpt/makefile.vc index e2ffb456f9..d2fd15892d 100644 --- a/samples/debugrpt/makefile.vc +++ b/samples/debugrpt/makefile.vc @@ -327,7 +327,7 @@ __WXLIB_XML_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/debugrpt/makefile.wat b/samples/debugrpt/makefile.wat index a56d087ffb..753252dca4 100644 --- a/samples/debugrpt/makefile.wat +++ b/samples/debugrpt/makefile.wat @@ -168,8 +168,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/dialogs/makefile.bcc b/samples/dialogs/makefile.bcc index 74558623ca..bdfa558aad 100644 --- a/samples/dialogs/makefile.bcc +++ b/samples/dialogs/makefile.bcc @@ -194,7 +194,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/dialogs/makefile.gcc b/samples/dialogs/makefile.gcc index 675c0c9008..68c2c890f9 100644 --- a/samples/dialogs/makefile.gcc +++ b/samples/dialogs/makefile.gcc @@ -182,8 +182,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/dialogs/makefile.vc b/samples/dialogs/makefile.vc index 20dc5a65ed..237c620c6b 100644 --- a/samples/dialogs/makefile.vc +++ b/samples/dialogs/makefile.vc @@ -331,7 +331,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/dialogs/makefile.wat b/samples/dialogs/makefile.wat index e2fb08b42f..50e3188d6b 100644 --- a/samples/dialogs/makefile.wat +++ b/samples/dialogs/makefile.wat @@ -173,8 +173,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/dialup/makefile.bcc b/samples/dialup/makefile.bcc index acf81c505b..095ad7dcdb 100644 --- a/samples/dialup/makefile.bcc +++ b/samples/dialup/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/dialup/makefile.gcc b/samples/dialup/makefile.gcc index e761d43f91..7b79b50576 100644 --- a/samples/dialup/makefile.gcc +++ b/samples/dialup/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/dialup/makefile.vc b/samples/dialup/makefile.vc index bc261b9f80..1905d42196 100644 --- a/samples/dialup/makefile.vc +++ b/samples/dialup/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/dialup/makefile.wat b/samples/dialup/makefile.wat index 314eb4aa18..151893bb7e 100644 --- a/samples/dialup/makefile.wat +++ b/samples/dialup/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/display/makefile.bcc b/samples/display/makefile.bcc index 4cc3f9f33d..ca8e2bdaca 100644 --- a/samples/display/makefile.bcc +++ b/samples/display/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/display/makefile.gcc b/samples/display/makefile.gcc index baba2ba7e6..abb75d79b3 100644 --- a/samples/display/makefile.gcc +++ b/samples/display/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/display/makefile.vc b/samples/display/makefile.vc index 8e57b481e2..c94a35b25a 100644 --- a/samples/display/makefile.vc +++ b/samples/display/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/display/makefile.wat b/samples/display/makefile.wat index 028a3ad276..eb39192d2b 100644 --- a/samples/display/makefile.wat +++ b/samples/display/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/dll/makefile.bcc b/samples/dll/makefile.bcc index 56975b3895..0ef3125fe7 100644 --- a/samples/dll/makefile.bcc +++ b/samples/dll/makefile.bcc @@ -168,7 +168,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/dll/makefile.gcc b/samples/dll/makefile.gcc index 76625b0224..9fdb01c7af 100644 --- a/samples/dll/makefile.gcc +++ b/samples/dll/makefile.gcc @@ -166,8 +166,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/dll/makefile.vc b/samples/dll/makefile.vc index 1f8a07fffd..cc10bd7cfd 100644 --- a/samples/dll/makefile.vc +++ b/samples/dll/makefile.vc @@ -288,7 +288,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/dll/makefile.wat b/samples/dll/makefile.wat index 02a7539e7c..4f652df00e 100644 --- a/samples/dll/makefile.wat +++ b/samples/dll/makefile.wat @@ -93,8 +93,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/dnd/makefile.bcc b/samples/dnd/makefile.bcc index 796f6207e9..6353612df0 100644 --- a/samples/dnd/makefile.bcc +++ b/samples/dnd/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/dnd/makefile.gcc b/samples/dnd/makefile.gcc index fe1546a798..7c3223ce02 100644 --- a/samples/dnd/makefile.gcc +++ b/samples/dnd/makefile.gcc @@ -167,8 +167,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/dnd/makefile.vc b/samples/dnd/makefile.vc index 2dc25746a0..35f5b47211 100644 --- a/samples/dnd/makefile.vc +++ b/samples/dnd/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/dnd/makefile.wat b/samples/dnd/makefile.wat index fb5f8926cd..0731479a10 100644 --- a/samples/dnd/makefile.wat +++ b/samples/dnd/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/docview/makefile.bcc b/samples/docview/makefile.bcc index 8b632913d6..ec73d6aba7 100644 --- a/samples/docview/makefile.bcc +++ b/samples/docview/makefile.bcc @@ -184,7 +184,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/docview/makefile.gcc b/samples/docview/makefile.gcc index 5cc0a709f5..09100f0cb9 100644 --- a/samples/docview/makefile.gcc +++ b/samples/docview/makefile.gcc @@ -170,8 +170,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/docview/makefile.vc b/samples/docview/makefile.vc index 274ffd0d02..e5565a0603 100644 --- a/samples/docview/makefile.vc +++ b/samples/docview/makefile.vc @@ -321,7 +321,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/docview/makefile.wat b/samples/docview/makefile.wat index d1b2d6fee4..6d7234e077 100644 --- a/samples/docview/makefile.wat +++ b/samples/docview/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/dragimag/makefile.bcc b/samples/dragimag/makefile.bcc index d79f8d78e1..03a1733f68 100644 --- a/samples/dragimag/makefile.bcc +++ b/samples/dragimag/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/dragimag/makefile.gcc b/samples/dragimag/makefile.gcc index 60d3f9b833..a4b0bc0aec 100644 --- a/samples/dragimag/makefile.gcc +++ b/samples/dragimag/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/dragimag/makefile.vc b/samples/dragimag/makefile.vc index 54d2e18854..824016eb49 100644 --- a/samples/dragimag/makefile.vc +++ b/samples/dragimag/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/dragimag/makefile.wat b/samples/dragimag/makefile.wat index 9498b00b72..7fc5d70ce0 100644 --- a/samples/dragimag/makefile.wat +++ b/samples/dragimag/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/drawing/makefile.bcc b/samples/drawing/makefile.bcc index f3a0858bf5..91319cb2cd 100644 --- a/samples/drawing/makefile.bcc +++ b/samples/drawing/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/drawing/makefile.gcc b/samples/drawing/makefile.gcc index 3b0b4e458e..69a71a40e4 100644 --- a/samples/drawing/makefile.gcc +++ b/samples/drawing/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/drawing/makefile.vc b/samples/drawing/makefile.vc index f585f562bc..d54796d958 100644 --- a/samples/drawing/makefile.vc +++ b/samples/drawing/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/drawing/makefile.wat b/samples/drawing/makefile.wat index 23972e38fd..53d55fd57a 100644 --- a/samples/drawing/makefile.wat +++ b/samples/drawing/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/erase/makefile.bcc b/samples/erase/makefile.bcc index 66981d2021..90fdda8dbd 100644 --- a/samples/erase/makefile.bcc +++ b/samples/erase/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/erase/makefile.gcc b/samples/erase/makefile.gcc index 3c065b7b3f..ad154007d2 100644 --- a/samples/erase/makefile.gcc +++ b/samples/erase/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/erase/makefile.vc b/samples/erase/makefile.vc index 736696807c..6aae223d25 100644 --- a/samples/erase/makefile.vc +++ b/samples/erase/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/erase/makefile.wat b/samples/erase/makefile.wat index 9cf0d668fd..1ba2cd6eec 100644 --- a/samples/erase/makefile.wat +++ b/samples/erase/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/event/makefile.bcc b/samples/event/makefile.bcc index 4d2b411e1b..467e8224ce 100644 --- a/samples/event/makefile.bcc +++ b/samples/event/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/event/makefile.gcc b/samples/event/makefile.gcc index acda2a49bc..4760c53508 100644 --- a/samples/event/makefile.gcc +++ b/samples/event/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/event/makefile.vc b/samples/event/makefile.vc index 6352010d6c..778c0f667c 100644 --- a/samples/event/makefile.vc +++ b/samples/event/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/event/makefile.wat b/samples/event/makefile.wat index 60d67d30d3..504d16dcfd 100644 --- a/samples/event/makefile.wat +++ b/samples/event/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/except/makefile.bcc b/samples/except/makefile.bcc index 0db32f6ccd..2963507cda 100644 --- a/samples/except/makefile.bcc +++ b/samples/except/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/except/makefile.gcc b/samples/except/makefile.gcc index d03429bc64..3d056630e8 100644 --- a/samples/except/makefile.gcc +++ b/samples/except/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/except/makefile.vc b/samples/except/makefile.vc index 6638393973..d9291d9e30 100644 --- a/samples/except/makefile.vc +++ b/samples/except/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/except/makefile.wat b/samples/except/makefile.wat index 58afc8ab19..0ae578ee60 100644 --- a/samples/except/makefile.wat +++ b/samples/except/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/exec/makefile.bcc b/samples/exec/makefile.bcc index 14a49f39b6..175b17b4c1 100644 --- a/samples/exec/makefile.bcc +++ b/samples/exec/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/exec/makefile.gcc b/samples/exec/makefile.gcc index b1d4f82b68..7899483604 100644 --- a/samples/exec/makefile.gcc +++ b/samples/exec/makefile.gcc @@ -167,8 +167,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/exec/makefile.vc b/samples/exec/makefile.vc index e472f7d252..22782fbc40 100644 --- a/samples/exec/makefile.vc +++ b/samples/exec/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/exec/makefile.wat b/samples/exec/makefile.wat index 6bc6bea626..ada1f3bbee 100644 --- a/samples/exec/makefile.wat +++ b/samples/exec/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/flash/makefile.vc b/samples/flash/makefile.vc index ddd75d2c21..57009935dd 100644 --- a/samples/flash/makefile.vc +++ b/samples/flash/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/font/makefile.bcc b/samples/font/makefile.bcc index 91eeafab0a..595969b714 100644 --- a/samples/font/makefile.bcc +++ b/samples/font/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/font/makefile.gcc b/samples/font/makefile.gcc index 1401d16754..83ad6ebdbe 100644 --- a/samples/font/makefile.gcc +++ b/samples/font/makefile.gcc @@ -167,8 +167,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/font/makefile.vc b/samples/font/makefile.vc index e40fc5f92e..375a7b1fb2 100644 --- a/samples/font/makefile.vc +++ b/samples/font/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/font/makefile.wat b/samples/font/makefile.wat index 3dd4caf9b7..9d7f404352 100644 --- a/samples/font/makefile.wat +++ b/samples/font/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/fswatcher/makefile.bcc b/samples/fswatcher/makefile.bcc index a4115721ab..408750c3a3 100644 --- a/samples/fswatcher/makefile.bcc +++ b/samples/fswatcher/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/fswatcher/makefile.gcc b/samples/fswatcher/makefile.gcc index 0141424359..6bc2f1ce03 100644 --- a/samples/fswatcher/makefile.gcc +++ b/samples/fswatcher/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/fswatcher/makefile.vc b/samples/fswatcher/makefile.vc index 990dcce4c8..15ea392cb7 100644 --- a/samples/fswatcher/makefile.vc +++ b/samples/fswatcher/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/fswatcher/makefile.wat b/samples/fswatcher/makefile.wat index f4e256efe6..9822d0b781 100644 --- a/samples/fswatcher/makefile.wat +++ b/samples/fswatcher/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/grid/makefile.bcc b/samples/grid/makefile.bcc index 675489ed89..720b05a0e9 100644 --- a/samples/grid/makefile.bcc +++ b/samples/grid/makefile.bcc @@ -186,7 +186,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/grid/makefile.gcc b/samples/grid/makefile.gcc index d76c72b4fa..180cb6751e 100644 --- a/samples/grid/makefile.gcc +++ b/samples/grid/makefile.gcc @@ -171,8 +171,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/grid/makefile.vc b/samples/grid/makefile.vc index df1276095c..1bd4025def 100644 --- a/samples/grid/makefile.vc +++ b/samples/grid/makefile.vc @@ -323,7 +323,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/grid/makefile.wat b/samples/grid/makefile.wat index 4c5e2fc901..bdc150bdce 100644 --- a/samples/grid/makefile.wat +++ b/samples/grid/makefile.wat @@ -163,8 +163,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/help/makefile.bcc b/samples/help/makefile.bcc index 4c039f859a..5f326fe21b 100644 --- a/samples/help/makefile.bcc +++ b/samples/help/makefile.bcc @@ -190,7 +190,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/help/makefile.gcc b/samples/help/makefile.gcc index 4e61487cfa..bbf08f2014 100644 --- a/samples/help/makefile.gcc +++ b/samples/help/makefile.gcc @@ -175,8 +175,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/help/makefile.vc b/samples/help/makefile.vc index e7b6843d85..eb9ea10ae4 100644 --- a/samples/help/makefile.vc +++ b/samples/help/makefile.vc @@ -327,7 +327,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/help/makefile.wat b/samples/help/makefile.wat index 7398180ce4..7168258af4 100644 --- a/samples/help/makefile.wat +++ b/samples/help/makefile.wat @@ -168,8 +168,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/htlbox/makefile.bcc b/samples/htlbox/makefile.bcc index 891203b5f3..6a539e29d6 100644 --- a/samples/htlbox/makefile.bcc +++ b/samples/htlbox/makefile.bcc @@ -186,7 +186,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/htlbox/makefile.gcc b/samples/htlbox/makefile.gcc index c475e64ba1..2de892cef9 100644 --- a/samples/htlbox/makefile.gcc +++ b/samples/htlbox/makefile.gcc @@ -172,8 +172,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/htlbox/makefile.vc b/samples/htlbox/makefile.vc index e0fcc70428..ec07e25079 100644 --- a/samples/htlbox/makefile.vc +++ b/samples/htlbox/makefile.vc @@ -323,7 +323,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/htlbox/makefile.wat b/samples/htlbox/makefile.wat index 94cc7ddee3..cb3cb6fe5a 100644 --- a/samples/htlbox/makefile.wat +++ b/samples/htlbox/makefile.wat @@ -163,8 +163,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/html/about/makefile.bcc b/samples/html/about/makefile.bcc index 4f286a6351..895b413fde 100644 --- a/samples/html/about/makefile.bcc +++ b/samples/html/about/makefile.bcc @@ -186,7 +186,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/html/about/makefile.gcc b/samples/html/about/makefile.gcc index 0012946856..a441cd2d6f 100644 --- a/samples/html/about/makefile.gcc +++ b/samples/html/about/makefile.gcc @@ -172,8 +172,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/html/about/makefile.vc b/samples/html/about/makefile.vc index 762cd83674..4e2895d9b4 100644 --- a/samples/html/about/makefile.vc +++ b/samples/html/about/makefile.vc @@ -323,7 +323,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/html/about/makefile.wat b/samples/html/about/makefile.wat index 3642e4edac..63d05578de 100644 --- a/samples/html/about/makefile.wat +++ b/samples/html/about/makefile.wat @@ -163,8 +163,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/html/help/makefile.bcc b/samples/html/help/makefile.bcc index 826c6f3d63..2feeb6d39e 100644 --- a/samples/html/help/makefile.bcc +++ b/samples/html/help/makefile.bcc @@ -186,7 +186,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/html/help/makefile.gcc b/samples/html/help/makefile.gcc index 6630940a55..001bffdd4b 100644 --- a/samples/html/help/makefile.gcc +++ b/samples/html/help/makefile.gcc @@ -172,8 +172,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/html/help/makefile.vc b/samples/html/help/makefile.vc index b6c2f6d6ae..ffc1773d62 100644 --- a/samples/html/help/makefile.vc +++ b/samples/html/help/makefile.vc @@ -323,7 +323,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/html/help/makefile.wat b/samples/html/help/makefile.wat index e5091d6a7c..f18a1a2698 100644 --- a/samples/html/help/makefile.wat +++ b/samples/html/help/makefile.wat @@ -163,8 +163,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/html/helpview/makefile.bcc b/samples/html/helpview/makefile.bcc index de62718fda..7c454ee17c 100644 --- a/samples/html/helpview/makefile.bcc +++ b/samples/html/helpview/makefile.bcc @@ -186,7 +186,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/html/helpview/makefile.gcc b/samples/html/helpview/makefile.gcc index 214e05001f..428983e047 100644 --- a/samples/html/helpview/makefile.gcc +++ b/samples/html/helpview/makefile.gcc @@ -172,8 +172,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/html/helpview/makefile.vc b/samples/html/helpview/makefile.vc index 44956039e1..09e1ea4fb1 100644 --- a/samples/html/helpview/makefile.vc +++ b/samples/html/helpview/makefile.vc @@ -323,7 +323,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/html/helpview/makefile.wat b/samples/html/helpview/makefile.wat index fe40ecc0a7..0113878cfb 100644 --- a/samples/html/helpview/makefile.wat +++ b/samples/html/helpview/makefile.wat @@ -163,8 +163,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/html/printing/makefile.bcc b/samples/html/printing/makefile.bcc index 45f0401fe1..e0668f1dc0 100644 --- a/samples/html/printing/makefile.bcc +++ b/samples/html/printing/makefile.bcc @@ -186,7 +186,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/html/printing/makefile.gcc b/samples/html/printing/makefile.gcc index e27c03c410..e08870804f 100644 --- a/samples/html/printing/makefile.gcc +++ b/samples/html/printing/makefile.gcc @@ -172,8 +172,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/html/printing/makefile.vc b/samples/html/printing/makefile.vc index ac563e6fd0..5f24551a3f 100644 --- a/samples/html/printing/makefile.vc +++ b/samples/html/printing/makefile.vc @@ -323,7 +323,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/html/printing/makefile.wat b/samples/html/printing/makefile.wat index 72b575298c..b199548685 100644 --- a/samples/html/printing/makefile.wat +++ b/samples/html/printing/makefile.wat @@ -163,8 +163,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/html/test/makefile.bcc b/samples/html/test/makefile.bcc index 5a1b63ee6a..c15d08654a 100644 --- a/samples/html/test/makefile.bcc +++ b/samples/html/test/makefile.bcc @@ -190,7 +190,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/html/test/makefile.gcc b/samples/html/test/makefile.gcc index 4d14d451d3..0b26149038 100644 --- a/samples/html/test/makefile.gcc +++ b/samples/html/test/makefile.gcc @@ -175,8 +175,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/html/test/makefile.vc b/samples/html/test/makefile.vc index 11fe03897b..72ebce1d70 100644 --- a/samples/html/test/makefile.vc +++ b/samples/html/test/makefile.vc @@ -327,7 +327,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/html/test/makefile.wat b/samples/html/test/makefile.wat index 8cb16382dd..93dd5a1f80 100644 --- a/samples/html/test/makefile.wat +++ b/samples/html/test/makefile.wat @@ -168,8 +168,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/html/virtual/makefile.bcc b/samples/html/virtual/makefile.bcc index 7444670077..feb5332acc 100644 --- a/samples/html/virtual/makefile.bcc +++ b/samples/html/virtual/makefile.bcc @@ -186,7 +186,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/html/virtual/makefile.gcc b/samples/html/virtual/makefile.gcc index ed625916cc..304221c2bc 100644 --- a/samples/html/virtual/makefile.gcc +++ b/samples/html/virtual/makefile.gcc @@ -172,8 +172,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/html/virtual/makefile.vc b/samples/html/virtual/makefile.vc index 1b0ddf467e..e4488e3af8 100644 --- a/samples/html/virtual/makefile.vc +++ b/samples/html/virtual/makefile.vc @@ -323,7 +323,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/html/virtual/makefile.wat b/samples/html/virtual/makefile.wat index ef3a907231..ab6381a6cd 100644 --- a/samples/html/virtual/makefile.wat +++ b/samples/html/virtual/makefile.wat @@ -163,8 +163,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/html/widget/makefile.bcc b/samples/html/widget/makefile.bcc index 0ae658e763..8f8742b07c 100644 --- a/samples/html/widget/makefile.bcc +++ b/samples/html/widget/makefile.bcc @@ -186,7 +186,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/html/widget/makefile.gcc b/samples/html/widget/makefile.gcc index 1d6996f3b8..12b2610cf1 100644 --- a/samples/html/widget/makefile.gcc +++ b/samples/html/widget/makefile.gcc @@ -172,8 +172,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/html/widget/makefile.vc b/samples/html/widget/makefile.vc index 19fb456be9..9683cc4084 100644 --- a/samples/html/widget/makefile.vc +++ b/samples/html/widget/makefile.vc @@ -323,7 +323,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/html/widget/makefile.wat b/samples/html/widget/makefile.wat index 4ae8613958..0ba703e8bb 100644 --- a/samples/html/widget/makefile.wat +++ b/samples/html/widget/makefile.wat @@ -163,8 +163,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/html/zip/makefile.bcc b/samples/html/zip/makefile.bcc index 99889abebd..461cbdac6f 100644 --- a/samples/html/zip/makefile.bcc +++ b/samples/html/zip/makefile.bcc @@ -186,7 +186,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/html/zip/makefile.gcc b/samples/html/zip/makefile.gcc index 3cc6295d81..cb169e6457 100644 --- a/samples/html/zip/makefile.gcc +++ b/samples/html/zip/makefile.gcc @@ -171,8 +171,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/html/zip/makefile.vc b/samples/html/zip/makefile.vc index c493afcea2..763f230d1a 100644 --- a/samples/html/zip/makefile.vc +++ b/samples/html/zip/makefile.vc @@ -323,7 +323,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/html/zip/makefile.wat b/samples/html/zip/makefile.wat index 1f627c9dc0..619ab90d16 100644 --- a/samples/html/zip/makefile.wat +++ b/samples/html/zip/makefile.wat @@ -163,8 +163,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/image/makefile.bcc b/samples/image/makefile.bcc index 02295c3809..1d12a3a4b8 100644 --- a/samples/image/makefile.bcc +++ b/samples/image/makefile.bcc @@ -183,7 +183,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/image/makefile.gcc b/samples/image/makefile.gcc index 4eee6fd325..6a6170d5cc 100644 --- a/samples/image/makefile.gcc +++ b/samples/image/makefile.gcc @@ -169,8 +169,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/image/makefile.vc b/samples/image/makefile.vc index 155b5707d7..a74ecfa632 100644 --- a/samples/image/makefile.vc +++ b/samples/image/makefile.vc @@ -320,7 +320,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/image/makefile.wat b/samples/image/makefile.wat index 191babf799..d6ac3a10b8 100644 --- a/samples/image/makefile.wat +++ b/samples/image/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/internat/makefile.bcc b/samples/internat/makefile.bcc index 8eda5f0ed0..e6d5a6d41f 100644 --- a/samples/internat/makefile.bcc +++ b/samples/internat/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/internat/makefile.gcc b/samples/internat/makefile.gcc index 5bcdb62f39..15aef86e39 100644 --- a/samples/internat/makefile.gcc +++ b/samples/internat/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/internat/makefile.vc b/samples/internat/makefile.vc index edb0741af2..110914d327 100644 --- a/samples/internat/makefile.vc +++ b/samples/internat/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/internat/makefile.wat b/samples/internat/makefile.wat index f534d2c72f..88e73ebf53 100644 --- a/samples/internat/makefile.wat +++ b/samples/internat/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/ipc/makefile.bcc b/samples/ipc/makefile.bcc index 3adf5a712f..9be80c5c74 100644 --- a/samples/ipc/makefile.bcc +++ b/samples/ipc/makefile.bcc @@ -150,7 +150,7 @@ __DLLFLAG_p_0 = -dWXUSINGDLL __WXLIB_CORE_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/ipc/makefile.gcc b/samples/ipc/makefile.gcc index 43113ef8bd..5acd979734 100644 --- a/samples/ipc/makefile.gcc +++ b/samples/ipc/makefile.gcc @@ -152,8 +152,10 @@ __WXLIB_CORE_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/ipc/makefile.vc b/samples/ipc/makefile.vc index 389cd861a8..8bb4def88f 100644 --- a/samples/ipc/makefile.vc +++ b/samples/ipc/makefile.vc @@ -289,7 +289,7 @@ __DLLFLAG_p_0 = /d WXUSINGDLL __WXLIB_CORE_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/ipc/makefile.wat b/samples/ipc/makefile.wat index ca9b0784a1..c8630a4f0b 100644 --- a/samples/ipc/makefile.wat +++ b/samples/ipc/makefile.wat @@ -95,8 +95,10 @@ __WXLIB_CORE_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/joytest/makefile.bcc b/samples/joytest/makefile.bcc index dbe59f3e14..d65cde0aef 100644 --- a/samples/joytest/makefile.bcc +++ b/samples/joytest/makefile.bcc @@ -186,7 +186,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/joytest/makefile.gcc b/samples/joytest/makefile.gcc index 8ba15283e5..7d2914e377 100644 --- a/samples/joytest/makefile.gcc +++ b/samples/joytest/makefile.gcc @@ -172,8 +172,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/joytest/makefile.vc b/samples/joytest/makefile.vc index 479486ee5f..8ba302b6f7 100644 --- a/samples/joytest/makefile.vc +++ b/samples/joytest/makefile.vc @@ -323,7 +323,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/joytest/makefile.wat b/samples/joytest/makefile.wat index fbdc3887b3..9902ff884c 100644 --- a/samples/joytest/makefile.wat +++ b/samples/joytest/makefile.wat @@ -163,8 +163,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/keyboard/makefile.bcc b/samples/keyboard/makefile.bcc index e4e83f9810..cc6c8ad0d6 100644 --- a/samples/keyboard/makefile.bcc +++ b/samples/keyboard/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/keyboard/makefile.gcc b/samples/keyboard/makefile.gcc index 803c056333..46341973d5 100644 --- a/samples/keyboard/makefile.gcc +++ b/samples/keyboard/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/keyboard/makefile.vc b/samples/keyboard/makefile.vc index 1b56f1264e..3e80b100da 100644 --- a/samples/keyboard/makefile.vc +++ b/samples/keyboard/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/keyboard/makefile.wat b/samples/keyboard/makefile.wat index a41c6ae189..153a2ab7a0 100644 --- a/samples/keyboard/makefile.wat +++ b/samples/keyboard/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/layout/makefile.bcc b/samples/layout/makefile.bcc index 4254572c67..5cb9903f08 100644 --- a/samples/layout/makefile.bcc +++ b/samples/layout/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/layout/makefile.gcc b/samples/layout/makefile.gcc index e3bd2b1de7..abbe796a57 100644 --- a/samples/layout/makefile.gcc +++ b/samples/layout/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/layout/makefile.vc b/samples/layout/makefile.vc index 2f0781865c..241d011743 100644 --- a/samples/layout/makefile.vc +++ b/samples/layout/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/layout/makefile.wat b/samples/layout/makefile.wat index cec2b3b5c1..aab95ae9d1 100644 --- a/samples/layout/makefile.wat +++ b/samples/layout/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/listctrl/makefile.bcc b/samples/listctrl/makefile.bcc index 1cba538e37..530fc88042 100644 --- a/samples/listctrl/makefile.bcc +++ b/samples/listctrl/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/listctrl/makefile.gcc b/samples/listctrl/makefile.gcc index aaf085c952..fa149eebc5 100644 --- a/samples/listctrl/makefile.gcc +++ b/samples/listctrl/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/listctrl/makefile.vc b/samples/listctrl/makefile.vc index b616d37092..bcdf1c0286 100644 --- a/samples/listctrl/makefile.vc +++ b/samples/listctrl/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/listctrl/makefile.wat b/samples/listctrl/makefile.wat index 331559b58f..41717d123f 100644 --- a/samples/listctrl/makefile.wat +++ b/samples/listctrl/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/mdi/makefile.bcc b/samples/mdi/makefile.bcc index 2ea9af9a32..30b11c32f6 100644 --- a/samples/mdi/makefile.bcc +++ b/samples/mdi/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/mdi/makefile.gcc b/samples/mdi/makefile.gcc index 648254c946..c6f0d709c3 100644 --- a/samples/mdi/makefile.gcc +++ b/samples/mdi/makefile.gcc @@ -167,8 +167,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/mdi/makefile.vc b/samples/mdi/makefile.vc index f81482036a..76e0af787f 100644 --- a/samples/mdi/makefile.vc +++ b/samples/mdi/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/mdi/makefile.wat b/samples/mdi/makefile.wat index f012d6fec5..f70dd28df9 100644 --- a/samples/mdi/makefile.wat +++ b/samples/mdi/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/mediaplayer/makefile.bcc b/samples/mediaplayer/makefile.bcc index 4c8208917c..0ac0f6dc97 100644 --- a/samples/mediaplayer/makefile.bcc +++ b/samples/mediaplayer/makefile.bcc @@ -186,7 +186,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/mediaplayer/makefile.gcc b/samples/mediaplayer/makefile.gcc index f0abfdb59a..5b735946ce 100644 --- a/samples/mediaplayer/makefile.gcc +++ b/samples/mediaplayer/makefile.gcc @@ -174,8 +174,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/mediaplayer/makefile.vc b/samples/mediaplayer/makefile.vc index eae9bc9a4b..9bfdea777a 100644 --- a/samples/mediaplayer/makefile.vc +++ b/samples/mediaplayer/makefile.vc @@ -323,7 +323,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/mediaplayer/makefile.wat b/samples/mediaplayer/makefile.wat index aae7f84037..898971a1e3 100644 --- a/samples/mediaplayer/makefile.wat +++ b/samples/mediaplayer/makefile.wat @@ -165,8 +165,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/memcheck/makefile.bcc b/samples/memcheck/makefile.bcc index af7d334513..7966d5df3c 100644 --- a/samples/memcheck/makefile.bcc +++ b/samples/memcheck/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/memcheck/makefile.gcc b/samples/memcheck/makefile.gcc index c7976b4d61..fc692b44a7 100644 --- a/samples/memcheck/makefile.gcc +++ b/samples/memcheck/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/memcheck/makefile.vc b/samples/memcheck/makefile.vc index 084cd7ce85..87969f60cc 100644 --- a/samples/memcheck/makefile.vc +++ b/samples/memcheck/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/memcheck/makefile.wat b/samples/memcheck/makefile.wat index 1219c638bd..45ff8ac4e7 100644 --- a/samples/memcheck/makefile.wat +++ b/samples/memcheck/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/menu/makefile.bcc b/samples/menu/makefile.bcc index 5ea1d46753..452caa917d 100644 --- a/samples/menu/makefile.bcc +++ b/samples/menu/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/menu/makefile.gcc b/samples/menu/makefile.gcc index 99f8418240..247fbbc20b 100644 --- a/samples/menu/makefile.gcc +++ b/samples/menu/makefile.gcc @@ -167,8 +167,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/menu/makefile.vc b/samples/menu/makefile.vc index 140c4dde1e..85c677ea3f 100644 --- a/samples/menu/makefile.vc +++ b/samples/menu/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/menu/makefile.wat b/samples/menu/makefile.wat index 3f87c8471b..9e6c89ec5d 100644 --- a/samples/menu/makefile.wat +++ b/samples/menu/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/mfc/makefile.vc b/samples/mfc/makefile.vc index 494606e7a4..302c917457 100644 --- a/samples/mfc/makefile.vc +++ b/samples/mfc/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/minimal/makefile.bcc b/samples/minimal/makefile.bcc index 1c0cd27fd1..297b155be7 100644 --- a/samples/minimal/makefile.bcc +++ b/samples/minimal/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/minimal/makefile.gcc b/samples/minimal/makefile.gcc index cb8f8884cd..1292b1984a 100644 --- a/samples/minimal/makefile.gcc +++ b/samples/minimal/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/minimal/makefile.vc b/samples/minimal/makefile.vc index 21f6c618d1..d5bb537f7d 100644 --- a/samples/minimal/makefile.vc +++ b/samples/minimal/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/minimal/makefile.wat b/samples/minimal/makefile.wat index 72ad96badc..ebf432ff39 100644 --- a/samples/minimal/makefile.wat +++ b/samples/minimal/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/nativdlg/makefile.bcc b/samples/nativdlg/makefile.bcc index dc00743df1..d27a8228ce 100644 --- a/samples/nativdlg/makefile.bcc +++ b/samples/nativdlg/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/nativdlg/makefile.gcc b/samples/nativdlg/makefile.gcc index c54cd17a61..e8916c2e39 100644 --- a/samples/nativdlg/makefile.gcc +++ b/samples/nativdlg/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/nativdlg/makefile.vc b/samples/nativdlg/makefile.vc index d92cc52f92..195e2b1a15 100644 --- a/samples/nativdlg/makefile.vc +++ b/samples/nativdlg/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/nativdlg/makefile.wat b/samples/nativdlg/makefile.wat index c61b6f16e5..2906c32a0d 100644 --- a/samples/nativdlg/makefile.wat +++ b/samples/nativdlg/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/notebook/makefile.bcc b/samples/notebook/makefile.bcc index b85f01b0ee..7ed232d5ad 100644 --- a/samples/notebook/makefile.bcc +++ b/samples/notebook/makefile.bcc @@ -198,7 +198,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/notebook/makefile.gcc b/samples/notebook/makefile.gcc index ba4cea5de9..4689a88e24 100644 --- a/samples/notebook/makefile.gcc +++ b/samples/notebook/makefile.gcc @@ -184,8 +184,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/notebook/makefile.vc b/samples/notebook/makefile.vc index 0c20de2edc..12e5ab7429 100644 --- a/samples/notebook/makefile.vc +++ b/samples/notebook/makefile.vc @@ -335,7 +335,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/notebook/makefile.wat b/samples/notebook/makefile.wat index d6e8119b64..984bf98527 100644 --- a/samples/notebook/makefile.wat +++ b/samples/notebook/makefile.wat @@ -178,8 +178,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/oleauto/makefile.bcc b/samples/oleauto/makefile.bcc index 5723b05d93..f995324499 100644 --- a/samples/oleauto/makefile.bcc +++ b/samples/oleauto/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/oleauto/makefile.gcc b/samples/oleauto/makefile.gcc index 45444f1a7a..3fea4390bf 100644 --- a/samples/oleauto/makefile.gcc +++ b/samples/oleauto/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/oleauto/makefile.vc b/samples/oleauto/makefile.vc index 462d8993ab..32f6e648ef 100644 --- a/samples/oleauto/makefile.vc +++ b/samples/oleauto/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/oleauto/makefile.wat b/samples/oleauto/makefile.wat index 17308e235c..7647fbf8a1 100644 --- a/samples/oleauto/makefile.wat +++ b/samples/oleauto/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/opengl/cube/makefile.bcc b/samples/opengl/cube/makefile.bcc index 969f16435e..bf7da3ce48 100644 --- a/samples/opengl/cube/makefile.bcc +++ b/samples/opengl/cube/makefile.bcc @@ -185,7 +185,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/opengl/cube/makefile.gcc b/samples/opengl/cube/makefile.gcc index 407e6320e9..ddf6e3ceed 100644 --- a/samples/opengl/cube/makefile.gcc +++ b/samples/opengl/cube/makefile.gcc @@ -170,8 +170,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/opengl/cube/makefile.vc b/samples/opengl/cube/makefile.vc index ee2317a5f8..f5f95ad86b 100644 --- a/samples/opengl/cube/makefile.vc +++ b/samples/opengl/cube/makefile.vc @@ -322,7 +322,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/opengl/cube/makefile.wat b/samples/opengl/cube/makefile.wat index b439f3d680..29023ca482 100644 --- a/samples/opengl/cube/makefile.wat +++ b/samples/opengl/cube/makefile.wat @@ -162,8 +162,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/opengl/isosurf/makefile.bcc b/samples/opengl/isosurf/makefile.bcc index 3d18244596..a6fb1c5656 100644 --- a/samples/opengl/isosurf/makefile.bcc +++ b/samples/opengl/isosurf/makefile.bcc @@ -185,7 +185,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/opengl/isosurf/makefile.gcc b/samples/opengl/isosurf/makefile.gcc index 25eb56e052..1b09d979fb 100644 --- a/samples/opengl/isosurf/makefile.gcc +++ b/samples/opengl/isosurf/makefile.gcc @@ -171,8 +171,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/opengl/isosurf/makefile.vc b/samples/opengl/isosurf/makefile.vc index dbef38789a..4da1eec1a7 100644 --- a/samples/opengl/isosurf/makefile.vc +++ b/samples/opengl/isosurf/makefile.vc @@ -322,7 +322,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/opengl/isosurf/makefile.wat b/samples/opengl/isosurf/makefile.wat index 81415e27f1..1d8c6e7bc7 100644 --- a/samples/opengl/isosurf/makefile.wat +++ b/samples/opengl/isosurf/makefile.wat @@ -162,8 +162,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/opengl/penguin/makefile.bcc b/samples/opengl/penguin/makefile.bcc index 7a4443c095..f05081c16f 100644 --- a/samples/opengl/penguin/makefile.bcc +++ b/samples/opengl/penguin/makefile.bcc @@ -194,7 +194,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/opengl/penguin/makefile.gcc b/samples/opengl/penguin/makefile.gcc index 5fd42c6efb..32ce384690 100644 --- a/samples/opengl/penguin/makefile.gcc +++ b/samples/opengl/penguin/makefile.gcc @@ -180,8 +180,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/opengl/penguin/makefile.vc b/samples/opengl/penguin/makefile.vc index 7e9baef53f..4ba0e2d77e 100644 --- a/samples/opengl/penguin/makefile.vc +++ b/samples/opengl/penguin/makefile.vc @@ -334,7 +334,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/opengl/penguin/makefile.wat b/samples/opengl/penguin/makefile.wat index 13f942261d..8d52450b75 100644 --- a/samples/opengl/penguin/makefile.wat +++ b/samples/opengl/penguin/makefile.wat @@ -162,8 +162,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/ownerdrw/makefile.bcc b/samples/ownerdrw/makefile.bcc index fdb3ad8e83..bbc83ccd48 100644 --- a/samples/ownerdrw/makefile.bcc +++ b/samples/ownerdrw/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/ownerdrw/makefile.gcc b/samples/ownerdrw/makefile.gcc index 3b401bbba2..9e0720bb28 100644 --- a/samples/ownerdrw/makefile.gcc +++ b/samples/ownerdrw/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/ownerdrw/makefile.vc b/samples/ownerdrw/makefile.vc index 8eb31e949d..174ef0fbe7 100644 --- a/samples/ownerdrw/makefile.vc +++ b/samples/ownerdrw/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/ownerdrw/makefile.wat b/samples/ownerdrw/makefile.wat index e0244a0bfe..e7d4103c73 100644 --- a/samples/ownerdrw/makefile.wat +++ b/samples/ownerdrw/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/popup/makefile.bcc b/samples/popup/makefile.bcc index 6c3883c7ec..80b30a9695 100644 --- a/samples/popup/makefile.bcc +++ b/samples/popup/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/popup/makefile.gcc b/samples/popup/makefile.gcc index 2e533d1143..9b58456d1c 100644 --- a/samples/popup/makefile.gcc +++ b/samples/popup/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/popup/makefile.vc b/samples/popup/makefile.vc index ab0e711e37..51495f4096 100644 --- a/samples/popup/makefile.vc +++ b/samples/popup/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/popup/makefile.wat b/samples/popup/makefile.wat index de3013d9e9..68b6939531 100644 --- a/samples/popup/makefile.wat +++ b/samples/popup/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/power/makefile.bcc b/samples/power/makefile.bcc index 2d85cb8dab..d6d2a53d5b 100644 --- a/samples/power/makefile.bcc +++ b/samples/power/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/power/makefile.gcc b/samples/power/makefile.gcc index 75ffa69600..e317bc48d7 100644 --- a/samples/power/makefile.gcc +++ b/samples/power/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/power/makefile.vc b/samples/power/makefile.vc index 773dd4fc83..2673677ee1 100644 --- a/samples/power/makefile.vc +++ b/samples/power/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/power/makefile.wat b/samples/power/makefile.wat index 8c86bca713..5804d22b7c 100644 --- a/samples/power/makefile.wat +++ b/samples/power/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/preferences/makefile.bcc b/samples/preferences/makefile.bcc index 1b61525b8a..889a0f8777 100644 --- a/samples/preferences/makefile.bcc +++ b/samples/preferences/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/preferences/makefile.gcc b/samples/preferences/makefile.gcc index 7a5e28b110..cf03b95dc9 100644 --- a/samples/preferences/makefile.gcc +++ b/samples/preferences/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/preferences/makefile.vc b/samples/preferences/makefile.vc index e70525fb8b..806a79b6b9 100644 --- a/samples/preferences/makefile.vc +++ b/samples/preferences/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/preferences/makefile.wat b/samples/preferences/makefile.wat index 1d6f507647..966c4b083d 100644 --- a/samples/preferences/makefile.wat +++ b/samples/preferences/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/printing/makefile.bcc b/samples/printing/makefile.bcc index f6ffffbaf2..5eefe41039 100644 --- a/samples/printing/makefile.bcc +++ b/samples/printing/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/printing/makefile.gcc b/samples/printing/makefile.gcc index 2bc81769e2..d69e1b38b2 100644 --- a/samples/printing/makefile.gcc +++ b/samples/printing/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/printing/makefile.vc b/samples/printing/makefile.vc index 29dc91eeaf..3cdb4335c7 100644 --- a/samples/printing/makefile.vc +++ b/samples/printing/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/printing/makefile.wat b/samples/printing/makefile.wat index 98f6ed569d..806d2d16c6 100644 --- a/samples/printing/makefile.wat +++ b/samples/printing/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/propgrid/makefile.bcc b/samples/propgrid/makefile.bcc index b3bbf7b834..bdf2002f8e 100644 --- a/samples/propgrid/makefile.bcc +++ b/samples/propgrid/makefile.bcc @@ -193,7 +193,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/propgrid/makefile.gcc b/samples/propgrid/makefile.gcc index 9613a816fb..842b9962f2 100644 --- a/samples/propgrid/makefile.gcc +++ b/samples/propgrid/makefile.gcc @@ -179,8 +179,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/propgrid/makefile.vc b/samples/propgrid/makefile.vc index 221d970e00..2483820fa5 100644 --- a/samples/propgrid/makefile.vc +++ b/samples/propgrid/makefile.vc @@ -330,7 +330,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/propgrid/makefile.wat b/samples/propgrid/makefile.wat index 50628af175..b2b6098afa 100644 --- a/samples/propgrid/makefile.wat +++ b/samples/propgrid/makefile.wat @@ -168,8 +168,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/regtest/makefile.bcc b/samples/regtest/makefile.bcc index 2e84f4b348..04c605d684 100644 --- a/samples/regtest/makefile.bcc +++ b/samples/regtest/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/regtest/makefile.gcc b/samples/regtest/makefile.gcc index 4fa72af6c9..d8670f991f 100644 --- a/samples/regtest/makefile.gcc +++ b/samples/regtest/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/regtest/makefile.vc b/samples/regtest/makefile.vc index 0c582dc32d..a3746ec0f8 100644 --- a/samples/regtest/makefile.vc +++ b/samples/regtest/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/regtest/makefile.wat b/samples/regtest/makefile.wat index b1c4a6e7d5..89347a5ce5 100644 --- a/samples/regtest/makefile.wat +++ b/samples/regtest/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/render/makefile.bcc b/samples/render/makefile.bcc index 8ea06b8a08..d0fe412544 100644 --- a/samples/render/makefile.bcc +++ b/samples/render/makefile.bcc @@ -201,7 +201,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/render/makefile.gcc b/samples/render/makefile.gcc index e4c2607016..31612c39cd 100644 --- a/samples/render/makefile.gcc +++ b/samples/render/makefile.gcc @@ -187,8 +187,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/render/makefile.vc b/samples/render/makefile.vc index 8c1cda2405..74ea1d5355 100644 --- a/samples/render/makefile.vc +++ b/samples/render/makefile.vc @@ -360,7 +360,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/render/makefile.wat b/samples/render/makefile.wat index 2c59267e35..698313e223 100644 --- a/samples/render/makefile.wat +++ b/samples/render/makefile.wat @@ -209,8 +209,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/ribbon/makefile.bcc b/samples/ribbon/makefile.bcc index 9b3aeffb73..9f14a1870a 100644 --- a/samples/ribbon/makefile.bcc +++ b/samples/ribbon/makefile.bcc @@ -190,7 +190,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/ribbon/makefile.gcc b/samples/ribbon/makefile.gcc index e08115d66a..fd0a8e31d9 100644 --- a/samples/ribbon/makefile.gcc +++ b/samples/ribbon/makefile.gcc @@ -176,8 +176,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/ribbon/makefile.vc b/samples/ribbon/makefile.vc index aaa735f64a..6a82fcb8e2 100644 --- a/samples/ribbon/makefile.vc +++ b/samples/ribbon/makefile.vc @@ -327,7 +327,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/ribbon/makefile.wat b/samples/ribbon/makefile.wat index af251751e2..76a9d0d680 100644 --- a/samples/ribbon/makefile.wat +++ b/samples/ribbon/makefile.wat @@ -168,8 +168,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/richtext/makefile.bcc b/samples/richtext/makefile.bcc index 3209d02e26..e226466646 100644 --- a/samples/richtext/makefile.bcc +++ b/samples/richtext/makefile.bcc @@ -198,7 +198,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/richtext/makefile.gcc b/samples/richtext/makefile.gcc index e29928bbd3..4a940959a0 100644 --- a/samples/richtext/makefile.gcc +++ b/samples/richtext/makefile.gcc @@ -184,8 +184,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/richtext/makefile.vc b/samples/richtext/makefile.vc index 7c1709ccec..eae3d828e0 100644 --- a/samples/richtext/makefile.vc +++ b/samples/richtext/makefile.vc @@ -335,7 +335,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/richtext/makefile.wat b/samples/richtext/makefile.wat index 4ea8b89a0c..05446c5e31 100644 --- a/samples/richtext/makefile.wat +++ b/samples/richtext/makefile.wat @@ -178,8 +178,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/sashtest/makefile.bcc b/samples/sashtest/makefile.bcc index 7abb3a8c47..f471eb6ed3 100644 --- a/samples/sashtest/makefile.bcc +++ b/samples/sashtest/makefile.bcc @@ -186,7 +186,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/sashtest/makefile.gcc b/samples/sashtest/makefile.gcc index fefeac37b1..779e05940a 100644 --- a/samples/sashtest/makefile.gcc +++ b/samples/sashtest/makefile.gcc @@ -172,8 +172,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/sashtest/makefile.vc b/samples/sashtest/makefile.vc index 367b9b9b8a..8937a1c30d 100644 --- a/samples/sashtest/makefile.vc +++ b/samples/sashtest/makefile.vc @@ -323,7 +323,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/sashtest/makefile.wat b/samples/sashtest/makefile.wat index 6e2b191188..48b5438434 100644 --- a/samples/sashtest/makefile.wat +++ b/samples/sashtest/makefile.wat @@ -163,8 +163,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/scroll/makefile.bcc b/samples/scroll/makefile.bcc index e912c64cc0..9a6db4c9fd 100644 --- a/samples/scroll/makefile.bcc +++ b/samples/scroll/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/scroll/makefile.gcc b/samples/scroll/makefile.gcc index fd50c9cdb5..953a7c95d6 100644 --- a/samples/scroll/makefile.gcc +++ b/samples/scroll/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/scroll/makefile.vc b/samples/scroll/makefile.vc index 133172660a..d61c1bc04b 100644 --- a/samples/scroll/makefile.vc +++ b/samples/scroll/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/scroll/makefile.wat b/samples/scroll/makefile.wat index 6a697840eb..7161f71c9a 100644 --- a/samples/scroll/makefile.wat +++ b/samples/scroll/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/shaped/makefile.bcc b/samples/shaped/makefile.bcc index 4e5cffd2d6..db2b3acb0d 100644 --- a/samples/shaped/makefile.bcc +++ b/samples/shaped/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/shaped/makefile.gcc b/samples/shaped/makefile.gcc index 363675d973..75cf06d112 100644 --- a/samples/shaped/makefile.gcc +++ b/samples/shaped/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/shaped/makefile.vc b/samples/shaped/makefile.vc index 659d0e1c3f..c164d1877a 100644 --- a/samples/shaped/makefile.vc +++ b/samples/shaped/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/shaped/makefile.wat b/samples/shaped/makefile.wat index 0222658328..7f3698e913 100644 --- a/samples/shaped/makefile.wat +++ b/samples/shaped/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/sockets/makefile.bcc b/samples/sockets/makefile.bcc index e59d460714..714bcac03b 100644 --- a/samples/sockets/makefile.bcc +++ b/samples/sockets/makefile.bcc @@ -150,7 +150,7 @@ __DLLFLAG_p_0 = -dWXUSINGDLL __WXLIB_CORE_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/sockets/makefile.gcc b/samples/sockets/makefile.gcc index 6784d355f2..2e75ef5f95 100644 --- a/samples/sockets/makefile.gcc +++ b/samples/sockets/makefile.gcc @@ -150,8 +150,10 @@ __WXLIB_CORE_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/sockets/makefile.vc b/samples/sockets/makefile.vc index 77a91f9765..871c900a65 100644 --- a/samples/sockets/makefile.vc +++ b/samples/sockets/makefile.vc @@ -289,7 +289,7 @@ __DLLFLAG_p_0 = /d WXUSINGDLL __WXLIB_CORE_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/sockets/makefile.wat b/samples/sockets/makefile.wat index 78ff648e27..85e92e7d16 100644 --- a/samples/sockets/makefile.wat +++ b/samples/sockets/makefile.wat @@ -95,8 +95,10 @@ __WXLIB_CORE_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/sound/makefile.bcc b/samples/sound/makefile.bcc index 72d40ccf0d..7b0a1c0fe6 100644 --- a/samples/sound/makefile.bcc +++ b/samples/sound/makefile.bcc @@ -186,7 +186,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/sound/makefile.gcc b/samples/sound/makefile.gcc index 8ef0735be8..e3a0d9976a 100644 --- a/samples/sound/makefile.gcc +++ b/samples/sound/makefile.gcc @@ -172,8 +172,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/sound/makefile.vc b/samples/sound/makefile.vc index 59a128618a..9588213a89 100644 --- a/samples/sound/makefile.vc +++ b/samples/sound/makefile.vc @@ -323,7 +323,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/sound/makefile.wat b/samples/sound/makefile.wat index b9762fb3e9..809a032db0 100644 --- a/samples/sound/makefile.wat +++ b/samples/sound/makefile.wat @@ -163,8 +163,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/splash/makefile.bcc b/samples/splash/makefile.bcc index f2ffefbf89..bdcef7a107 100644 --- a/samples/splash/makefile.bcc +++ b/samples/splash/makefile.bcc @@ -190,7 +190,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/splash/makefile.gcc b/samples/splash/makefile.gcc index 6e6f4c1081..4fa158c1db 100644 --- a/samples/splash/makefile.gcc +++ b/samples/splash/makefile.gcc @@ -178,8 +178,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/splash/makefile.vc b/samples/splash/makefile.vc index 1aed2141b8..35662628dd 100644 --- a/samples/splash/makefile.vc +++ b/samples/splash/makefile.vc @@ -327,7 +327,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/splash/makefile.wat b/samples/splash/makefile.wat index 53169ae78d..ef1b4aafa0 100644 --- a/samples/splash/makefile.wat +++ b/samples/splash/makefile.wat @@ -170,8 +170,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/splitter/makefile.bcc b/samples/splitter/makefile.bcc index 5d3ce6497f..b6f0ea9dbf 100644 --- a/samples/splitter/makefile.bcc +++ b/samples/splitter/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/splitter/makefile.gcc b/samples/splitter/makefile.gcc index d87c1cc9c1..7131039524 100644 --- a/samples/splitter/makefile.gcc +++ b/samples/splitter/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/splitter/makefile.vc b/samples/splitter/makefile.vc index 52550feeb4..819a55565d 100644 --- a/samples/splitter/makefile.vc +++ b/samples/splitter/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/splitter/makefile.wat b/samples/splitter/makefile.wat index 877d01b299..202d57c84b 100644 --- a/samples/splitter/makefile.wat +++ b/samples/splitter/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/statbar/makefile.bcc b/samples/statbar/makefile.bcc index 3cde34182e..375eb14bdf 100644 --- a/samples/statbar/makefile.bcc +++ b/samples/statbar/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/statbar/makefile.gcc b/samples/statbar/makefile.gcc index 4f3ee90475..ecd7232f3c 100644 --- a/samples/statbar/makefile.gcc +++ b/samples/statbar/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/statbar/makefile.vc b/samples/statbar/makefile.vc index 0e5e3fba73..587907cabc 100644 --- a/samples/statbar/makefile.vc +++ b/samples/statbar/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/statbar/makefile.wat b/samples/statbar/makefile.wat index 5eeeaf38f0..89ce42657a 100644 --- a/samples/statbar/makefile.wat +++ b/samples/statbar/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/stc/makefile.bcc b/samples/stc/makefile.bcc index 561e65fb59..30a0ae5e57 100644 --- a/samples/stc/makefile.bcc +++ b/samples/stc/makefile.bcc @@ -188,7 +188,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/stc/makefile.gcc b/samples/stc/makefile.gcc index a5baa55bf7..6e5ddea7eb 100644 --- a/samples/stc/makefile.gcc +++ b/samples/stc/makefile.gcc @@ -174,8 +174,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/stc/makefile.vc b/samples/stc/makefile.vc index 236ca7389d..464ceeda65 100644 --- a/samples/stc/makefile.vc +++ b/samples/stc/makefile.vc @@ -325,7 +325,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/stc/makefile.wat b/samples/stc/makefile.wat index e38c0471c9..34238f9e79 100644 --- a/samples/stc/makefile.wat +++ b/samples/stc/makefile.wat @@ -163,8 +163,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/svg/makefile.bcc b/samples/svg/makefile.bcc index 38b109b69f..4952fceebb 100644 --- a/samples/svg/makefile.bcc +++ b/samples/svg/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/svg/makefile.gcc b/samples/svg/makefile.gcc index b1a6950b8f..941cebe8c8 100644 --- a/samples/svg/makefile.gcc +++ b/samples/svg/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/svg/makefile.vc b/samples/svg/makefile.vc index 0aa49c9223..b3153fc7bc 100644 --- a/samples/svg/makefile.vc +++ b/samples/svg/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/svg/makefile.wat b/samples/svg/makefile.wat index c085bb72ce..e74e378480 100644 --- a/samples/svg/makefile.wat +++ b/samples/svg/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/taborder/makefile.bcc b/samples/taborder/makefile.bcc index 0696353997..23f55721fc 100644 --- a/samples/taborder/makefile.bcc +++ b/samples/taborder/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/taborder/makefile.gcc b/samples/taborder/makefile.gcc index 51dbe0e260..4b8b5d7eff 100644 --- a/samples/taborder/makefile.gcc +++ b/samples/taborder/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/taborder/makefile.vc b/samples/taborder/makefile.vc index 36f14aea76..0f48858e0f 100644 --- a/samples/taborder/makefile.vc +++ b/samples/taborder/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/taborder/makefile.wat b/samples/taborder/makefile.wat index c17ce288d3..e3b9d39209 100644 --- a/samples/taborder/makefile.wat +++ b/samples/taborder/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/taskbar/makefile.bcc b/samples/taskbar/makefile.bcc index 5dc07ddc94..938a9f1beb 100644 --- a/samples/taskbar/makefile.bcc +++ b/samples/taskbar/makefile.bcc @@ -186,7 +186,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/taskbar/makefile.gcc b/samples/taskbar/makefile.gcc index 3518ccc3e0..910bf0c760 100644 --- a/samples/taskbar/makefile.gcc +++ b/samples/taskbar/makefile.gcc @@ -172,8 +172,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/taskbar/makefile.vc b/samples/taskbar/makefile.vc index 7cc1350018..da8b08e61c 100644 --- a/samples/taskbar/makefile.vc +++ b/samples/taskbar/makefile.vc @@ -323,7 +323,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/taskbar/makefile.wat b/samples/taskbar/makefile.wat index 3400e68bf6..aa349b3da1 100644 --- a/samples/taskbar/makefile.wat +++ b/samples/taskbar/makefile.wat @@ -163,8 +163,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/text/makefile.bcc b/samples/text/makefile.bcc index 07a5f284c4..3d5ba316cd 100644 --- a/samples/text/makefile.bcc +++ b/samples/text/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/text/makefile.gcc b/samples/text/makefile.gcc index 1f5539470e..832ac58a57 100644 --- a/samples/text/makefile.gcc +++ b/samples/text/makefile.gcc @@ -167,8 +167,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/text/makefile.vc b/samples/text/makefile.vc index b42ffa312a..65cc55e2f6 100644 --- a/samples/text/makefile.vc +++ b/samples/text/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/text/makefile.wat b/samples/text/makefile.wat index a8dda06cca..f1021f2140 100644 --- a/samples/text/makefile.wat +++ b/samples/text/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/thread/makefile.bcc b/samples/thread/makefile.bcc index 40dc953797..c1cd26f94a 100644 --- a/samples/thread/makefile.bcc +++ b/samples/thread/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/thread/makefile.gcc b/samples/thread/makefile.gcc index d5ec123ca3..307d3ddc12 100644 --- a/samples/thread/makefile.gcc +++ b/samples/thread/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/thread/makefile.vc b/samples/thread/makefile.vc index 1bb503d3ed..805ce2deb9 100644 --- a/samples/thread/makefile.vc +++ b/samples/thread/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/thread/makefile.wat b/samples/thread/makefile.wat index a55ff9c717..c2bab31b71 100644 --- a/samples/thread/makefile.wat +++ b/samples/thread/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/toolbar/makefile.bcc b/samples/toolbar/makefile.bcc index e883cae07a..07acba22a6 100644 --- a/samples/toolbar/makefile.bcc +++ b/samples/toolbar/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/toolbar/makefile.gcc b/samples/toolbar/makefile.gcc index 5ba12ba18f..2967797ce6 100644 --- a/samples/toolbar/makefile.gcc +++ b/samples/toolbar/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/toolbar/makefile.vc b/samples/toolbar/makefile.vc index 9a8d610ab0..d86c186085 100644 --- a/samples/toolbar/makefile.vc +++ b/samples/toolbar/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/toolbar/makefile.wat b/samples/toolbar/makefile.wat index 378ee76edc..92c43cc0b6 100644 --- a/samples/toolbar/makefile.wat +++ b/samples/toolbar/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/treectrl/makefile.bcc b/samples/treectrl/makefile.bcc index c94b908cb9..b46ffa0859 100644 --- a/samples/treectrl/makefile.bcc +++ b/samples/treectrl/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/treectrl/makefile.gcc b/samples/treectrl/makefile.gcc index 41a8954789..29173db5d0 100644 --- a/samples/treectrl/makefile.gcc +++ b/samples/treectrl/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/treectrl/makefile.vc b/samples/treectrl/makefile.vc index 9e69f851fe..90d5c4802b 100644 --- a/samples/treectrl/makefile.vc +++ b/samples/treectrl/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/treectrl/makefile.wat b/samples/treectrl/makefile.wat index 588e7d1cfc..a3a476b260 100644 --- a/samples/treectrl/makefile.wat +++ b/samples/treectrl/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/treelist/makefile.bcc b/samples/treelist/makefile.bcc index cae710fb97..131e4302d2 100644 --- a/samples/treelist/makefile.bcc +++ b/samples/treelist/makefile.bcc @@ -186,7 +186,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/treelist/makefile.gcc b/samples/treelist/makefile.gcc index 36879c31ad..8bbac1035d 100644 --- a/samples/treelist/makefile.gcc +++ b/samples/treelist/makefile.gcc @@ -172,8 +172,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/treelist/makefile.vc b/samples/treelist/makefile.vc index f23661417f..340e2a2641 100644 --- a/samples/treelist/makefile.vc +++ b/samples/treelist/makefile.vc @@ -323,7 +323,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/treelist/makefile.wat b/samples/treelist/makefile.wat index a52de09c89..1e3d8901a0 100644 --- a/samples/treelist/makefile.wat +++ b/samples/treelist/makefile.wat @@ -163,8 +163,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/typetest/makefile.bcc b/samples/typetest/makefile.bcc index 5a09d1a680..935183911c 100644 --- a/samples/typetest/makefile.bcc +++ b/samples/typetest/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/typetest/makefile.gcc b/samples/typetest/makefile.gcc index c00686f1aa..7d571af758 100644 --- a/samples/typetest/makefile.gcc +++ b/samples/typetest/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/typetest/makefile.vc b/samples/typetest/makefile.vc index dc91f71a2d..7162470239 100644 --- a/samples/typetest/makefile.vc +++ b/samples/typetest/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/typetest/makefile.wat b/samples/typetest/makefile.wat index 7e049f73e9..aa2675dd4b 100644 --- a/samples/typetest/makefile.wat +++ b/samples/typetest/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/uiaction/makefile.bcc b/samples/uiaction/makefile.bcc index 25eb9180a2..3f1fda1bd6 100644 --- a/samples/uiaction/makefile.bcc +++ b/samples/uiaction/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/uiaction/makefile.gcc b/samples/uiaction/makefile.gcc index ff3228795b..2657edf712 100644 --- a/samples/uiaction/makefile.gcc +++ b/samples/uiaction/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/uiaction/makefile.vc b/samples/uiaction/makefile.vc index 48daf56f8a..11227942bf 100644 --- a/samples/uiaction/makefile.vc +++ b/samples/uiaction/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/uiaction/makefile.wat b/samples/uiaction/makefile.wat index 7a29c8075e..c2f6e72abd 100644 --- a/samples/uiaction/makefile.wat +++ b/samples/uiaction/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/validate/makefile.bcc b/samples/validate/makefile.bcc index d48699cbda..307f27442e 100644 --- a/samples/validate/makefile.bcc +++ b/samples/validate/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/validate/makefile.gcc b/samples/validate/makefile.gcc index 93b3bd8488..189f5a160c 100644 --- a/samples/validate/makefile.gcc +++ b/samples/validate/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/validate/makefile.vc b/samples/validate/makefile.vc index 567751fefb..dae890d83e 100644 --- a/samples/validate/makefile.vc +++ b/samples/validate/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/validate/makefile.wat b/samples/validate/makefile.wat index 0d138b8026..24575cf2ad 100644 --- a/samples/validate/makefile.wat +++ b/samples/validate/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/vscroll/makefile.bcc b/samples/vscroll/makefile.bcc index 0fca655919..c10e41ae52 100644 --- a/samples/vscroll/makefile.bcc +++ b/samples/vscroll/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/vscroll/makefile.gcc b/samples/vscroll/makefile.gcc index 3199362282..5fc584a4a3 100644 --- a/samples/vscroll/makefile.gcc +++ b/samples/vscroll/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/vscroll/makefile.vc b/samples/vscroll/makefile.vc index ae4e84fadf..1141ebbef7 100644 --- a/samples/vscroll/makefile.vc +++ b/samples/vscroll/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/vscroll/makefile.wat b/samples/vscroll/makefile.wat index f9eaa26e41..98c80f9175 100644 --- a/samples/vscroll/makefile.wat +++ b/samples/vscroll/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/webview/makefile.bcc b/samples/webview/makefile.bcc index 76a29e3df3..95c7355552 100644 --- a/samples/webview/makefile.bcc +++ b/samples/webview/makefile.bcc @@ -194,7 +194,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/webview/makefile.gcc b/samples/webview/makefile.gcc index 9e1833cb03..1a94dee36a 100644 --- a/samples/webview/makefile.gcc +++ b/samples/webview/makefile.gcc @@ -182,8 +182,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/webview/makefile.vc b/samples/webview/makefile.vc index 211fcec2da..5cdb52646b 100644 --- a/samples/webview/makefile.vc +++ b/samples/webview/makefile.vc @@ -331,7 +331,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/webview/makefile.wat b/samples/webview/makefile.wat index 562860b689..d4aacaac7e 100644 --- a/samples/webview/makefile.wat +++ b/samples/webview/makefile.wat @@ -175,8 +175,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/widgets/makefile.bcc b/samples/widgets/makefile.bcc index 84005fe2c7..9b753a33fc 100644 --- a/samples/widgets/makefile.bcc +++ b/samples/widgets/makefile.bcc @@ -214,7 +214,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/widgets/makefile.gcc b/samples/widgets/makefile.gcc index d9cdb9bf6b..61fa36e3de 100644 --- a/samples/widgets/makefile.gcc +++ b/samples/widgets/makefile.gcc @@ -200,8 +200,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/widgets/makefile.vc b/samples/widgets/makefile.vc index 8f04406bdd..45d4c0def9 100644 --- a/samples/widgets/makefile.vc +++ b/samples/widgets/makefile.vc @@ -351,7 +351,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/widgets/makefile.wat b/samples/widgets/makefile.wat index f10ed8bf22..415d058d7c 100644 --- a/samples/widgets/makefile.wat +++ b/samples/widgets/makefile.wat @@ -163,8 +163,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/wizard/makefile.bcc b/samples/wizard/makefile.bcc index f63da3ed0c..7bfb73746e 100644 --- a/samples/wizard/makefile.bcc +++ b/samples/wizard/makefile.bcc @@ -186,7 +186,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/wizard/makefile.gcc b/samples/wizard/makefile.gcc index 321cba697b..62d099eac8 100644 --- a/samples/wizard/makefile.gcc +++ b/samples/wizard/makefile.gcc @@ -172,8 +172,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/wizard/makefile.vc b/samples/wizard/makefile.vc index e1ed59ec42..567511853d 100644 --- a/samples/wizard/makefile.vc +++ b/samples/wizard/makefile.vc @@ -323,7 +323,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/wizard/makefile.wat b/samples/wizard/makefile.wat index f98f4d5920..7bb6d6aae9 100644 --- a/samples/wizard/makefile.wat +++ b/samples/wizard/makefile.wat @@ -163,8 +163,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/wrapsizer/makefile.bcc b/samples/wrapsizer/makefile.bcc index 37ea250095..c110fea88f 100644 --- a/samples/wrapsizer/makefile.bcc +++ b/samples/wrapsizer/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/wrapsizer/makefile.gcc b/samples/wrapsizer/makefile.gcc index 8293e56f37..5a46f75bef 100644 --- a/samples/wrapsizer/makefile.gcc +++ b/samples/wrapsizer/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/wrapsizer/makefile.vc b/samples/wrapsizer/makefile.vc index 6163400346..adc8e94475 100644 --- a/samples/wrapsizer/makefile.vc +++ b/samples/wrapsizer/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/wrapsizer/makefile.wat b/samples/wrapsizer/makefile.wat index 1e9367d15d..1c154148f3 100644 --- a/samples/wrapsizer/makefile.wat +++ b/samples/wrapsizer/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/xrc/makefile.bcc b/samples/xrc/makefile.bcc index 24f5d00273..bc3242b54b 100644 --- a/samples/xrc/makefile.bcc +++ b/samples/xrc/makefile.bcc @@ -206,7 +206,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/xrc/makefile.gcc b/samples/xrc/makefile.gcc index 60c60f62d3..f8ee559957 100644 --- a/samples/xrc/makefile.gcc +++ b/samples/xrc/makefile.gcc @@ -192,8 +192,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/xrc/makefile.vc b/samples/xrc/makefile.vc index b6ed27fd95..a23a85603f 100644 --- a/samples/xrc/makefile.vc +++ b/samples/xrc/makefile.vc @@ -343,7 +343,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/xrc/makefile.wat b/samples/xrc/makefile.wat index c52885a369..aa9239dfa7 100644 --- a/samples/xrc/makefile.wat +++ b/samples/xrc/makefile.wat @@ -183,8 +183,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/samples/xti/makefile.bcc b/samples/xti/makefile.bcc index f8ad77da0b..641a6e6322 100644 --- a/samples/xti/makefile.bcc +++ b/samples/xti/makefile.bcc @@ -188,7 +188,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/xti/makefile.gcc b/samples/xti/makefile.gcc index c56b940937..47533b9a0a 100644 --- a/samples/xti/makefile.gcc +++ b/samples/xti/makefile.gcc @@ -173,8 +173,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/samples/xti/makefile.vc b/samples/xti/makefile.vc index f50096f914..1fb7ddfdc8 100644 --- a/samples/xti/makefile.vc +++ b/samples/xti/makefile.vc @@ -325,7 +325,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/samples/xti/makefile.wat b/samples/xti/makefile.wat index 184c78efd0..80b79aecfb 100644 --- a/samples/xti/makefile.wat +++ b/samples/xti/makefile.wat @@ -163,8 +163,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/tests/benchmarks/makefile.bcc b/tests/benchmarks/makefile.bcc index ff420e6cff..512f808b8b 100644 --- a/tests/benchmarks/makefile.bcc +++ b/tests/benchmarks/makefile.bcc @@ -140,7 +140,7 @@ __DLLFLAG_p_3 = -dWXUSINGDLL __WXLIB_CORE_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/tests/benchmarks/makefile.gcc b/tests/benchmarks/makefile.gcc index 437436918d..d96d6ada7b 100644 --- a/tests/benchmarks/makefile.gcc +++ b/tests/benchmarks/makefile.gcc @@ -138,8 +138,10 @@ __WXLIB_CORE_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/tests/benchmarks/makefile.vc b/tests/benchmarks/makefile.vc index 11be7fab30..9d28b26e35 100644 --- a/tests/benchmarks/makefile.vc +++ b/tests/benchmarks/makefile.vc @@ -234,7 +234,7 @@ __DLLFLAG_p_3 = /d WXUSINGDLL __WXLIB_CORE_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/tests/benchmarks/makefile.wat b/tests/benchmarks/makefile.wat index c8474857ad..0ec0838059 100644 --- a/tests/benchmarks/makefile.wat +++ b/tests/benchmarks/makefile.wat @@ -92,8 +92,10 @@ __WXLIB_CORE_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/tests/makefile.bcc b/tests/makefile.bcc index 6328a1813b..17f4e2c29a 100644 --- a/tests/makefile.bcc +++ b/tests/makefile.bcc @@ -321,7 +321,7 @@ __WXLIB_HTML_p = \ __WXLIB_CORE_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/tests/makefile.gcc b/tests/makefile.gcc index 13b4ebc306..9354b5dd28 100644 --- a/tests/makefile.gcc +++ b/tests/makefile.gcc @@ -322,8 +322,10 @@ __WXLIB_CORE_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/tests/makefile.vc b/tests/makefile.vc index 4cdc92534a..36c0ecce5c 100644 --- a/tests/makefile.vc +++ b/tests/makefile.vc @@ -416,7 +416,7 @@ __WXLIB_HTML_p = \ __WXLIB_CORE_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/tests/makefile.wat b/tests/makefile.wat index 3f2972d7e7..ed6db4428c 100644 --- a/tests/makefile.wat +++ b/tests/makefile.wat @@ -121,8 +121,10 @@ __WXLIB_CORE_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/utils/emulator/src/makefile.bcc b/utils/emulator/src/makefile.bcc index 40df6b6383..6ef5534c0e 100644 --- a/utils/emulator/src/makefile.bcc +++ b/utils/emulator/src/makefile.bcc @@ -182,7 +182,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/utils/emulator/src/makefile.gcc b/utils/emulator/src/makefile.gcc index e6d063f3be..c1095117e2 100644 --- a/utils/emulator/src/makefile.gcc +++ b/utils/emulator/src/makefile.gcc @@ -168,8 +168,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/utils/emulator/src/makefile.vc b/utils/emulator/src/makefile.vc index 0f771ed802..c41b631338 100644 --- a/utils/emulator/src/makefile.vc +++ b/utils/emulator/src/makefile.vc @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/utils/emulator/src/makefile.wat b/utils/emulator/src/makefile.wat index 1bf6d20ba6..dc0fb40551 100644 --- a/utils/emulator/src/makefile.wat +++ b/utils/emulator/src/makefile.wat @@ -158,8 +158,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/utils/helpview/src/makefile.bcc b/utils/helpview/src/makefile.bcc index 793266d680..882251c262 100644 --- a/utils/helpview/src/makefile.bcc +++ b/utils/helpview/src/makefile.bcc @@ -190,7 +190,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/utils/helpview/src/makefile.gcc b/utils/helpview/src/makefile.gcc index b3e508cc65..257373bf50 100644 --- a/utils/helpview/src/makefile.gcc +++ b/utils/helpview/src/makefile.gcc @@ -176,8 +176,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/utils/helpview/src/makefile.vc b/utils/helpview/src/makefile.vc index b7b0f7c188..0233e1e4d6 100644 --- a/utils/helpview/src/makefile.vc +++ b/utils/helpview/src/makefile.vc @@ -327,7 +327,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/utils/helpview/src/makefile.wat b/utils/helpview/src/makefile.wat index 9535587f6e..78fb95c666 100644 --- a/utils/helpview/src/makefile.wat +++ b/utils/helpview/src/makefile.wat @@ -168,8 +168,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/utils/hhp2cached/makefile.bcc b/utils/hhp2cached/makefile.bcc index 00a6ae008b..14b19b2ef2 100644 --- a/utils/hhp2cached/makefile.bcc +++ b/utils/hhp2cached/makefile.bcc @@ -186,7 +186,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/utils/hhp2cached/makefile.gcc b/utils/hhp2cached/makefile.gcc index c703a2d8f6..ef5c7b2582 100644 --- a/utils/hhp2cached/makefile.gcc +++ b/utils/hhp2cached/makefile.gcc @@ -172,8 +172,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/utils/hhp2cached/makefile.vc b/utils/hhp2cached/makefile.vc index eb64ac0c22..1aa015a00a 100644 --- a/utils/hhp2cached/makefile.vc +++ b/utils/hhp2cached/makefile.vc @@ -323,7 +323,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/utils/hhp2cached/makefile.wat b/utils/hhp2cached/makefile.wat index b9fbc55823..de43ad6c45 100644 --- a/utils/hhp2cached/makefile.wat +++ b/utils/hhp2cached/makefile.wat @@ -163,8 +163,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib diff --git a/utils/screenshotgen/src/makefile.bcc b/utils/screenshotgen/src/makefile.bcc index 5324f84bec..70d5ed5c4d 100644 --- a/utils/screenshotgen/src/makefile.bcc +++ b/utils/screenshotgen/src/makefile.bcc @@ -206,7 +206,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/utils/screenshotgen/src/makefile.gcc b/utils/screenshotgen/src/makefile.gcc index a1ecfd4411..556a52dee6 100644 --- a/utils/screenshotgen/src/makefile.gcc +++ b/utils/screenshotgen/src/makefile.gcc @@ -192,8 +192,10 @@ __WXLIB_MONO_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) endif ifeq ($(MONOLITHIC),1) +ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) endif +endif ifeq ($(USE_GUI),1) __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) endif diff --git a/utils/screenshotgen/src/makefile.vc b/utils/screenshotgen/src/makefile.vc index f4560c3101..ddaae34ac8 100644 --- a/utils/screenshotgen/src/makefile.vc +++ b/utils/screenshotgen/src/makefile.vc @@ -343,7 +343,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1" diff --git a/utils/screenshotgen/src/makefile.wat b/utils/screenshotgen/src/makefile.wat index bb09f17559..1b8a4da889 100644 --- a/utils/screenshotgen/src/makefile.wat +++ b/utils/screenshotgen/src/makefile.wat @@ -183,8 +183,10 @@ __WXLIB_MONO_p = & !endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 +!ifeq USE_STC 1 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -- 2.45.2