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

diff --git a/demos/bombs/makefile.bcc b/demos/bombs/makefile.bcc
index b0148984e6fa8049cf8b7f94ec2c111fa1a9e646..9210ce35dfccf0acc8284ed802176d54aab74f07 100644 (file)
--- a/demos/bombs/makefile.bcc
+++ b/demos/bombs/makefile.bcc
@@ -184,7 +184,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/demos/bombs/makefile.gcc b/demos/bombs/makefile.gcc
index e95b38c57e510e7c7b1e1891c8c4b4fd6c8b7e85..7f1390b2924566c3d2600ac5d9ef7c7d782d96d1 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/demos/bombs/makefile.vc b/demos/bombs/makefile.vc
index e67518e379c53ba202819740c4109cf872e86a37..4a55a62c7d90c11e15e398a271be171aeb91c3d8 100644 (file)
--- a/demos/bombs/makefile.vc
+++ b/demos/bombs/makefile.vc
@@ -321,7 +321,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/demos/bombs/makefile.wat b/demos/bombs/makefile.wat
index c4a72c557c85fd07e02d2c85efbcb10490d20c1c..978d987233f700afe75a92912d40969587c0577d 100644 (file)
--- a/demos/bombs/makefile.wat
+++ b/demos/bombs/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/demos/forty/makefile.bcc b/demos/forty/makefile.bcc
index a3ea50564744ccf2f30b7494ff73fdda91721493..f55cff53e0a9f5c0d9254e21f327a57169411027 100644 (file)
--- a/demos/forty/makefile.bcc
+++ b/demos/forty/makefile.bcc
@@ -201,7 +201,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/demos/forty/makefile.gcc b/demos/forty/makefile.gcc
index 1fb113831cb0d6201200354fb89d4f44f6bf7ed2..a153190a56ed87512233a619d7733d9039e7d5d1 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/demos/forty/makefile.vc b/demos/forty/makefile.vc
index 7c825833787690e140c7655babac656ef7d3048c..2ba9cab116b40d83126980d977ee4f4f32c0e802 100644 (file)
--- a/demos/forty/makefile.vc
+++ b/demos/forty/makefile.vc
@@ -338,7 +338,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/demos/forty/makefile.wat b/demos/forty/makefile.wat
index 5eb506ad96d98171598e63a65cad8c842a369449..c7ce6adb58400b7caa0344fd44e821fac38a2be3 100644 (file)
--- a/demos/forty/makefile.wat
+++ b/demos/forty/makefile.wat
@@ -173,8 +173,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/demos/fractal/makefile.bcc b/demos/fractal/makefile.bcc
index df044092cc386433493dc3dcb886034cc0ced9e0..b36dcaf10b5665475dabad392382739b67fc6ba8 100644 (file)
--- a/demos/fractal/makefile.bcc
+++ b/demos/fractal/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/demos/fractal/makefile.gcc b/demos/fractal/makefile.gcc
index 45730cdbe8d24294d95cd1de0007dab6aaa98b6f..13394beba518ed60c7e4092c4df8ba28d2aab378 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/demos/fractal/makefile.vc b/demos/fractal/makefile.vc
index 659692cbc4a6f540a93454b938d75869d0645fa2..4c1544948a0133ecffe998b8ebe52be61643823d 100644 (file)
--- a/demos/fractal/makefile.vc
+++ b/demos/fractal/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/demos/fractal/makefile.wat b/demos/fractal/makefile.wat
index b964cc6d5a8158ab6ee4e294739cb05ed5c4402e..600dd113b4a9da1020f30647662733cc0ed651ff 100644 (file)
--- a/demos/fractal/makefile.wat
+++ b/demos/fractal/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/demos/life/makefile.bcc b/demos/life/makefile.bcc
index f572fc481a5410f5fa91b8649b1f6528e0586a92..14aca96672e2b6818d266ee197f46bae9c54b328 100644 (file)
--- a/demos/life/makefile.bcc
+++ b/demos/life/makefile.bcc
@@ -185,7 +185,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/demos/life/makefile.gcc b/demos/life/makefile.gcc
index e1cd79da29fd8b9e354f8d221a374774fe64a121..34cad90b64ba2bd0805f489fc12a6c081185176a 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/demos/life/makefile.vc b/demos/life/makefile.vc
index 028316e3398db11559fa396c2464b20a4aa29e9d..5b2729268a940f5ade5752917eb9cd53e19edcc6 100644 (file)
--- a/demos/life/makefile.vc
+++ b/demos/life/makefile.vc
@@ -322,7 +322,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/demos/life/makefile.wat b/demos/life/makefile.wat
index 7d1922689151735b0788565091c7c10eadf5fb61..431ced137c8b93f49afac8802409400feeba621f 100644 (file)
--- a/demos/life/makefile.wat
+++ b/demos/life/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/demos/poem/makefile.bcc b/demos/poem/makefile.bcc
index b27fd5030365c37a176d006e4b31ce1ba8881bd3..8fea06b03f8589683d0b0b6e73e55dfe92c81563 100644 (file)
--- a/demos/poem/makefile.bcc
+++ b/demos/poem/makefile.bcc
@@ -186,7 +186,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/demos/poem/makefile.gcc b/demos/poem/makefile.gcc
index 52c4e301c27a0c1c676df86b150dbe0d0de5f3d3..ed5c24ee11631b1d7bac539b5773c1fdf669e76b 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/demos/poem/makefile.vc b/demos/poem/makefile.vc
index 1d48833c896fb069bce8a9b425b7941aafd27978..957d7249123b8691ea67e581262c44354405fd0c 100644 (file)
--- a/demos/poem/makefile.vc
+++ b/demos/poem/makefile.vc
@@ -323,7 +323,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/demos/poem/makefile.wat b/demos/poem/makefile.wat
index 61bcdb60c285f5eb9cf4cc1d252cf83d15a229fa..c9b2edb80a2897bf4b5f146e40ddcf556f9cabe1 100644 (file)
--- a/demos/poem/makefile.wat
+++ b/demos/poem/makefile.wat
@@ -163,8 +163,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/access/makefile.bcc b/samples/access/makefile.bcc
index c5da51bacb9f6011eea0861e5ca4bbf910105afd..d56a3c3cba7d38395ca7280bb5b959265ff1128e 100644 (file)
--- a/samples/access/makefile.bcc
+++ b/samples/access/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/access/makefile.gcc b/samples/access/makefile.gcc
index c82579b66392a54717b72efbdfeaac8989121850..5083b4197d474132f52abd4209c422d526a2d7fb 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/access/makefile.vc b/samples/access/makefile.vc
index 7864fdf5d47533d67d3d2c5fbc3a5fe3ae550d7c..b6d0d3d7b69e2182b6f9e2fb9ec0b26de420dc9b 100644 (file)
--- a/samples/access/makefile.vc
+++ b/samples/access/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/access/makefile.wat b/samples/access/makefile.wat
index aaeda6819884f864b2955da913d4c86cb603c9ed..0c5012c7746805cb540211e343c167b724b7c467 100644 (file)
--- a/samples/access/makefile.wat
+++ b/samples/access/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/animate/makefile.bcc b/samples/animate/makefile.bcc
index cc3872b7eb5289c96fed107fb77c4997e0369efa..17d7f0ed665ea5d5733e7bd82ce309354387ee19 100644 (file)
--- a/samples/animate/makefile.bcc
+++ b/samples/animate/makefile.bcc
@@ -186,7 +186,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/animate/makefile.gcc b/samples/animate/makefile.gcc
index 57046a07b2a3f05d476ec7d8f6b601d389d0d1df..5775268493f55b391c686b7dcfbdcdcda1074a97 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/animate/makefile.vc b/samples/animate/makefile.vc
index 8dc0064d160db27d3b8c0b77c339a25559754327..65533d74d0af06c8b74287bc40757467d3769924 100644 (file)
--- a/samples/animate/makefile.vc
+++ b/samples/animate/makefile.vc
@@ -323,7 +323,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/animate/makefile.wat b/samples/animate/makefile.wat
index d7db7165f57c07d0300e0d457da48c9c36bf4192..c82f9a90056a6f8c072f55b48ff7357c32301d03 100644 (file)
--- a/samples/animate/makefile.wat
+++ b/samples/animate/makefile.wat
@@ -163,8 +163,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/artprov/makefile.bcc b/samples/artprov/makefile.bcc
index 8988d40be58b707d8d96da26b264c1cc6457bc59..509b5865afe49e485c038e19152d142ab4746a16 100644 (file)
--- a/samples/artprov/makefile.bcc
+++ b/samples/artprov/makefile.bcc
@@ -183,7 +183,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/artprov/makefile.gcc b/samples/artprov/makefile.gcc
index bada2ebcd7dab49e43ed000688ca13f499b3492b..e32567c8821ef9bf289a0494cffaf54d06c6fae6 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/artprov/makefile.vc b/samples/artprov/makefile.vc
index d8798ab7a82dab268c7c335c562d7ba99e3eef25..2a4535eabeeeb8ef2b4d7bea50555376a16abb4f 100644 (file)
--- a/samples/artprov/makefile.vc
+++ b/samples/artprov/makefile.vc
@@ -320,7 +320,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/artprov/makefile.wat b/samples/artprov/makefile.wat
index 6b51ca9a2f30bf9a496f5328838c446142003109..a38ea4b2316a2e9eb0c16001a40e06cd35fef55c 100644 (file)
--- a/samples/artprov/makefile.wat
+++ b/samples/artprov/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/aui/makefile.bcc b/samples/aui/makefile.bcc
index 0597f463170dc29bd2d4cef883ef1682c91be589..bb8f5ab9015882b636961355ec4a5596fb4afb57 100644 (file)
--- a/samples/aui/makefile.bcc
+++ b/samples/aui/makefile.bcc
@@ -198,7 +198,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/aui/makefile.gcc b/samples/aui/makefile.gcc
index 8fa774ea33e9185256951fdcc4a64e9254600027..5e9f21165f3566aae771e7803ae86c30a62dbdf4 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/aui/makefile.vc b/samples/aui/makefile.vc
index b0bfd6f403529bf276148d2b0e5f7d01ddd5cf47..64d2678bd2abeee5f2b5ab3e637e500515d97f50 100644 (file)
--- a/samples/aui/makefile.vc
+++ b/samples/aui/makefile.vc
@@ -335,7 +335,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/aui/makefile.wat b/samples/aui/makefile.wat
index ee2d366981e6423d8a3be938713d090dd33fbc48..3528fa5b8ab8843c7d1b5d8ac98d100d72616145 100644 (file)
--- a/samples/aui/makefile.wat
+++ b/samples/aui/makefile.wat
@@ -178,8 +178,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/calendar/makefile.bcc b/samples/calendar/makefile.bcc
index 30781980bb8ccbf80278d179d0c39575e05f79de..f253ead9a5846fd868c7823f75162046373d8c2a 100644 (file)
--- a/samples/calendar/makefile.bcc
+++ b/samples/calendar/makefile.bcc
@@ -186,7 +186,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/calendar/makefile.gcc b/samples/calendar/makefile.gcc
index 9b85b1acc7485e3ce3ec1676806ae4312b8b15a3..e2c91a2e3b4fae37fdf029102a56cc14e749578b 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/calendar/makefile.vc b/samples/calendar/makefile.vc
index 0afc093a87590f361e37cdce0edd4fb75afee52c..052031c8460887c88feb4e933b1acec8b6743fd7 100644 (file)
--- a/samples/calendar/makefile.vc
+++ b/samples/calendar/makefile.vc
@@ -323,7 +323,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/calendar/makefile.wat b/samples/calendar/makefile.wat
index 9ad08bfc33d94904da8878475d3784fb86f52b07..c7c66a27dedfca98eb551f9077c4b5b1d46603e8 100644 (file)
--- a/samples/calendar/makefile.wat
+++ b/samples/calendar/makefile.wat
@@ -163,8 +163,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/caret/makefile.bcc b/samples/caret/makefile.bcc
index 72e9e594f1926e5cd658525335c5bc78b902e22d..e9173156223057bc1cf37222b678a3a94b5c3bde 100644 (file)
--- a/samples/caret/makefile.bcc
+++ b/samples/caret/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/caret/makefile.gcc b/samples/caret/makefile.gcc
index 7fb90e918024b9cda9c15c253fc56f9dda74e9f8..1f51605d640ce854a302568fc4c749d1a6565532 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/caret/makefile.vc b/samples/caret/makefile.vc
index dc4ae1a842b78fd60e2e7a09762513afd86785ac..beea744491d10d26c5ba02e10351c136e2f7ce26 100644 (file)
--- a/samples/caret/makefile.vc
+++ b/samples/caret/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/caret/makefile.wat b/samples/caret/makefile.wat
index 6c650f8bc462fdc0251e7dff709261477fe49af0..6f3e0e003f18c4136207b257d7168c1e31c28252 100644 (file)
--- a/samples/caret/makefile.wat
+++ b/samples/caret/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/clipboard/makefile.bcc b/samples/clipboard/makefile.bcc
index 230de0ea1b6e2179acfb85a1a0a41a9fe3c6d785..a47aa2bb067feb60a1f1f19f17326bc5f9836074 100644 (file)
--- a/samples/clipboard/makefile.bcc
+++ b/samples/clipboard/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/clipboard/makefile.gcc b/samples/clipboard/makefile.gcc
index a2411139bbcba885d52f01fb19253d45b832baa4..6b01f9d416aa5d0884494def10dd495786f141a3 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/clipboard/makefile.vc b/samples/clipboard/makefile.vc
index 7bb1fb96c926a3eb0deae1069f478d3e7b0494ca..d987c02e7ff490bb910a879bb8bb46e168116afa 100644 (file)
--- a/samples/clipboard/makefile.vc
+++ b/samples/clipboard/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/clipboard/makefile.wat b/samples/clipboard/makefile.wat
index 7c8262baa26524738b598087a7d13f40b81087d4..35d2a2e8540b86a47c1c8502af0f2d2dcee23cdb 100644 (file)
--- a/samples/clipboard/makefile.wat
+++ b/samples/clipboard/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/collpane/makefile.bcc b/samples/collpane/makefile.bcc
index 94b26ce1df0d578113b14b4fcc9622ef7fcc2316..ba7b7fd40f081b430979fced32c9b4fee6858de4 100644 (file)
--- a/samples/collpane/makefile.bcc
+++ b/samples/collpane/makefile.bcc
@@ -186,7 +186,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/collpane/makefile.gcc b/samples/collpane/makefile.gcc
index 46d834eb49b8d3f1b38b16b2d45c1ffc5038f791..7c248acd01b96d9a60a03eb1483a8fc99d6d5133 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/collpane/makefile.vc b/samples/collpane/makefile.vc
index 241244835db17b385e25393986f5a964f20ec06c..aa1c303df0632a105c76103dec8a7a7cbb6e19d6 100644 (file)
--- a/samples/collpane/makefile.vc
+++ b/samples/collpane/makefile.vc
@@ -323,7 +323,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/collpane/makefile.wat b/samples/collpane/makefile.wat
index ad3bad44816af67c786f7c2a100937e2181c463d..60fb5c6f04939199eb0c4f777a4f034641baca59 100644 (file)
--- a/samples/collpane/makefile.wat
+++ b/samples/collpane/makefile.wat
@@ -163,8 +163,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/combo/makefile.bcc b/samples/combo/makefile.bcc
index 0650ca2449b54aa418db998e6ad332c38dfff90d..637390bbd1f523d266c6c8129748ef3d7567eb94 100644 (file)
--- a/samples/combo/makefile.bcc
+++ b/samples/combo/makefile.bcc
@@ -186,7 +186,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/combo/makefile.gcc b/samples/combo/makefile.gcc
index b76cac3f451301e14260fa074fd35579b542ea4b..2eba840449b1386fcecd3de778e12c5e48be9f70 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/combo/makefile.vc b/samples/combo/makefile.vc
index 7966acffb97cfe413725749e3d0d1ec05f9201f8..c3a3eaa9fdd9fb0bd9bea1650cea458349b79f27 100644 (file)
--- a/samples/combo/makefile.vc
+++ b/samples/combo/makefile.vc
@@ -323,7 +323,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/combo/makefile.wat b/samples/combo/makefile.wat
index 7982e2e144ec4a9b46aa9d8446d89d04354d4ec8..f07c95544698596c48b65b3aec3f839662c9bfaf 100644 (file)
--- a/samples/combo/makefile.wat
+++ b/samples/combo/makefile.wat
@@ -163,8 +163,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/config/makefile.bcc b/samples/config/makefile.bcc
index f34f20930bce48f804ff7f418b03712fcf08a58c..841c8ce1613985fee614057e516a2d0f2e6c5664 100644 (file)
--- a/samples/config/makefile.bcc
+++ b/samples/config/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/config/makefile.gcc b/samples/config/makefile.gcc
index ca41a9310f289ba3a89074966c79e7a3bb58ec48..925b664790d352703f35ca2fa36a063614386738 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/config/makefile.vc b/samples/config/makefile.vc
index b6c18638ba88b661586997f5a358357fd4e81d7a..51f53cad7cbb957311b5d1b4d7a349b356c4165b 100644 (file)
--- a/samples/config/makefile.vc
+++ b/samples/config/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/config/makefile.wat b/samples/config/makefile.wat
index ddb710d9e2149a610575e6066858c7dd231054ba..7ffc4187fc6636209a5b0f1c7c550eb755eab89f 100644 (file)
--- a/samples/config/makefile.wat
+++ b/samples/config/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/controls/makefile.bcc b/samples/controls/makefile.bcc
index e9378c1c44ea329d3d38c3a637cc0bdf1935caf7..6f443062e5cb4a80e01d224a81a25445683a1683 100644 (file)
--- a/samples/controls/makefile.bcc
+++ b/samples/controls/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/controls/makefile.gcc b/samples/controls/makefile.gcc
index 1cf8d01131775c3c1e0cb25b8f64a11119b2c06a..5c0b3009859e45e20c907d2ac3349852ed4e653e 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/controls/makefile.vc b/samples/controls/makefile.vc
index 86e3f47ee37069d4a534615b5e5c6c1b278cc4f9..bef01306625f1e4507249311e3f3f2b6f161baf6 100644 (file)
--- a/samples/controls/makefile.vc
+++ b/samples/controls/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/controls/makefile.wat b/samples/controls/makefile.wat
index a81f57ad94afc6231d7a7c53555a5fcaf8d91f2a..4900a695d7fd47201f23197a34975e5f104d9544 100644 (file)
--- a/samples/controls/makefile.wat
+++ b/samples/controls/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/dataview/makefile.bcc b/samples/dataview/makefile.bcc
index 28a1c048a8363bd37cd75764d8c072a468d08de2..f50b910bc58d5fcd1f8122958ed0bfa0daa76a40 100644 (file)
--- a/samples/dataview/makefile.bcc
+++ b/samples/dataview/makefile.bcc
@@ -187,7 +187,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/dataview/makefile.gcc b/samples/dataview/makefile.gcc
index 0c1823cee4bd6204ba974824a19bbe16daa294a5..87b8ca224b646ca1e1e3c99910792ca70063a892 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/dataview/makefile.vc b/samples/dataview/makefile.vc
index 700a5beab2c9a7d96168070a1661d4bc44d2b922..f5b12c8b669977444b3eb4ef8ccd7e03b5a59b07 100644 (file)
--- a/samples/dataview/makefile.vc
+++ b/samples/dataview/makefile.vc
@@ -324,7 +324,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/dataview/makefile.wat b/samples/dataview/makefile.wat
index d0b31e054672b8c3d12b6ce5e5e285adef4d6039..a5d46a2a15518cd954d914ea0b9b695226f184d8 100644 (file)
--- a/samples/dataview/makefile.wat
+++ b/samples/dataview/makefile.wat
@@ -163,8 +163,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/debugrpt/makefile.bcc b/samples/debugrpt/makefile.bcc
index f4c2609ba42dfb10031664e7e259d9bba93b9486..7432e5ea974fbc902e1e45d6b28b9490650e2a0f 100644 (file)
--- a/samples/debugrpt/makefile.bcc
+++ b/samples/debugrpt/makefile.bcc
@@ -190,7 +190,7 @@ __WXLIB_XML_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/debugrpt/makefile.gcc b/samples/debugrpt/makefile.gcc
index 8867c46d4306c32b2f58fd305ba79425136bfdf6..b3bcca4dc6240998b6ab5ae3bb95543d63a2d419 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/debugrpt/makefile.vc b/samples/debugrpt/makefile.vc
index e2ffb456f9b56acf6276f2c928d01149b3e4c7c9..d2fd15892d791ec7cfeee32800eb5f7437e84ef4 100644 (file)
--- a/samples/debugrpt/makefile.vc
+++ b/samples/debugrpt/makefile.vc
@@ -327,7 +327,7 @@ __WXLIB_XML_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/debugrpt/makefile.wat b/samples/debugrpt/makefile.wat
index a56d087ffb364eded4cc5a8a998bc7c47f21dfb7..753252dca4df13b4af9bf4a76cf7251416a7a4bd 100644 (file)
--- a/samples/debugrpt/makefile.wat
+++ b/samples/debugrpt/makefile.wat
@@ -168,8 +168,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/dialogs/makefile.bcc b/samples/dialogs/makefile.bcc
index 74558623ca76483da842ecbb0ed75d3066ed68de..bdfa558aad89ad2deb7eb1310fe2a2b502139ad1 100644 (file)
--- a/samples/dialogs/makefile.bcc
+++ b/samples/dialogs/makefile.bcc
@@ -194,7 +194,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/dialogs/makefile.gcc b/samples/dialogs/makefile.gcc
index 675c0c9008f7b45a7003e0647d8564fefa3a172e..68c2c890f9030f11f9a73c9ec6a495c7d8137ef1 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/dialogs/makefile.vc b/samples/dialogs/makefile.vc
index 20dc5a65ed7463ee02e701de36ae417552355c28..237c620c6baae304a1e89f5666ce86a1c89674a1 100644 (file)
--- a/samples/dialogs/makefile.vc
+++ b/samples/dialogs/makefile.vc
@@ -331,7 +331,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/dialogs/makefile.wat b/samples/dialogs/makefile.wat
index e2fb08b42f4b228d36ea2d15b5781051c73a36d7..50e3188d6be11ff31be795defbf96195f27b1efa 100644 (file)
--- a/samples/dialogs/makefile.wat
+++ b/samples/dialogs/makefile.wat
@@ -173,8 +173,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/dialup/makefile.bcc b/samples/dialup/makefile.bcc
index acf81c505b93796efa78f36da30de37b26ca499d..095ad7dcdb635aa372d8173247cd2c779862ee87 100644 (file)
--- a/samples/dialup/makefile.bcc
+++ b/samples/dialup/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/dialup/makefile.gcc b/samples/dialup/makefile.gcc
index e761d43f9181e61293ac7644c0ae97c8e41cf26d..7b79b505765ccc5f9d07b3898e8a3d1db4e3f8d0 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/dialup/makefile.vc b/samples/dialup/makefile.vc
index bc261b9f802b487858a6c760c26e6650823ec1ca..1905d4219602ee7bd5742bc53d69210561bb49eb 100644 (file)
--- a/samples/dialup/makefile.vc
+++ b/samples/dialup/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/dialup/makefile.wat b/samples/dialup/makefile.wat
index 314eb4aa18795302b010e07697d6d8af4319a893..151893bb7e91e8d4930de7bd737446cd07f9d445 100644 (file)
--- a/samples/dialup/makefile.wat
+++ b/samples/dialup/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/display/makefile.bcc b/samples/display/makefile.bcc
index 4cc3f9f33dab2fed44648d931e3cd84a572e2644..ca8e2bdaca3650e380bcf43cd5134db527a9255d 100644 (file)
--- a/samples/display/makefile.bcc
+++ b/samples/display/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/display/makefile.gcc b/samples/display/makefile.gcc
index baba2ba7e6df766446e36d5c2d7a2664c0bccc47..abb75d79b38feb5e6c2ddffb93b3f6cbb9cf06aa 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/display/makefile.vc b/samples/display/makefile.vc
index 8e57b481e238811ee674a9e7089ce099e35af8ed..c94a35b25a8f67d478e503754e4e6b3f94f78e3b 100644 (file)
--- a/samples/display/makefile.vc
+++ b/samples/display/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/display/makefile.wat b/samples/display/makefile.wat
index 028a3ad276b61476497912231bddc1ea6f427e6d..eb39192d2b3908464aa734db138a3a490d52fc6f 100644 (file)
--- a/samples/display/makefile.wat
+++ b/samples/display/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/dll/makefile.bcc b/samples/dll/makefile.bcc
index 56975b38958930dd9457da97b8de929637e25c81..0ef3125fe7af4fbcb315c5da8dfe787ad290b674 100644 (file)
--- a/samples/dll/makefile.bcc
+++ b/samples/dll/makefile.bcc
@@ -168,7 +168,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/dll/makefile.gcc b/samples/dll/makefile.gcc
index 76625b0224114ad732d88eb1a2ce6310399fce25..9fdb01c7afc573a24fe00fdb588cdf4573e5bb16 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/dll/makefile.vc b/samples/dll/makefile.vc
index 1f8a07fffd47628d9abcb1b569cc13fa26b94540..cc10bd7cfd4b758f24fa82c8a1ad83512138189b 100644 (file)
--- a/samples/dll/makefile.vc
+++ b/samples/dll/makefile.vc
@@ -288,7 +288,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/dll/makefile.wat b/samples/dll/makefile.wat
index 02a7539e7c15d680a607fbcea5d4cd539619f8c2..4f652df00e3d4ab67d3592c3c1f1d34754777406 100644 (file)
--- a/samples/dll/makefile.wat
+++ b/samples/dll/makefile.wat
@@ -93,8 +93,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/dnd/makefile.bcc b/samples/dnd/makefile.bcc
index 796f6207e9ff69409cfbff3f92ae6a376b1e5d1e..6353612df0b61d4ca8f158fca6ecd8dfe7825069 100644 (file)
--- a/samples/dnd/makefile.bcc
+++ b/samples/dnd/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/dnd/makefile.gcc b/samples/dnd/makefile.gcc
index fe1546a79847ab7a5c9ba87f84c5e2f6abef3d7f..7c3223ce021b662168ce647ded10093b59b0abc6 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/dnd/makefile.vc b/samples/dnd/makefile.vc
index 2dc25746a0c435c235a9d0d259fdaf1102f5f90e..35f5b472110a66f1a7e66bc0ba176f71b65e312e 100644 (file)
--- a/samples/dnd/makefile.vc
+++ b/samples/dnd/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/dnd/makefile.wat b/samples/dnd/makefile.wat
index fb5f8926cd235ab83fc18cad88ad246859c4d761..0731479a10d508f81fbda256228b53ae5b6b2552 100644 (file)
--- a/samples/dnd/makefile.wat
+++ b/samples/dnd/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/docview/makefile.bcc b/samples/docview/makefile.bcc
index 8b632913d6615d9d50ee83c3f31fd21d4ebb3dbf..ec73d6aba744a835381affedc807e524741f2f3d 100644 (file)
--- a/samples/docview/makefile.bcc
+++ b/samples/docview/makefile.bcc
@@ -184,7 +184,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/docview/makefile.gcc b/samples/docview/makefile.gcc
index 5cc0a709f56a8ff4298c03cd7ea19c5e3609762f..09100f0cb9c63016c8700dce19cca65c0243b049 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/docview/makefile.vc b/samples/docview/makefile.vc
index 274ffd0d023343d9b666f2deb539e9176d096525..e5565a0603911a8c152ff3918d29c9ec94178d4d 100644 (file)
--- a/samples/docview/makefile.vc
+++ b/samples/docview/makefile.vc
@@ -321,7 +321,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/docview/makefile.wat b/samples/docview/makefile.wat
index d1b2d6fee4c83e4803b343440a3cf1202503ca61..6d7234e07780f200e3c425737614419a97799623 100644 (file)
--- a/samples/docview/makefile.wat
+++ b/samples/docview/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/dragimag/makefile.bcc b/samples/dragimag/makefile.bcc
index d79f8d78e1562e3647c07e759d4ee21399a89edc..03a1733f685bde277a9b25c7c2fb8c48105a1c08 100644 (file)
--- a/samples/dragimag/makefile.bcc
+++ b/samples/dragimag/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/dragimag/makefile.gcc b/samples/dragimag/makefile.gcc
index 60d3f9b8336d7f82f55edfa66f3a23d98bb1c96b..a4b0bc0aec94a4d0af5c19476863e09092bf9b29 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/dragimag/makefile.vc b/samples/dragimag/makefile.vc
index 54d2e188541242c721c109f9b97dd3c50786e8a0..824016eb4946de66cd983eda0aff475234de4080 100644 (file)
--- a/samples/dragimag/makefile.vc
+++ b/samples/dragimag/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/dragimag/makefile.wat b/samples/dragimag/makefile.wat
index 9498b00b726304ea6ffbd7e33b0816b36a6ef5ee..7fc5d70ce09d7c3755b60b64e63ca12ad3f3ef90 100644 (file)
--- a/samples/dragimag/makefile.wat
+++ b/samples/dragimag/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/drawing/makefile.bcc b/samples/drawing/makefile.bcc
index f3a0858bf596530de86720b52305e7cb44391f94..91319cb2cd759f8001dc4b91243109641507e85a 100644 (file)
--- a/samples/drawing/makefile.bcc
+++ b/samples/drawing/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/drawing/makefile.gcc b/samples/drawing/makefile.gcc
index 3b0b4e458e2ee3231de9854f05433fb6936c123b..69a71a40e4e9753c4d674aef7db9950abbd4ec8a 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/drawing/makefile.vc b/samples/drawing/makefile.vc
index f585f562bce7d15a974c6f6a450e773ba59b990b..d54796d95875beee0cb9d5e5b8d457c07081a74f 100644 (file)
--- a/samples/drawing/makefile.vc
+++ b/samples/drawing/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/drawing/makefile.wat b/samples/drawing/makefile.wat
index 23972e38fd4e8800261394bd49634a8ccd5bc613..53d55fd57aa5b82bd44bec9f6aeda3491ba6c419 100644 (file)
--- a/samples/drawing/makefile.wat
+++ b/samples/drawing/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/erase/makefile.bcc b/samples/erase/makefile.bcc
index 66981d2021558b6ef933a7fef1f9597a87b5cdcf..90fdda8dbd4e4d0b6aa495b7df00b4202b8b9a77 100644 (file)
--- a/samples/erase/makefile.bcc
+++ b/samples/erase/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/erase/makefile.gcc b/samples/erase/makefile.gcc
index 3c065b7b3f5a3ce8c23cac649c8c1b5d912d9cd2..ad154007d2d9ae9b320466a459c003e95805c5c7 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/erase/makefile.vc b/samples/erase/makefile.vc
index 736696807cc7fc738de0878f49455f6fdaada0a9..6aae223d25c18c92d2675e107b8b641da4fdd26c 100644 (file)
--- a/samples/erase/makefile.vc
+++ b/samples/erase/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/erase/makefile.wat b/samples/erase/makefile.wat
index 9cf0d668fd74d9a3e37bdc3af661c3d35c98631d..1ba2cd6eec357d7e742def73b18c3a97eec21c0c 100644 (file)
--- a/samples/erase/makefile.wat
+++ b/samples/erase/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/event/makefile.bcc b/samples/event/makefile.bcc
index 4d2b411e1bcdcdb3c2ef45193cecbd57743799fc..467e8224ce2d250eceeced74331c36e769803547 100644 (file)
--- a/samples/event/makefile.bcc
+++ b/samples/event/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/event/makefile.gcc b/samples/event/makefile.gcc
index acda2a49bc46559561e65953faca36b299e1eac5..4760c5350813aa997c8a74c6fc1aeb8e4c0976d7 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/event/makefile.vc b/samples/event/makefile.vc
index 6352010d6c1ff74f155e3307b6beac12dc1ed82e..778c0f667c5c9d7aecc82f76e31448809539d5ec 100644 (file)
--- a/samples/event/makefile.vc
+++ b/samples/event/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/event/makefile.wat b/samples/event/makefile.wat
index 60d67d30d3e19bcf70c43a290f846158bc9a8421..504d16dcfd2e3088565797efb7268bac68e82147 100644 (file)
--- a/samples/event/makefile.wat
+++ b/samples/event/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/except/makefile.bcc b/samples/except/makefile.bcc
index 0db32f6ccd8c2adf23d22a8f6312f0927e270c72..2963507cda1e795fba1b47ebdc7cb550393ce744 100644 (file)
--- a/samples/except/makefile.bcc
+++ b/samples/except/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/except/makefile.gcc b/samples/except/makefile.gcc
index d03429bc64acfa42fad155e5ea9ae45def85ec81..3d056630e8f8c71b32c65df0b66b0a4da991a204 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/except/makefile.vc b/samples/except/makefile.vc
index 66383939739a8ccee935fd4a197c9a456f7e06c3..d9291d9e30d376375a203ba466a11c7848ca488d 100644 (file)
--- a/samples/except/makefile.vc
+++ b/samples/except/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/except/makefile.wat b/samples/except/makefile.wat
index 58afc8ab19aa5a404926971251136450a6763713..0ae578ee60e583b59a7394e6a05cb4a2f814e486 100644 (file)
--- a/samples/except/makefile.wat
+++ b/samples/except/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/exec/makefile.bcc b/samples/exec/makefile.bcc
index 14a49f39b6162518f73b67681b8b0ab5a0edfd0c..175b17b4c157b85d3b4f4c51027e93670bf1fc5b 100644 (file)
--- a/samples/exec/makefile.bcc
+++ b/samples/exec/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/exec/makefile.gcc b/samples/exec/makefile.gcc
index b1d4f82b68cf3c3b8a58568b4605518edd7854c0..7899483604bd1a1f63d23c780dea0902f4d9c7ca 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/exec/makefile.vc b/samples/exec/makefile.vc
index e472f7d252324613f860cdcea5d2ec75922077c5..22782fbc40c08047a7da2baefac64ef16394df35 100644 (file)
--- a/samples/exec/makefile.vc
+++ b/samples/exec/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/exec/makefile.wat b/samples/exec/makefile.wat
index 6bc6bea62685b5f07cf591168506768a6911825e..ada1f3bbee16b92d4315239fce30b8fce4bc37df 100644 (file)
--- a/samples/exec/makefile.wat
+++ b/samples/exec/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/flash/makefile.vc b/samples/flash/makefile.vc
index ddd75d2c21641853302b8bcfa85d0609ea05bceb..57009935ddd9e6348369b1d107e99cf615cbb273 100644 (file)
--- a/samples/flash/makefile.vc
+++ b/samples/flash/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/font/makefile.bcc b/samples/font/makefile.bcc
index 91eeafab0ae1e37e9e3258f5ddbdae569f28ee1f..595969b714cebefe9c3a44aaf7aaf5a7bbad973f 100644 (file)
--- a/samples/font/makefile.bcc
+++ b/samples/font/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/font/makefile.gcc b/samples/font/makefile.gcc
index 1401d167548e5bf6ee1374ba762fa9052612c9e2..83ad6ebdbe29c4a7bae51b7038658f6307fe106a 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/font/makefile.vc b/samples/font/makefile.vc
index e40fc5f92e4ed878a86aff55b668971b832ce6ac..375a7b1fb20f401f8d03d721490757629b63699c 100644 (file)
--- a/samples/font/makefile.vc
+++ b/samples/font/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/font/makefile.wat b/samples/font/makefile.wat
index 3dd4caf9b7ffc4daa7e4b674501ec6121d3de464..9d7f40435241741e323b73038bbb51505258be0a 100644 (file)
--- a/samples/font/makefile.wat
+++ b/samples/font/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/fswatcher/makefile.bcc b/samples/fswatcher/makefile.bcc
index a4115721ab1d88185506bf8623b80b25bf43b156..408750c3a3924f342a860f55c5a24fa574bbb22c 100644 (file)
--- a/samples/fswatcher/makefile.bcc
+++ b/samples/fswatcher/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/fswatcher/makefile.gcc b/samples/fswatcher/makefile.gcc
index 01414243599ac25a493c57c883523317bd4f04e3..6bc2f1ce03f0628760c5eeeb683ca6d356bca6f0 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/fswatcher/makefile.vc b/samples/fswatcher/makefile.vc
index 990dcce4c8ca71f635b71bdb700723b1e1c5f04a..15ea392cb7353e806d707ef1ff112d3ac7c7ec8c 100644 (file)
--- a/samples/fswatcher/makefile.vc
+++ b/samples/fswatcher/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/fswatcher/makefile.wat b/samples/fswatcher/makefile.wat
index f4e256efe6e14df502b9eb4f52ba380962e6692f..9822d0b78124ec616128c560b6c5ade624f00746 100644 (file)
--- a/samples/fswatcher/makefile.wat
+++ b/samples/fswatcher/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/grid/makefile.bcc b/samples/grid/makefile.bcc
index 675489ed899d0dfe72f826bf2f6291f153361a4c..720b05a0e9b0f30f8974b0110bf951e0e40e87f8 100644 (file)
--- a/samples/grid/makefile.bcc
+++ b/samples/grid/makefile.bcc
@@ -186,7 +186,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/grid/makefile.gcc b/samples/grid/makefile.gcc
index d76c72b4fa4b3905511889331e73b4f5816053ae..180cb6751e4b75fc520fc0fd5a496cf73956511b 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/grid/makefile.vc b/samples/grid/makefile.vc
index df1276095cc82065943bd3f8aedea0d4e791b012..1bd4025def9d166f68bc94d9b23d30fb5ece30c8 100644 (file)
--- a/samples/grid/makefile.vc
+++ b/samples/grid/makefile.vc
@@ -323,7 +323,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/grid/makefile.wat b/samples/grid/makefile.wat
index 4c5e2fc901a58cded6d3b2c433c8121851aabf53..bdc150bdce4cb61c30511fb5819cc5000c426812 100644 (file)
--- a/samples/grid/makefile.wat
+++ b/samples/grid/makefile.wat
@@ -163,8 +163,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/help/makefile.bcc b/samples/help/makefile.bcc
index 4c039f859a702f9c85d0e273155412d1b34f1e6c..5f326fe21bd6a393c979f1500676524c3dec1771 100644 (file)
--- a/samples/help/makefile.bcc
+++ b/samples/help/makefile.bcc
@@ -190,7 +190,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/help/makefile.gcc b/samples/help/makefile.gcc
index 4e61487cfaa178c938edc670df5970510ccd87f5..bbf08f201448c339046d3e98dd1017baa4322ff9 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/help/makefile.vc b/samples/help/makefile.vc
index e7b6843d8597499e74b7210237a0ae16adf40fef..eb9ea10ae46a03410ac306db174dc05736c8f09a 100644 (file)
--- a/samples/help/makefile.vc
+++ b/samples/help/makefile.vc
@@ -327,7 +327,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/help/makefile.wat b/samples/help/makefile.wat
index 7398180ce4871e37279c3f5878e04bcfda5fb401..7168258af4611d0c0a3c2a553eaafc3ca06ea77b 100644 (file)
--- a/samples/help/makefile.wat
+++ b/samples/help/makefile.wat
@@ -168,8 +168,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/htlbox/makefile.bcc b/samples/htlbox/makefile.bcc
index 891203b5f36c75d8270ef7c5cb3fdcae66849723..6a539e29d6eff4934366a22fc923b93ae8974588 100644 (file)
--- a/samples/htlbox/makefile.bcc
+++ b/samples/htlbox/makefile.bcc
@@ -186,7 +186,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/htlbox/makefile.gcc b/samples/htlbox/makefile.gcc
index c475e64ba1353034253066f6685d460b37188ffc..2de892cef992db415499f4295871f1c807ac5c2c 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/htlbox/makefile.vc b/samples/htlbox/makefile.vc
index e0fcc704280b738e15c2ba3439770ffedf91a268..ec07e250799df4779889bc5c510abe2230208b3b 100644 (file)
--- a/samples/htlbox/makefile.vc
+++ b/samples/htlbox/makefile.vc
@@ -323,7 +323,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/htlbox/makefile.wat b/samples/htlbox/makefile.wat
index 94cc7ddee3c4277522e820d9843530577bea79de..cb3cb6fe5a8a7265fa231a36eedc96b21e3d9b7f 100644 (file)
--- a/samples/htlbox/makefile.wat
+++ b/samples/htlbox/makefile.wat
@@ -163,8 +163,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/html/about/makefile.bcc b/samples/html/about/makefile.bcc
index 4f286a6351ed7aa9e4782d3c759b6bb28f7fbfd1..895b413fde215d85224515f6197a2f723d61c634 100644 (file)
--- a/samples/html/about/makefile.bcc
+++ b/samples/html/about/makefile.bcc
@@ -186,7 +186,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/html/about/makefile.gcc b/samples/html/about/makefile.gcc
index 0012946856bed9d170007b06ae944075216ab8bf..a441cd2d6fbe167f6c583eeebd29a5227d74d864 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/html/about/makefile.vc b/samples/html/about/makefile.vc
index 762cd83674f02a9cd78c87fd020d744e14faaa25..4e2895d9b4359f60990684176bccc39775844291 100644 (file)
--- a/samples/html/about/makefile.vc
+++ b/samples/html/about/makefile.vc
@@ -323,7 +323,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/html/about/makefile.wat b/samples/html/about/makefile.wat
index 3642e4edac880422490d1b84667d6bd9bcd6f9b0..63d05578de1f65bcf44d0c2266afc4c2ecd8b8bc 100644 (file)
--- a/samples/html/about/makefile.wat
+++ b/samples/html/about/makefile.wat
@@ -163,8 +163,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/html/help/makefile.bcc b/samples/html/help/makefile.bcc
index 826c6f3d63edbdd62cebf674838ec56314c3663b..2feeb6d39e2f2baffcdb1c0b407586c441f0143e 100644 (file)
--- a/samples/html/help/makefile.bcc
+++ b/samples/html/help/makefile.bcc
@@ -186,7 +186,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/html/help/makefile.gcc b/samples/html/help/makefile.gcc
index 6630940a55c82614342d2385cdc0ccdd99b2e51f..001bffdd4b949e15a4d44a01f591cd045a18ace5 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/html/help/makefile.vc b/samples/html/help/makefile.vc
index b6c2f6d6ae035217ded24871ab51c3bcf28d0775..ffc1773d626890f1656bf8d57176bcb8c4c80aaf 100644 (file)
--- a/samples/html/help/makefile.vc
+++ b/samples/html/help/makefile.vc
@@ -323,7 +323,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/html/help/makefile.wat b/samples/html/help/makefile.wat
index e5091d6a7cbe0f77f127e5798e5bb978e57b46d0..f18a1a2698f66857cdd14aba134e9d1dd712eea9 100644 (file)
--- a/samples/html/help/makefile.wat
+++ b/samples/html/help/makefile.wat
@@ -163,8 +163,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/html/helpview/makefile.bcc b/samples/html/helpview/makefile.bcc
index de62718fdac085ae5cb56737c768b029514fd334..7c454ee17cea599d63c87d54bac113a4d8d8c497 100644 (file)
--- a/samples/html/helpview/makefile.bcc
+++ b/samples/html/helpview/makefile.bcc
@@ -186,7 +186,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/html/helpview/makefile.gcc b/samples/html/helpview/makefile.gcc
index 214e05001f0032300e382c563598cc4d6ebf7180..428983e0473ef616c7aa816a28ef42b0fced232b 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/html/helpview/makefile.vc b/samples/html/helpview/makefile.vc
index 44956039e16f38b0d0850e1024282f7f9762ff56..09e1ea4fb1731c3a1a302af3f86be601e361e232 100644 (file)
--- a/samples/html/helpview/makefile.vc
+++ b/samples/html/helpview/makefile.vc
@@ -323,7 +323,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/html/helpview/makefile.wat b/samples/html/helpview/makefile.wat
index fe40ecc0a727d9eb7c3cd25a74dfeca23ec263f0..0113878cfb737fc2ede9a30302763ba8a914fe41 100644 (file)
--- a/samples/html/helpview/makefile.wat
+++ b/samples/html/helpview/makefile.wat
@@ -163,8 +163,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/html/printing/makefile.bcc b/samples/html/printing/makefile.bcc
index 45f0401fe138ef34d70d3aacbb37dc12ada57492..e0668f1dc087a209dd6379e338d3fa11b985a662 100644 (file)
--- a/samples/html/printing/makefile.bcc
+++ b/samples/html/printing/makefile.bcc
@@ -186,7 +186,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/html/printing/makefile.gcc b/samples/html/printing/makefile.gcc
index e27c03c410e8de91a3ac7d64380f0809a54f619a..e08870804f95e13f1acfcc17b32cd79473bcc4f8 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/html/printing/makefile.vc b/samples/html/printing/makefile.vc
index ac563e6fd03eb185df00fa258811af563c59f422..5f24551a3fd49a99c43474195c800647babc3837 100644 (file)
--- a/samples/html/printing/makefile.vc
+++ b/samples/html/printing/makefile.vc
@@ -323,7 +323,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/html/printing/makefile.wat b/samples/html/printing/makefile.wat
index 72b575298cfc10d6f1bb9ffec74d6cc09fdac06e..b199548685df48af58276e4af642ce43cb52f29c 100644 (file)
--- a/samples/html/printing/makefile.wat
+++ b/samples/html/printing/makefile.wat
@@ -163,8 +163,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/html/test/makefile.bcc b/samples/html/test/makefile.bcc
index 5a1b63ee6a2c30fafcb5b226bd17dfc3fda72992..c15d08654a9de37b8d3ed479e6d33cc793fbb8e4 100644 (file)
--- a/samples/html/test/makefile.bcc
+++ b/samples/html/test/makefile.bcc
@@ -190,7 +190,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/html/test/makefile.gcc b/samples/html/test/makefile.gcc
index 4d14d451d303066cf6907eb1899fa72260c87307..0b2614903846686932b4eb51002ac7a8d0548a08 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/html/test/makefile.vc b/samples/html/test/makefile.vc
index 11fe03897bd0e8dab02cc55599a09a77c5e09edf..72ebce1d704c6e5ca28a7c5a4d93123c0f04e34e 100644 (file)
--- a/samples/html/test/makefile.vc
+++ b/samples/html/test/makefile.vc
@@ -327,7 +327,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/html/test/makefile.wat b/samples/html/test/makefile.wat
index 8cb16382ddb94f8068a5726396fbe51ee2bca96e..93dd5a1f802f7e0885bd057f644e464c74d9804f 100644 (file)
--- a/samples/html/test/makefile.wat
+++ b/samples/html/test/makefile.wat
@@ -168,8 +168,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/html/virtual/makefile.bcc b/samples/html/virtual/makefile.bcc
index 7444670077343a4b5ece9743c3a365c7c8c1ad3c..feb5332accfb012e6b3fffbaaea1198ca2a08fb6 100644 (file)
--- a/samples/html/virtual/makefile.bcc
+++ b/samples/html/virtual/makefile.bcc
@@ -186,7 +186,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/html/virtual/makefile.gcc b/samples/html/virtual/makefile.gcc
index ed625916cc2c9936805812bdee626e64bd814341..304221c2bce02a3dfe1adadb35376a183ea96532 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/html/virtual/makefile.vc b/samples/html/virtual/makefile.vc
index 1b0ddf467ee1e0b30b3f76dacaca91ad886b7841..e4488e3af87b0b86483ccfc09f35eaf787e3c5b8 100644 (file)
--- a/samples/html/virtual/makefile.vc
+++ b/samples/html/virtual/makefile.vc
@@ -323,7 +323,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/html/virtual/makefile.wat b/samples/html/virtual/makefile.wat
index ef3a9072313da01a65bbdd5360a709dea34d9241..ab6381a6cdfc18224ca5f21582755b24ce577903 100644 (file)
--- a/samples/html/virtual/makefile.wat
+++ b/samples/html/virtual/makefile.wat
@@ -163,8 +163,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/html/widget/makefile.bcc b/samples/html/widget/makefile.bcc
index 0ae658e7634ff05ea408254a59ecee8ce79f276e..8f8742b07c3559bb56a2fd1ee9afefabe98d821f 100644 (file)
--- a/samples/html/widget/makefile.bcc
+++ b/samples/html/widget/makefile.bcc
@@ -186,7 +186,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/html/widget/makefile.gcc b/samples/html/widget/makefile.gcc
index 1d6996f3b89ee1a2d924a79597917f687eab6572..12b2610cf173263a2376ede811ccbf088785e946 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/html/widget/makefile.vc b/samples/html/widget/makefile.vc
index 19fb456be986b5e91d295b77a9658e12752551e5..9683cc4084c1b63acdb6ec1bdafd28eb105f5f70 100644 (file)
--- a/samples/html/widget/makefile.vc
+++ b/samples/html/widget/makefile.vc
@@ -323,7 +323,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/html/widget/makefile.wat b/samples/html/widget/makefile.wat
index 4ae8613958807bc45aef0393b04a7438e27471f8..0ba703e8bb9516d6c531cce3c495597d9e96569d 100644 (file)
--- a/samples/html/widget/makefile.wat
+++ b/samples/html/widget/makefile.wat
@@ -163,8 +163,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/html/zip/makefile.bcc b/samples/html/zip/makefile.bcc
index 99889abebd13cc6f5ad79969bd5d4bd8706ad754..461cbdac6fd7756692b0bb382a7ee5278d8cb1ea 100644 (file)
--- a/samples/html/zip/makefile.bcc
+++ b/samples/html/zip/makefile.bcc
@@ -186,7 +186,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/html/zip/makefile.gcc b/samples/html/zip/makefile.gcc
index 3cc6295d81a9be9cd094e7b6b72eae3a48530064..cb169e6457f530dd395aa7a3d81bf1e30823f098 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/html/zip/makefile.vc b/samples/html/zip/makefile.vc
index c493afcea26be7ba75d026274e884f944c00c8d5..763f230d1a4b6de9fa2f55f354226fcca742c874 100644 (file)
--- a/samples/html/zip/makefile.vc
+++ b/samples/html/zip/makefile.vc
@@ -323,7 +323,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/html/zip/makefile.wat b/samples/html/zip/makefile.wat
index 1f627c9dc07670b08157cbf8714823f55d7e661b..619ab90d1675b4946368dc658594aa6c15f17268 100644 (file)
--- a/samples/html/zip/makefile.wat
+++ b/samples/html/zip/makefile.wat
@@ -163,8 +163,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/image/makefile.bcc b/samples/image/makefile.bcc
index 02295c3809684d1319ef701759fa131a35f48c96..1d12a3a4b8620fa2eba4422de71359793422f6f2 100644 (file)
--- a/samples/image/makefile.bcc
+++ b/samples/image/makefile.bcc
@@ -183,7 +183,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/image/makefile.gcc b/samples/image/makefile.gcc
index 4eee6fd3253e911776c56f7e13ccdd102ad02ba3..6a6170d5ccb89f2e829f11f72f8573de88a30251 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/image/makefile.vc b/samples/image/makefile.vc
index 155b5707d7330a35c5d0d2a9fb55826aef627267..a74ecfa632595d78a12541abe4036fda56ed8f99 100644 (file)
--- a/samples/image/makefile.vc
+++ b/samples/image/makefile.vc
@@ -320,7 +320,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/image/makefile.wat b/samples/image/makefile.wat
index 191babf79943b9bfe7bab6145f883159357cf92b..d6ac3a10b81eaa9e087958557219f63fbb01a9f8 100644 (file)
--- a/samples/image/makefile.wat
+++ b/samples/image/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/internat/makefile.bcc b/samples/internat/makefile.bcc
index 8eda5f0ed08a18cace683394bee6d9459b1391f1..e6d5a6d41f9055648367e16fdbf2d182d45013fa 100644 (file)
--- a/samples/internat/makefile.bcc
+++ b/samples/internat/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/internat/makefile.gcc b/samples/internat/makefile.gcc
index 5bcdb62f390726279873c74731defcc80b4495f9..15aef86e39b7473cb423b4eab39cd06d4d2397f6 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/internat/makefile.vc b/samples/internat/makefile.vc
index edb0741af296d9005da4189a826608a817a39daa..110914d327d9f6436d5a860543f8262cc0ff969e 100644 (file)
--- a/samples/internat/makefile.vc
+++ b/samples/internat/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/internat/makefile.wat b/samples/internat/makefile.wat
index f534d2c72f31b32fe3d825bd7761e0daf015de5b..88e73ebf5347412bf373868c37af9fe95513189f 100644 (file)
--- a/samples/internat/makefile.wat
+++ b/samples/internat/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/ipc/makefile.bcc b/samples/ipc/makefile.bcc
index 3adf5a712f9b0f4067d9318b4bce9fa02d9fc4ff..9be80c5c74f105171bbd1f0a28eee9e2e7c9063d 100644 (file)
--- a/samples/ipc/makefile.bcc
+++ b/samples/ipc/makefile.bcc
@@ -150,7 +150,7 @@ __DLLFLAG_p_0 = -dWXUSINGDLL
 __WXLIB_CORE_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/ipc/makefile.gcc b/samples/ipc/makefile.gcc
index 43113ef8bd4ffaa72790c313ef49cd9c685cd7a7..5acd9797346e26394aa57bf8acfc7c43cdd7b63c 100644 (file)
--- 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\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/ipc/makefile.vc b/samples/ipc/makefile.vc
index 389cd861a89153d1f6c5bce33b01531e98939e5b..8bb4def88faf0c82ab3427928fcf280183a691f0 100644 (file)
--- a/samples/ipc/makefile.vc
+++ b/samples/ipc/makefile.vc
@@ -289,7 +289,7 @@ __DLLFLAG_p_0 = /d WXUSINGDLL
 __WXLIB_CORE_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/ipc/makefile.wat b/samples/ipc/makefile.wat
index ca9b0784a125cbbaf74444dab48748df64f2074a..c8630a4f0babd7bbbc3ea810899581558ff97774 100644 (file)
--- a/samples/ipc/makefile.wat
+++ b/samples/ipc/makefile.wat
@@ -95,8 +95,10 @@ __WXLIB_CORE_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/joytest/makefile.bcc b/samples/joytest/makefile.bcc
index dbe59f3e14ab53ae27f52e6c02ceed94e1527979..d65cde0aef8d65272ae789732cec98c4f766ac94 100644 (file)
--- a/samples/joytest/makefile.bcc
+++ b/samples/joytest/makefile.bcc
@@ -186,7 +186,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/joytest/makefile.gcc b/samples/joytest/makefile.gcc
index 8ba15283e5d2affaa26a87b1d4f7107e177a833d..7d2914e377f217cf45d6b56c5fa37dea1e98bdd3 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/joytest/makefile.vc b/samples/joytest/makefile.vc
index 479486ee5fff2486fdd2040e83fac52084cfc714..8ba302b6f7f7f9d2579ba3c2617454963e414133 100644 (file)
--- a/samples/joytest/makefile.vc
+++ b/samples/joytest/makefile.vc
@@ -323,7 +323,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/joytest/makefile.wat b/samples/joytest/makefile.wat
index fbdc3887b3d5ffe799db543d279d90a96dc33470..9902ff884cc8832d6bc2364111108e31f318cae8 100644 (file)
--- a/samples/joytest/makefile.wat
+++ b/samples/joytest/makefile.wat
@@ -163,8 +163,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/keyboard/makefile.bcc b/samples/keyboard/makefile.bcc
index e4e83f98103f6480bb0464870ad3980550c39b21..cc6c8ad0d6c325d6d767ac845ee8504dd5111784 100644 (file)
--- a/samples/keyboard/makefile.bcc
+++ b/samples/keyboard/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/keyboard/makefile.gcc b/samples/keyboard/makefile.gcc
index 803c056333f22fbb0b090d7d74cbd382c15c7fb6..46341973d5bf2ff7d240033eccaab28282115c91 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/keyboard/makefile.vc b/samples/keyboard/makefile.vc
index 1b56f1264ef1e71db73596fa1eb642705a2294e2..3e80b100daf5a02786e18726d4de9dc2c1bfa5a2 100644 (file)
--- a/samples/keyboard/makefile.vc
+++ b/samples/keyboard/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/keyboard/makefile.wat b/samples/keyboard/makefile.wat
index a41c6ae189ce70109b8bc67b1e7f1e99de9b5203..153a2ab7a0daef5dba4e6677f76dafc18be501ea 100644 (file)
--- a/samples/keyboard/makefile.wat
+++ b/samples/keyboard/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/layout/makefile.bcc b/samples/layout/makefile.bcc
index 4254572c67c2c352f2a7294c6beb227b832addbb..5cb9903f08b2d01eff44b7ff30e4f683178a7dcd 100644 (file)
--- a/samples/layout/makefile.bcc
+++ b/samples/layout/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/layout/makefile.gcc b/samples/layout/makefile.gcc
index e3bd2b1de73c8e1af85a81b3ab6c114ad44450b6..abbe796a574ba555fecdf715378cfea69d58f336 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/layout/makefile.vc b/samples/layout/makefile.vc
index 2f0781865c1e048fcd3f3b67151e0297ff47feb5..241d0117438f376d25d16b82ecbddf4b2125c205 100644 (file)
--- a/samples/layout/makefile.vc
+++ b/samples/layout/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/layout/makefile.wat b/samples/layout/makefile.wat
index cec2b3b5c15ce32eb0c415e3f2362d1b782b82f6..aab95ae9d114371f91267a8a869dbfc8891fea21 100644 (file)
--- a/samples/layout/makefile.wat
+++ b/samples/layout/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/listctrl/makefile.bcc b/samples/listctrl/makefile.bcc
index 1cba538e37cb7d6a690559b2c32ead12e4033d5d..530fc88042cd502ef9d21fc7eabf4623a98939e2 100644 (file)
--- a/samples/listctrl/makefile.bcc
+++ b/samples/listctrl/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/listctrl/makefile.gcc b/samples/listctrl/makefile.gcc
index aaf085c9527c0275ec2df31a2135c0adbd834f75..fa149eebc596ed59f58980b77c1836e6f83758a1 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/listctrl/makefile.vc b/samples/listctrl/makefile.vc
index b616d370925d9f056bef52687321f8b0639185f0..bcdf1c028652f150ef1e6c4484ccfd48100ae933 100644 (file)
--- a/samples/listctrl/makefile.vc
+++ b/samples/listctrl/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/listctrl/makefile.wat b/samples/listctrl/makefile.wat
index 331559b58f7a1c947d7b19dc184c2d88e3799c9d..41717d123fcb85fb4822af32b529d30eb4fd9edc 100644 (file)
--- a/samples/listctrl/makefile.wat
+++ b/samples/listctrl/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/mdi/makefile.bcc b/samples/mdi/makefile.bcc
index 2ea9af9a325d77e1a106cb06d12087705cf3f83b..30b11c32f611316ff43674a5a76ed3708dfae2f4 100644 (file)
--- a/samples/mdi/makefile.bcc
+++ b/samples/mdi/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/mdi/makefile.gcc b/samples/mdi/makefile.gcc
index 648254c946b1371b52bedefb1620ee1da37c8b18..c6f0d709c3882325e090960063a6fdbbb05c2c6f 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/mdi/makefile.vc b/samples/mdi/makefile.vc
index f81482036a68a93e473632d5bbbb42600eafb348..76e0af787f02c60b1001a669505d073a6adff44c 100644 (file)
--- a/samples/mdi/makefile.vc
+++ b/samples/mdi/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/mdi/makefile.wat b/samples/mdi/makefile.wat
index f012d6fec5d31e420faa8df3130ad20429c4f626..f70dd28df98bc198a0ec48e724e69308309d6a75 100644 (file)
--- a/samples/mdi/makefile.wat
+++ b/samples/mdi/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/mediaplayer/makefile.bcc b/samples/mediaplayer/makefile.bcc
index 4c8208917ca5ae3256a1ec289722b22f0492e2b0..0ac0f6dc97f22e5e253e35121cba54b2829f221f 100644 (file)
--- a/samples/mediaplayer/makefile.bcc
+++ b/samples/mediaplayer/makefile.bcc
@@ -186,7 +186,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/mediaplayer/makefile.gcc b/samples/mediaplayer/makefile.gcc
index f0abfdb59adf1d30d578c9bea9e6c3c73b977614..5b735946ce5854d2937e49829caa97768632e072 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/mediaplayer/makefile.vc b/samples/mediaplayer/makefile.vc
index eae9bc9a4bd30b71affb37a6f156419ac7dbbbc7..9bfdea777a0f424c4c45223724986576b30874a8 100644 (file)
--- a/samples/mediaplayer/makefile.vc
+++ b/samples/mediaplayer/makefile.vc
@@ -323,7 +323,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/mediaplayer/makefile.wat b/samples/mediaplayer/makefile.wat
index aae7f840370348282df8cb3d05f9aedbcf464855..898971a1e3970acb231c4410369823b71b1588a3 100644 (file)
--- a/samples/mediaplayer/makefile.wat
+++ b/samples/mediaplayer/makefile.wat
@@ -165,8 +165,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/memcheck/makefile.bcc b/samples/memcheck/makefile.bcc
index af7d3345133cf1963ad13b7c6952c476eaed531d..7966d5df3c848134138152d937b6f6a21307889c 100644 (file)
--- a/samples/memcheck/makefile.bcc
+++ b/samples/memcheck/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/memcheck/makefile.gcc b/samples/memcheck/makefile.gcc
index c7976b4d61022d8745dc0a3383f4f19200e1c1b2..fc692b44a795699e7f8567387f05b3fc61f504b8 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/memcheck/makefile.vc b/samples/memcheck/makefile.vc
index 084cd7ce85947e7622a5e6d1a8502f44edbabd53..87969f60ccd2ea62cc427c3087b45b382bf5b798 100644 (file)
--- a/samples/memcheck/makefile.vc
+++ b/samples/memcheck/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/memcheck/makefile.wat b/samples/memcheck/makefile.wat
index 1219c638bdcecc019d6f0f59e7f70794b1778d41..45ff8ac4e7d949a5d6badef5cdb8c3ce2525a14c 100644 (file)
--- a/samples/memcheck/makefile.wat
+++ b/samples/memcheck/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/menu/makefile.bcc b/samples/menu/makefile.bcc
index 5ea1d46753f845113f80b0fef772c4febcb69fc5..452caa917d14301b487242a4b88627113d7bfe78 100644 (file)
--- a/samples/menu/makefile.bcc
+++ b/samples/menu/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/menu/makefile.gcc b/samples/menu/makefile.gcc
index 99f8418240aab6fe2c547d7b6902fbd07b106579..247fbbc20b3c5f14ed67e725ad773ef2c62196dd 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/menu/makefile.vc b/samples/menu/makefile.vc
index 140c4dde1e46399804439684ad190971ea434ea2..85c677ea3f490b0881a79bda19afa502cf120ba6 100644 (file)
--- a/samples/menu/makefile.vc
+++ b/samples/menu/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/menu/makefile.wat b/samples/menu/makefile.wat
index 3f87c8471ba5b740bb3b74754127132257650c73..9e6c89ec5d6c94f871d2d064993c6714df83dc5f 100644 (file)
--- a/samples/menu/makefile.wat
+++ b/samples/menu/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/mfc/makefile.vc b/samples/mfc/makefile.vc
index 494606e7a436947405acaf9c47e3502e2f931f31..302c91745716eabff4a19b5ed7ed7761028b96ae 100644 (file)
--- a/samples/mfc/makefile.vc
+++ b/samples/mfc/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/minimal/makefile.bcc b/samples/minimal/makefile.bcc
index 1c0cd27fd1da305ad38451f06ff4fe0b0272ceab..297b155be7535a77e4676911f95fe6092753a36a 100644 (file)
--- a/samples/minimal/makefile.bcc
+++ b/samples/minimal/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/minimal/makefile.gcc b/samples/minimal/makefile.gcc
index cb8f8884cdd34adedf8fda201883bfff8795f637..1292b1984af1bd582d6fb3744d97da23be75acab 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/minimal/makefile.vc b/samples/minimal/makefile.vc
index 21f6c618d1dafba7ddd4ad1c3837f202b2ff42c3..d5bb537f7d257c9bec56a33629873de0b6b51902 100644 (file)
--- a/samples/minimal/makefile.vc
+++ b/samples/minimal/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/minimal/makefile.wat b/samples/minimal/makefile.wat
index 72ad96badc28611ebb413c95ef48006ff65e4fc4..ebf432ff39bee6656d70594f773c863e3b711c92 100644 (file)
--- a/samples/minimal/makefile.wat
+++ b/samples/minimal/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/nativdlg/makefile.bcc b/samples/nativdlg/makefile.bcc
index dc00743df131374c9c4ef76264d4453c80d8966d..d27a8228cedf66cc4486b7ccf4837b303c07e16a 100644 (file)
--- a/samples/nativdlg/makefile.bcc
+++ b/samples/nativdlg/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/nativdlg/makefile.gcc b/samples/nativdlg/makefile.gcc
index c54cd17a61e7b39ab8d50ec7bcad0c911c323e33..e8916c2e39585cf1374f1d73455c64aa2da65f24 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/nativdlg/makefile.vc b/samples/nativdlg/makefile.vc
index d92cc52f9297b8d4d48c931515d85919fb13385a..195e2b1a157de60cadbbb0d4e6967cd28225ef80 100644 (file)
--- a/samples/nativdlg/makefile.vc
+++ b/samples/nativdlg/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/nativdlg/makefile.wat b/samples/nativdlg/makefile.wat
index c61b6f16e5dc8cbc2f36cd9e1cbcdbbdf46f4443..2906c32a0d4a21c5a53194604b9500907ef825aa 100644 (file)
--- a/samples/nativdlg/makefile.wat
+++ b/samples/nativdlg/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/notebook/makefile.bcc b/samples/notebook/makefile.bcc
index b85f01b0ee7dd1cd4e9ab0cb031849fe2c3a3d7a..7ed232d5add813fb5d1fb9878db1af9791cfc515 100644 (file)
--- a/samples/notebook/makefile.bcc
+++ b/samples/notebook/makefile.bcc
@@ -198,7 +198,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/notebook/makefile.gcc b/samples/notebook/makefile.gcc
index ba4cea5de9f01cfdafbe679b2f668d050a4c8fc2..4689a88e242a08939f450f5a3ac779e386126b59 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/notebook/makefile.vc b/samples/notebook/makefile.vc
index 0c20de2edc9d97c71add1623a216622c04ef7dad..12e5ab7429e06cd45855a25e8965237105c51e57 100644 (file)
--- a/samples/notebook/makefile.vc
+++ b/samples/notebook/makefile.vc
@@ -335,7 +335,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/notebook/makefile.wat b/samples/notebook/makefile.wat
index d6e8119b640d4f6343eb5159f85d5b80b8fa8144..984bf98527cf733106c3bb201c593a3120d5b5b0 100644 (file)
--- a/samples/notebook/makefile.wat
+++ b/samples/notebook/makefile.wat
@@ -178,8 +178,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/oleauto/makefile.bcc b/samples/oleauto/makefile.bcc
index 5723b05d931eee93ca24a88056bfd189121f7152..f995324499fefbdbc494fc8c734c086f6d4d42b4 100644 (file)
--- a/samples/oleauto/makefile.bcc
+++ b/samples/oleauto/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/oleauto/makefile.gcc b/samples/oleauto/makefile.gcc
index 45444f1a7a131e5f41dc704c7f59e5e00a523a77..3fea4390bfb892eb190842ea44e99f0172e2c2ed 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/oleauto/makefile.vc b/samples/oleauto/makefile.vc
index 462d8993ab0d0ca537778d0d5acf5d2b88b26e7e..32f6e648efbee657a8ec119d4d90ad8227f9b7fc 100644 (file)
--- a/samples/oleauto/makefile.vc
+++ b/samples/oleauto/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/oleauto/makefile.wat b/samples/oleauto/makefile.wat
index 17308e235c60debbf5988660f665bc93008903a4..7647fbf8a1076910d1a3c9ebd44fcaebf5e9bef9 100644 (file)
--- a/samples/oleauto/makefile.wat
+++ b/samples/oleauto/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/opengl/cube/makefile.bcc b/samples/opengl/cube/makefile.bcc
index 969f16435e4ce515f8d61615badc85e578832df9..bf7da3ce4872fe73e9cea8c3935e64ff4c25d602 100644 (file)
--- a/samples/opengl/cube/makefile.bcc
+++ b/samples/opengl/cube/makefile.bcc
@@ -185,7 +185,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/opengl/cube/makefile.gcc b/samples/opengl/cube/makefile.gcc
index 407e6320e9fb10e9e8413e9bd2582d15740e99a7..ddf6e3ceedc6231cae14c36a9ddd75dfa46d840f 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/opengl/cube/makefile.vc b/samples/opengl/cube/makefile.vc
index ee2317a5f8525248fca2b29a93d6f4ffbfb56f79..f5f95ad86b4030a7845633c0fc03ed753f86c275 100644 (file)
--- a/samples/opengl/cube/makefile.vc
+++ b/samples/opengl/cube/makefile.vc
@@ -322,7 +322,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/opengl/cube/makefile.wat b/samples/opengl/cube/makefile.wat
index b439f3d680679f7ed754df58fe22cb37ae079a75..29023ca4826b15fffcbf80d8a307bc9a5852cd44 100644 (file)
--- a/samples/opengl/cube/makefile.wat
+++ b/samples/opengl/cube/makefile.wat
@@ -162,8 +162,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/opengl/isosurf/makefile.bcc b/samples/opengl/isosurf/makefile.bcc
index 3d18244596790d6b713f48fa6cc107f6f631d084..a6fb1c5656a719201a1106f533a90cd0d57dab4a 100644 (file)
--- a/samples/opengl/isosurf/makefile.bcc
+++ b/samples/opengl/isosurf/makefile.bcc
@@ -185,7 +185,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/opengl/isosurf/makefile.gcc b/samples/opengl/isosurf/makefile.gcc
index 25eb56e0526023b6b394c7e8ab29fcdc771e479a..1b09d979fb660cdf329c1fa50d0d32faf6a59687 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/opengl/isosurf/makefile.vc b/samples/opengl/isosurf/makefile.vc
index dbef38789a53830bf7341afd8ea1f07d2f0d28a9..4da1eec1a7fa6d05d998ab90f0ca1169025902fb 100644 (file)
--- a/samples/opengl/isosurf/makefile.vc
+++ b/samples/opengl/isosurf/makefile.vc
@@ -322,7 +322,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/opengl/isosurf/makefile.wat b/samples/opengl/isosurf/makefile.wat
index 81415e27f1b03a0674a3d7ef58aa4b2048c8442d..1d8c6e7bc7366acaf2c6d8c55cb99ca0ec9dcf7b 100644 (file)
--- a/samples/opengl/isosurf/makefile.wat
+++ b/samples/opengl/isosurf/makefile.wat
@@ -162,8 +162,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/opengl/penguin/makefile.bcc b/samples/opengl/penguin/makefile.bcc
index 7a4443c0958e8c9c82f7a034fc29f82e91aeade5..f05081c16ff3f866d71b93ff666045b62e82b0e3 100644 (file)
--- a/samples/opengl/penguin/makefile.bcc
+++ b/samples/opengl/penguin/makefile.bcc
@@ -194,7 +194,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/opengl/penguin/makefile.gcc b/samples/opengl/penguin/makefile.gcc
index 5fd42c6efbf01be8a6810855383965c21f67c040..32ce3846908e3d7e0c32ad782c658b696122f63f 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/opengl/penguin/makefile.vc b/samples/opengl/penguin/makefile.vc
index 7e9baef53f20010f2e030275453ada29a2fefce5..4ba0e2d77e1d036dfd65172f5083159ddb5ccb3d 100644 (file)
--- a/samples/opengl/penguin/makefile.vc
+++ b/samples/opengl/penguin/makefile.vc
@@ -334,7 +334,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/opengl/penguin/makefile.wat b/samples/opengl/penguin/makefile.wat
index 13f942261d8428fbe204e32946ec2abe35808bf0..8d52450b752fe013d42966b4d5687b0baec5f6ed 100644 (file)
--- a/samples/opengl/penguin/makefile.wat
+++ b/samples/opengl/penguin/makefile.wat
@@ -162,8 +162,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/ownerdrw/makefile.bcc b/samples/ownerdrw/makefile.bcc
index fdb3ad8e836c3a84910f05e7095bc867c82bc0ea..bbc83ccd48ed42f61de0b0ff5bac0718b0ce0486 100644 (file)
--- a/samples/ownerdrw/makefile.bcc
+++ b/samples/ownerdrw/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/ownerdrw/makefile.gcc b/samples/ownerdrw/makefile.gcc
index 3b401bbba2059773175dc163f92eb6fd92306ee5..9e0720bb284e1f1b73c4b1d0d6c6c175bc2f6a8d 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/ownerdrw/makefile.vc b/samples/ownerdrw/makefile.vc
index 8eb31e949dab36a618e3b255b4ad4013cb595e2d..174ef0fbe7e2530279ab9455ba4cb192bd61fbb9 100644 (file)
--- a/samples/ownerdrw/makefile.vc
+++ b/samples/ownerdrw/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/ownerdrw/makefile.wat b/samples/ownerdrw/makefile.wat
index e0244a0bfe8bcc8b32c093ed6d1ed6beda6924ef..e7d4103c73516aa97fe9be1c78663d5732efb9f1 100644 (file)
--- a/samples/ownerdrw/makefile.wat
+++ b/samples/ownerdrw/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/popup/makefile.bcc b/samples/popup/makefile.bcc
index 6c3883c7ec84a5745cbdfcbcfed85aee7c5d1f04..80b30a969515131663a0ac51dafc7735259ed817 100644 (file)
--- a/samples/popup/makefile.bcc
+++ b/samples/popup/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/popup/makefile.gcc b/samples/popup/makefile.gcc
index 2e533d1143b5cdf673fe71a61167dbe642205a86..9b58456d1cbc0ad224ca0993336206cb41e930d9 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/popup/makefile.vc b/samples/popup/makefile.vc
index ab0e711e37868ca9fb26c6f2b8bfccee866beceb..51495f4096d4c2652cd72ad26622ec58c8d3e1f7 100644 (file)
--- a/samples/popup/makefile.vc
+++ b/samples/popup/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/popup/makefile.wat b/samples/popup/makefile.wat
index de3013d9e9f7e2995d993acd94aefc62a47b1aa9..68b6939531f8b5b1c43138f6911d36a57f0c7c72 100644 (file)
--- a/samples/popup/makefile.wat
+++ b/samples/popup/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/power/makefile.bcc b/samples/power/makefile.bcc
index 2d85cb8dabf3ecf83360522985da420216d4eb86..d6d2a53d5bf14988ac4d6f1680ad1178ea7e0896 100644 (file)
--- a/samples/power/makefile.bcc
+++ b/samples/power/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/power/makefile.gcc b/samples/power/makefile.gcc
index 75ffa69600e0adcccc9c4c55c3165ce083c1a38b..e317bc48d7a57969e54d4f7d7a0fe2c5bc3fae31 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/power/makefile.vc b/samples/power/makefile.vc
index 773dd4fc83a0bae6d723e6ad532a4dc6efbd1dc2..2673677ee16982384fc76cb24036146eda89a7d9 100644 (file)
--- a/samples/power/makefile.vc
+++ b/samples/power/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/power/makefile.wat b/samples/power/makefile.wat
index 8c86bca7139cde818c037e8a6145079c43bf90d4..5804d22b7cda90b500f583e102ba0582cdedc668 100644 (file)
--- a/samples/power/makefile.wat
+++ b/samples/power/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/preferences/makefile.bcc b/samples/preferences/makefile.bcc
index 1b61525b8a5f6590ea53f9d7f863a1296367a25e..889a0f8777ef7f9c679141871ec251d65e2cd4ca 100644 (file)
--- a/samples/preferences/makefile.bcc
+++ b/samples/preferences/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/preferences/makefile.gcc b/samples/preferences/makefile.gcc
index 7a5e28b1109fb98df17a623c5f93ef961da63200..cf03b95dc96433f8abc6848ab6a04c0aefa7c875 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/preferences/makefile.vc b/samples/preferences/makefile.vc
index e70525fb8b15c5af4a6eda825f1859bfc502ccb9..806a79b6b91218350ce6bb161b1f6b05efb102f9 100644 (file)
--- a/samples/preferences/makefile.vc
+++ b/samples/preferences/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/preferences/makefile.wat b/samples/preferences/makefile.wat
index 1d6f507647ba3ce0553a11408a026c6cfea622b9..966c4b083d456cacdafeca1acd2312dd7700b841 100644 (file)
--- a/samples/preferences/makefile.wat
+++ b/samples/preferences/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/printing/makefile.bcc b/samples/printing/makefile.bcc
index f6ffffbaf2c567b1432e9bb74044eb2ee739a543..5eefe41039957cce60c754ad396a38b41f8e2754 100644 (file)
--- a/samples/printing/makefile.bcc
+++ b/samples/printing/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/printing/makefile.gcc b/samples/printing/makefile.gcc
index 2bc81769e2d86b408dcf5f0d290dce08fccbf81c..d69e1b38b27eaf55ac22612d9c12a8608c53311f 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/printing/makefile.vc b/samples/printing/makefile.vc
index 29dc91eeafd1e0da9b6319ff8463d766f021e89c..3cdb4335c7560a99c99f15e5169a13ace630a622 100644 (file)
--- a/samples/printing/makefile.vc
+++ b/samples/printing/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/printing/makefile.wat b/samples/printing/makefile.wat
index 98f6ed569df555f08ecdfb13fbe992a91b860877..806d2d16c6e88cd57506a0a09d0634984e7e9b66 100644 (file)
--- a/samples/printing/makefile.wat
+++ b/samples/printing/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/propgrid/makefile.bcc b/samples/propgrid/makefile.bcc
index b3bbf7b834b31fd1f38c7f309497f5bce22b3ca7..bdf2002f8eeb823d3c623b698bc1e46a31164f38 100644 (file)
--- a/samples/propgrid/makefile.bcc
+++ b/samples/propgrid/makefile.bcc
@@ -193,7 +193,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/propgrid/makefile.gcc b/samples/propgrid/makefile.gcc
index 9613a816fb24dd1170c1a2d503ae1bf0144d551c..842b9962f2dd0b5be6d439dcc208eea540590754 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/propgrid/makefile.vc b/samples/propgrid/makefile.vc
index 221d970e00f4b79469ed3fed0512de8d7c4c042d..2483820fa5b9ccfa50a471d0d00857914ffa78b8 100644 (file)
--- a/samples/propgrid/makefile.vc
+++ b/samples/propgrid/makefile.vc
@@ -330,7 +330,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/propgrid/makefile.wat b/samples/propgrid/makefile.wat
index 50628af1751e7abf0a8c37883d0fb4c452b398e6..b2b6098afa1f9494f812f470eb973f60911c64f1 100644 (file)
--- a/samples/propgrid/makefile.wat
+++ b/samples/propgrid/makefile.wat
@@ -168,8 +168,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/regtest/makefile.bcc b/samples/regtest/makefile.bcc
index 2e84f4b34839f3d81cb08cc2e98d9362b7967d9d..04c605d684cb8a57d11087649ec823cc0cfe836f 100644 (file)
--- a/samples/regtest/makefile.bcc
+++ b/samples/regtest/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/regtest/makefile.gcc b/samples/regtest/makefile.gcc
index 4fa72af6c91fe1644c33f37ace1557c8df003091..d8670f991ffcd9170ba3ccf799dd9009a7e87cd0 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/regtest/makefile.vc b/samples/regtest/makefile.vc
index 0c582dc32d740a91887f6b469b1fa12d331ec9f7..a3746ec0f8744e50f0f429f021e373e5af027b38 100644 (file)
--- a/samples/regtest/makefile.vc
+++ b/samples/regtest/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/regtest/makefile.wat b/samples/regtest/makefile.wat
index b1c4a6e7d5b6f7967983f7dba616edaaa71df8b3..89347a5ce53858679c20c018f7ab90dc1643d4ba 100644 (file)
--- a/samples/regtest/makefile.wat
+++ b/samples/regtest/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/render/makefile.bcc b/samples/render/makefile.bcc
index 8ea06b8a085154818613cfec9f372a052f37a9fc..d0fe412544d42b4242bdd1a1586186b9262a0b0e 100644 (file)
--- a/samples/render/makefile.bcc
+++ b/samples/render/makefile.bcc
@@ -201,7 +201,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/render/makefile.gcc b/samples/render/makefile.gcc
index e4c26070169346bda072e147ca080877a08d17c7..31612c39cd543fc8d235fde3eecc30f09651e0d9 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/render/makefile.vc b/samples/render/makefile.vc
index 8c1cda24055e897fb4ab2dfe7afb0727537e0bfd..74ea1d53559a0436591e58e7b7a4e2c8c90d9ad4 100644 (file)
--- a/samples/render/makefile.vc
+++ b/samples/render/makefile.vc
@@ -360,7 +360,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/render/makefile.wat b/samples/render/makefile.wat
index 2c59267e35a2e8548d58a1addad5fe2492fa0996..698313e223efae0828c72946cb1117b990ec92d8 100644 (file)
--- a/samples/render/makefile.wat
+++ b/samples/render/makefile.wat
@@ -209,8 +209,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/ribbon/makefile.bcc b/samples/ribbon/makefile.bcc
index 9b3aeffb73d392cdd718d59ac2e1a88a051c45ef..9f14a1870a36130e90f84c5cc7be1137a5aeac1c 100644 (file)
--- a/samples/ribbon/makefile.bcc
+++ b/samples/ribbon/makefile.bcc
@@ -190,7 +190,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/ribbon/makefile.gcc b/samples/ribbon/makefile.gcc
index e08115d66a1bdbc84ee040166375bcbc072b0969..fd0a8e31d92e6c661daf4bf4fc6fae10867d7f3a 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/ribbon/makefile.vc b/samples/ribbon/makefile.vc
index aaa735f64acdd2e4c207356ab342fd61372b93bd..6a82fcb8e21e0054702476726e3405a83e70f329 100644 (file)
--- a/samples/ribbon/makefile.vc
+++ b/samples/ribbon/makefile.vc
@@ -327,7 +327,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/ribbon/makefile.wat b/samples/ribbon/makefile.wat
index af251751e273c25ba093247428b8027c4ace83fa..76a9d0d6807f3f4000b02d4a3c65f68a3c938f09 100644 (file)
--- a/samples/ribbon/makefile.wat
+++ b/samples/ribbon/makefile.wat
@@ -168,8 +168,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/richtext/makefile.bcc b/samples/richtext/makefile.bcc
index 3209d02e26a6c5fed0ff5dd6cb02e35ec0295082..e22646664638b5992bc875071ce4c3965e637810 100644 (file)
--- a/samples/richtext/makefile.bcc
+++ b/samples/richtext/makefile.bcc
@@ -198,7 +198,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/richtext/makefile.gcc b/samples/richtext/makefile.gcc
index e29928bbd3a79b2c907573c130b8cb1d04dfa218..4a940959a01c700ed5fca5c2aedb528643fe5adf 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/richtext/makefile.vc b/samples/richtext/makefile.vc
index 7c1709ccec67237508860a6e30c71ad32edf332f..eae3d828e00f755013333f4e5ba49703f87a7f44 100644 (file)
--- a/samples/richtext/makefile.vc
+++ b/samples/richtext/makefile.vc
@@ -335,7 +335,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/richtext/makefile.wat b/samples/richtext/makefile.wat
index 4ea8b89a0c511761c40adce98ba7893ece460330..05446c5e31a57b190d1d966f0856b97aab8a00de 100644 (file)
--- a/samples/richtext/makefile.wat
+++ b/samples/richtext/makefile.wat
@@ -178,8 +178,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/sashtest/makefile.bcc b/samples/sashtest/makefile.bcc
index 7abb3a8c47d4988972d47bd0b1807c1bb40e22e3..f471eb6ed3797f9a437ec741c62b3de2f06e0b1d 100644 (file)
--- a/samples/sashtest/makefile.bcc
+++ b/samples/sashtest/makefile.bcc
@@ -186,7 +186,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/sashtest/makefile.gcc b/samples/sashtest/makefile.gcc
index fefeac37b100d3c61a4c57430837d08f135ea2bf..779e05940a782e1b4da939b1159375e3955096fe 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/sashtest/makefile.vc b/samples/sashtest/makefile.vc
index 367b9b9b8ac08213b25a5f3d362a117e6e7f59a4..8937a1c30d9dd5b6e7843bcc5d6a428c66d78425 100644 (file)
--- a/samples/sashtest/makefile.vc
+++ b/samples/sashtest/makefile.vc
@@ -323,7 +323,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/sashtest/makefile.wat b/samples/sashtest/makefile.wat
index 6e2b19118897a2c2570e5717177b718edd0a7315..48b5438434418a48a76e0dca19c82d437c299c8a 100644 (file)
--- a/samples/sashtest/makefile.wat
+++ b/samples/sashtest/makefile.wat
@@ -163,8 +163,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/scroll/makefile.bcc b/samples/scroll/makefile.bcc
index e912c64cc094d20214fba60c582a4106a568a241..9a6db4c9fd59ddd22d7bc6adc7fb1c4e1ef69726 100644 (file)
--- a/samples/scroll/makefile.bcc
+++ b/samples/scroll/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/scroll/makefile.gcc b/samples/scroll/makefile.gcc
index fd50c9cdb59a3ea5d704089f155f113f03c5be6c..953a7c95d62c7c617f28457b7f08e2f9f4313bfe 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/scroll/makefile.vc b/samples/scroll/makefile.vc
index 133172660a97c7722fd40aef79b0d6df1505ef2e..d61c1bc04bdec000ba22726496afc6f49fd4daac 100644 (file)
--- a/samples/scroll/makefile.vc
+++ b/samples/scroll/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/scroll/makefile.wat b/samples/scroll/makefile.wat
index 6a697840ebb28800e344280377f816dd8ef147a0..7161f71c9a0448065648c59fe433f207e1684484 100644 (file)
--- a/samples/scroll/makefile.wat
+++ b/samples/scroll/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/shaped/makefile.bcc b/samples/shaped/makefile.bcc
index 4e5cffd2d63fc71c9a5a3829cd825fa39441c5c1..db2b3acb0d3878626c71b385b5b8c0e53e14ccfe 100644 (file)
--- a/samples/shaped/makefile.bcc
+++ b/samples/shaped/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/shaped/makefile.gcc b/samples/shaped/makefile.gcc
index 363675d9736785ecdfdd8f3f82d3a031abf08521..75cf06d112992a6aa93b2c606ca85b2ffe692301 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/shaped/makefile.vc b/samples/shaped/makefile.vc
index 659d0e1c3fc9b7ff6cd2be4ecd2b38b5615a7331..c164d1877a7f24d23160c49ce70f307c304d397a 100644 (file)
--- a/samples/shaped/makefile.vc
+++ b/samples/shaped/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/shaped/makefile.wat b/samples/shaped/makefile.wat
index 02226583289d1831b0747ab9a2accf4e1e7d0a5f..7f3698e91328378e7d9ff4fc2a5091059820cf68 100644 (file)
--- a/samples/shaped/makefile.wat
+++ b/samples/shaped/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/sockets/makefile.bcc b/samples/sockets/makefile.bcc
index e59d460714745dcf9ca23f77281a529c8fd071be..714bcac03bbc3ec7aa0d62e3c04acd97ec59052f 100644 (file)
--- a/samples/sockets/makefile.bcc
+++ b/samples/sockets/makefile.bcc
@@ -150,7 +150,7 @@ __DLLFLAG_p_0 = -dWXUSINGDLL
 __WXLIB_CORE_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/sockets/makefile.gcc b/samples/sockets/makefile.gcc
index 6784d355f2fe010c71fc53ceb833a6a5ec62a3bb..2e75ef5f95836f4935086537f0d3359b3bbe8293 100644 (file)
--- 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\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/sockets/makefile.vc b/samples/sockets/makefile.vc
index 77a91f97653cfb6784f1844c5121ae22a66bd5b5..871c900a65ae8dab9f213e4e327629c248f1f364 100644 (file)
--- a/samples/sockets/makefile.vc
+++ b/samples/sockets/makefile.vc
@@ -289,7 +289,7 @@ __DLLFLAG_p_0 = /d WXUSINGDLL
 __WXLIB_CORE_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/sockets/makefile.wat b/samples/sockets/makefile.wat
index 78ff648e27b80fcbfc56ba524a71201634ce1ae7..85e92e7d166493e6d0d5944694a8187934164c1e 100644 (file)
--- a/samples/sockets/makefile.wat
+++ b/samples/sockets/makefile.wat
@@ -95,8 +95,10 @@ __WXLIB_CORE_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/sound/makefile.bcc b/samples/sound/makefile.bcc
index 72d40ccf0dd5c2c1476720cfd896c63329f40162..7b0a1c0fe617c77127dfb31acb5e025a0bc82fd5 100644 (file)
--- a/samples/sound/makefile.bcc
+++ b/samples/sound/makefile.bcc
@@ -186,7 +186,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/sound/makefile.gcc b/samples/sound/makefile.gcc
index 8ef0735be812c2c2df112cbfd486859b9bb9566c..e3a0d9976a698db326fb60bb15b9329118a3ac2f 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/sound/makefile.vc b/samples/sound/makefile.vc
index 59a128618a5a092dac9f255b83dcb57c63553fe1..9588213a89c766ab06b2c9a1d31a39cdc7532b02 100644 (file)
--- a/samples/sound/makefile.vc
+++ b/samples/sound/makefile.vc
@@ -323,7 +323,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/sound/makefile.wat b/samples/sound/makefile.wat
index b9762fb3e9bce5fa79414e8aa9719248446d1937..809a032db03802aa6161c2cc2b115f0fa3eedb43 100644 (file)
--- a/samples/sound/makefile.wat
+++ b/samples/sound/makefile.wat
@@ -163,8 +163,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/splash/makefile.bcc b/samples/splash/makefile.bcc
index f2ffefbf89aa41374bbe3a3b74246e818effc14f..bdcef7a107c67596c5be63942bd5052652995e03 100644 (file)
--- a/samples/splash/makefile.bcc
+++ b/samples/splash/makefile.bcc
@@ -190,7 +190,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/splash/makefile.gcc b/samples/splash/makefile.gcc
index 6e6f4c108101a05d74be8f1e8f061a5a3b1b157d..4fa158c1db4221aaced256e031cdb9fa19c36a79 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/splash/makefile.vc b/samples/splash/makefile.vc
index 1aed2141b8ca53d01f0c9674e4ed8e21357da6f0..35662628dd5a775f7f06f05f9df8eebcb1dc0862 100644 (file)
--- a/samples/splash/makefile.vc
+++ b/samples/splash/makefile.vc
@@ -327,7 +327,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/splash/makefile.wat b/samples/splash/makefile.wat
index 53169ae78ddc06f67d21feed9c5affb1ee64c560..ef1b4aafa098225fedb4d442a88a1c24eccccffa 100644 (file)
--- a/samples/splash/makefile.wat
+++ b/samples/splash/makefile.wat
@@ -170,8 +170,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/splitter/makefile.bcc b/samples/splitter/makefile.bcc
index 5d3ce6497f0afb6026ec2adb03fdd5071c85bb63..b6f0ea9dbf94bf9bb45106cd62bbab3ab293a76c 100644 (file)
--- a/samples/splitter/makefile.bcc
+++ b/samples/splitter/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/splitter/makefile.gcc b/samples/splitter/makefile.gcc
index d87c1cc9c1e1c09e418eda6d9daf66d67d1f5a14..7131039524f368d60c69e08b060468738ee1cba7 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/splitter/makefile.vc b/samples/splitter/makefile.vc
index 52550feeb432be87f6794177ea171634cd77693f..819a55565dc83f37c84388058836ddac288846d3 100644 (file)
--- a/samples/splitter/makefile.vc
+++ b/samples/splitter/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/splitter/makefile.wat b/samples/splitter/makefile.wat
index 877d01b2998350e43d99635aa21467e87b8f5be8..202d57c84b7e8dc54315bdc44c22438bc1a300c1 100644 (file)
--- a/samples/splitter/makefile.wat
+++ b/samples/splitter/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/statbar/makefile.bcc b/samples/statbar/makefile.bcc
index 3cde34182efff5649e26e957bfb3080709f9d8d4..375eb14bdfe671d6facb54ed8e96a388c965b67f 100644 (file)
--- a/samples/statbar/makefile.bcc
+++ b/samples/statbar/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/statbar/makefile.gcc b/samples/statbar/makefile.gcc
index 4f3ee904759a65d792a77ffb41fd896e88a38dea..ecd7232f3cfdcf0769b39590627fb96fe1fab8a5 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/statbar/makefile.vc b/samples/statbar/makefile.vc
index 0e5e3fba7329a6b4796bb4d9f5076111098ed84a..587907cabc7b5cd8b8973a6afd0b3daef468ada1 100644 (file)
--- a/samples/statbar/makefile.vc
+++ b/samples/statbar/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/statbar/makefile.wat b/samples/statbar/makefile.wat
index 5eeeaf38f06ac360b971f0df7e83f58825024b01..89ce42657a2528439928e1c286cbfd2e0bfd97cd 100644 (file)
--- a/samples/statbar/makefile.wat
+++ b/samples/statbar/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/stc/makefile.bcc b/samples/stc/makefile.bcc
index 561e65fb5971255595fba9cdf8a67e761d4bb938..30a0ae5e5742f69409d1edd63b2ec1a3b7c7053c 100644 (file)
--- a/samples/stc/makefile.bcc
+++ b/samples/stc/makefile.bcc
@@ -188,7 +188,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/stc/makefile.gcc b/samples/stc/makefile.gcc
index a5baa55bf7dcafadeeb29f0bf493c72475190e3a..6e5ddea7eb9e4c6cd1ce006a3567ca8f35b1f99e 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/stc/makefile.vc b/samples/stc/makefile.vc
index 236ca7389d7cb5143d88c179911453d6cee3802e..464ceeda658e4f2f029d7f80718eba58870f2819 100644 (file)
--- a/samples/stc/makefile.vc
+++ b/samples/stc/makefile.vc
@@ -325,7 +325,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/stc/makefile.wat b/samples/stc/makefile.wat
index e38c0471c9b37e7e9d9aef64745e035c08734193..34238f9e798f353ee1e064d58c36e197226c918b 100644 (file)
--- a/samples/stc/makefile.wat
+++ b/samples/stc/makefile.wat
@@ -163,8 +163,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/svg/makefile.bcc b/samples/svg/makefile.bcc
index 38b109b69f1eb897861deb19bcddd8639c33c484..4952fceebbdbb22819185303f3329db9f7a858ae 100644 (file)
--- a/samples/svg/makefile.bcc
+++ b/samples/svg/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/svg/makefile.gcc b/samples/svg/makefile.gcc
index b1a6950b8f5ccf5eb9c906b5b3a909481f2c0068..941cebe8c8596d9ce2c637d084a5108296c00681 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/svg/makefile.vc b/samples/svg/makefile.vc
index 0aa49c9223815cc6de47f28b9e26a5a69fa87dcf..b3153fc7bc58d7a2142267a1f46559bc1cb132cc 100644 (file)
--- a/samples/svg/makefile.vc
+++ b/samples/svg/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/svg/makefile.wat b/samples/svg/makefile.wat
index c085bb72ce36b0cdb1cbaab966e2f695e94ba0a8..e74e3784802110a5a8f4194408be836222648aa2 100644 (file)
--- a/samples/svg/makefile.wat
+++ b/samples/svg/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/taborder/makefile.bcc b/samples/taborder/makefile.bcc
index 069635399760567f29bd741fa7b68d60a0236abd..23f55721fcced13ec5c39466ecff4e8d7aec6eb9 100644 (file)
--- a/samples/taborder/makefile.bcc
+++ b/samples/taborder/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/taborder/makefile.gcc b/samples/taborder/makefile.gcc
index 51dbe0e2603cf7ca7ba132d8658809e743c9bc6b..4b8b5d7eff48cb3177c8ae5cebb10c601cf741cf 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/taborder/makefile.vc b/samples/taborder/makefile.vc
index 36f14aea764888263bea1d67c97794f62247046e..0f48858e0f4f5714405852b91422715e64feebbc 100644 (file)
--- a/samples/taborder/makefile.vc
+++ b/samples/taborder/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/taborder/makefile.wat b/samples/taborder/makefile.wat
index c17ce288d3c009f6f1bb7e198082e6752820f9c9..e3b9d392095e579c8412b4c5de453436ce6cbadc 100644 (file)
--- a/samples/taborder/makefile.wat
+++ b/samples/taborder/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/taskbar/makefile.bcc b/samples/taskbar/makefile.bcc
index 5dc07ddc9405ba0d65a925b29280775adb66f577..938a9f1beb0faabcfaf395a9bbee4eb2774972c8 100644 (file)
--- a/samples/taskbar/makefile.bcc
+++ b/samples/taskbar/makefile.bcc
@@ -186,7 +186,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/taskbar/makefile.gcc b/samples/taskbar/makefile.gcc
index 3518ccc3e09f24b31f55733feb40996bcb7cfece..910bf0c7603b558e32305d4b5f1f80bfda986d86 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/taskbar/makefile.vc b/samples/taskbar/makefile.vc
index 7cc135001872fb6d7b8cc1977a1caa5351d29e3c..da8b08e61c91f368e2501c0ddf033383bd5e00ef 100644 (file)
--- a/samples/taskbar/makefile.vc
+++ b/samples/taskbar/makefile.vc
@@ -323,7 +323,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/taskbar/makefile.wat b/samples/taskbar/makefile.wat
index 3400e68bf6c1fc981b3d5dda651169038996d62a..aa349b3da15090b0f0178d5d861a687eccf92252 100644 (file)
--- a/samples/taskbar/makefile.wat
+++ b/samples/taskbar/makefile.wat
@@ -163,8 +163,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/text/makefile.bcc b/samples/text/makefile.bcc
index 07a5f284c434ebb8bde67250bb9d1fb656530bf1..3d5ba316cd710e70b9a9268ce68441b99367c29d 100644 (file)
--- a/samples/text/makefile.bcc
+++ b/samples/text/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/text/makefile.gcc b/samples/text/makefile.gcc
index 1f5539470e1b4b7c9c0efc4eafafa8f257fd9826..832ac58a570711625729121a280cb9b7812ca26b 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/text/makefile.vc b/samples/text/makefile.vc
index b42ffa312a747f8062c32c49f95f958e14f1588c..65cc55e2f6e82e4cd5a2415ff71ae63abef985c0 100644 (file)
--- a/samples/text/makefile.vc
+++ b/samples/text/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/text/makefile.wat b/samples/text/makefile.wat
index a8dda06cca0847a852f1d58aad28aa0f4b28d7a5..f1021f214058a769f7a2d8fc3ace683cc1588c61 100644 (file)
--- a/samples/text/makefile.wat
+++ b/samples/text/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/thread/makefile.bcc b/samples/thread/makefile.bcc
index 40dc953797853d498a2dc58719ec1e2604e873ab..c1cd26f94afe0ee28abe4bcb0cf44f55c85ba320 100644 (file)
--- a/samples/thread/makefile.bcc
+++ b/samples/thread/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/thread/makefile.gcc b/samples/thread/makefile.gcc
index d5ec123ca396f87456cfa4412d960d124d3aa4fd..307d3ddc1229a4d15efdb8cfe409240f99d53c7f 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/thread/makefile.vc b/samples/thread/makefile.vc
index 1bb503d3ed1c21869e2b6d05687b2fcc16cbbdbc..805ce2deb9455f1ae1149713098b11291c96aa7a 100644 (file)
--- a/samples/thread/makefile.vc
+++ b/samples/thread/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/thread/makefile.wat b/samples/thread/makefile.wat
index a55ff9c7179a6c6ce2ce6b5e5e5df60a7c9c53d0..c2bab31b71fd391fc888f87b67c58a3763b265a9 100644 (file)
--- a/samples/thread/makefile.wat
+++ b/samples/thread/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/toolbar/makefile.bcc b/samples/toolbar/makefile.bcc
index e883cae07af548446710022270eea6003c35a015..07acba22a6dfb706a329cca11e1b01087e8ff000 100644 (file)
--- a/samples/toolbar/makefile.bcc
+++ b/samples/toolbar/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/toolbar/makefile.gcc b/samples/toolbar/makefile.gcc
index 5ba12ba18f94af2030d66a3123318d4bf14b6182..2967797ce632f10fce2c0da0e549c44906a3c72e 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/toolbar/makefile.vc b/samples/toolbar/makefile.vc
index 9a8d610ab0e0e7013324bd6cc875a3dff0b68325..d86c1860856fb501cd9eba3da4bcbf0b130bb1b4 100644 (file)
--- a/samples/toolbar/makefile.vc
+++ b/samples/toolbar/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/toolbar/makefile.wat b/samples/toolbar/makefile.wat
index 378ee76edcdcfa6228b4d029f31cff031a61334c..92c43cc0b68dc796dfed3feb64e2eaf7fb5b66c7 100644 (file)
--- a/samples/toolbar/makefile.wat
+++ b/samples/toolbar/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/treectrl/makefile.bcc b/samples/treectrl/makefile.bcc
index c94b908cb944e441a452be8b5cb751106f46d1ea..b46ffa085951aab4ea704b559f73f0c36b2c9376 100644 (file)
--- a/samples/treectrl/makefile.bcc
+++ b/samples/treectrl/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/treectrl/makefile.gcc b/samples/treectrl/makefile.gcc
index 41a8954789ad3f9ac9538b627a9463bb92758c1c..29173db5d01369081c728ae13c6c50e68dbad487 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/treectrl/makefile.vc b/samples/treectrl/makefile.vc
index 9e69f851fe1281159d1860edcbe116723364fa1d..90d5c4802b9e051d1714412de25403bd3f57207b 100644 (file)
--- a/samples/treectrl/makefile.vc
+++ b/samples/treectrl/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/treectrl/makefile.wat b/samples/treectrl/makefile.wat
index 588e7d1cfcc5dff466fc289135f4024d410b0d82..a3a476b260ee1a6fdcc466c4437c894652859a51 100644 (file)
--- a/samples/treectrl/makefile.wat
+++ b/samples/treectrl/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/treelist/makefile.bcc b/samples/treelist/makefile.bcc
index cae710fb975bd760fc73162b7420a7bcac237dc2..131e4302d22b3232cb38edc36962cca81f2d72ca 100644 (file)
--- a/samples/treelist/makefile.bcc
+++ b/samples/treelist/makefile.bcc
@@ -186,7 +186,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/treelist/makefile.gcc b/samples/treelist/makefile.gcc
index 36879c31ad9bcb8589ce918a8b5ec1a9dc6b305a..8bbac1035d5f0c5c084eb5146780e02cd24d317a 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/treelist/makefile.vc b/samples/treelist/makefile.vc
index f23661417f912eb9bc0d04298a39b88859e32321..340e2a264164474212ad21306cacae71e9eeeef6 100644 (file)
--- a/samples/treelist/makefile.vc
+++ b/samples/treelist/makefile.vc
@@ -323,7 +323,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/treelist/makefile.wat b/samples/treelist/makefile.wat
index a52de09c89f55d70a937bc7a8bab0e869bc0a84b..1e3d8901a028602948b99f047f8bfb2e6fad8467 100644 (file)
--- a/samples/treelist/makefile.wat
+++ b/samples/treelist/makefile.wat
@@ -163,8 +163,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/typetest/makefile.bcc b/samples/typetest/makefile.bcc
index 5a09d1a68043fa50c820fb2ff7b406c356d8fefe..935183911c9171b650bf6bafec7733bfaa751717 100644 (file)
--- a/samples/typetest/makefile.bcc
+++ b/samples/typetest/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/typetest/makefile.gcc b/samples/typetest/makefile.gcc
index c00686f1aa508fb74603ec7818e9c8399c7d2572..7d571af75831a0f3214b04ff3caa97279c0ad903 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/typetest/makefile.vc b/samples/typetest/makefile.vc
index dc91f71a2d21768e19257a1d2abaedfe613feef2..71624702396343133e1222e8766d8b557a889d44 100644 (file)
--- a/samples/typetest/makefile.vc
+++ b/samples/typetest/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/typetest/makefile.wat b/samples/typetest/makefile.wat
index 7e049f73e9aa1b3f0afc2711bd6ca7d265605939..aa2675dd4bfd2e9724980a3dde0dc7ccc38a044f 100644 (file)
--- a/samples/typetest/makefile.wat
+++ b/samples/typetest/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/uiaction/makefile.bcc b/samples/uiaction/makefile.bcc
index 25eb9180a2074e51ffcce25a6580f43af406d94c..3f1fda1bd6ab9f2f9db35551682f70fa4eac167d 100644 (file)
--- a/samples/uiaction/makefile.bcc
+++ b/samples/uiaction/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/uiaction/makefile.gcc b/samples/uiaction/makefile.gcc
index ff3228795bb27c8704259c498b294803e85dab8a..2657edf712629ce51089f11e6ef70d536c2e0935 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/uiaction/makefile.vc b/samples/uiaction/makefile.vc
index 48daf56f8ac0aa6b060bb3b89e853b53978a2818..11227942bf9ee1b83e5f828c05b3836bef2523a2 100644 (file)
--- a/samples/uiaction/makefile.vc
+++ b/samples/uiaction/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/uiaction/makefile.wat b/samples/uiaction/makefile.wat
index 7a29c8075ef16f2405ca80b31feaf82002a35875..c2f6e72abd30ae95402b1983447076592098866f 100644 (file)
--- a/samples/uiaction/makefile.wat
+++ b/samples/uiaction/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/validate/makefile.bcc b/samples/validate/makefile.bcc
index d48699cbda44d322d77b10c262f99c0eb5bdc70c..307f27442e3efdb4b44b7ffda74ae1500d3e6600 100644 (file)
--- a/samples/validate/makefile.bcc
+++ b/samples/validate/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/validate/makefile.gcc b/samples/validate/makefile.gcc
index 93b3bd84884c768ec0616b95214e0cfaefc82614..189f5a160c24c775e9fd74225bfc43a07b24e5fa 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/validate/makefile.vc b/samples/validate/makefile.vc
index 567751fefbab2b4ab72dca01893e7671aa04810c..dae890d83eee9d1b4cafd60df68d8eadb600bb8b 100644 (file)
--- a/samples/validate/makefile.vc
+++ b/samples/validate/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/validate/makefile.wat b/samples/validate/makefile.wat
index 0d138b80264e73ae0dab5042732d5a910a090901..24575cf2ad8d52bbc977b0f0d30cd90147292382 100644 (file)
--- a/samples/validate/makefile.wat
+++ b/samples/validate/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/vscroll/makefile.bcc b/samples/vscroll/makefile.bcc
index 0fca655919350d379be9f2cf764e9e85c04b3b88..c10e41ae52377e737ab96bdcc6f815a806d8b20d 100644 (file)
--- a/samples/vscroll/makefile.bcc
+++ b/samples/vscroll/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/vscroll/makefile.gcc b/samples/vscroll/makefile.gcc
index 3199362282b87c506323b781e778bca712e75f23..5fc584a4a33fe88a9b3de005792ee0c85c67b0dc 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/vscroll/makefile.vc b/samples/vscroll/makefile.vc
index ae4e84fadffdff766618188bfb72f8029c393da0..1141ebbef76cf7cce7154a8dda21750cbdbda298 100644 (file)
--- a/samples/vscroll/makefile.vc
+++ b/samples/vscroll/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/vscroll/makefile.wat b/samples/vscroll/makefile.wat
index f9eaa26e4143c6e91cd5f72fc248ae84038daa2e..98c80f9175b4924800b5b790928d37245e53dab4 100644 (file)
--- a/samples/vscroll/makefile.wat
+++ b/samples/vscroll/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/webview/makefile.bcc b/samples/webview/makefile.bcc
index 76a29e3df33b0fed65b2a863df2f01a4b8e225c8..95c73555527b6a66accb859bac91a04762a826ad 100644 (file)
--- a/samples/webview/makefile.bcc
+++ b/samples/webview/makefile.bcc
@@ -194,7 +194,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/webview/makefile.gcc b/samples/webview/makefile.gcc
index 9e1833cb03c82e5c737a169efd2fbf37d0eb7434..1a94dee36a00351e885c1c2f83b544816d0c6eaf 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/webview/makefile.vc b/samples/webview/makefile.vc
index 211fcec2da4da7fc9fb7fc0faac0cf558ee678e9..5cdb52646bb24c48879edfac2b6ed0847169b709 100644 (file)
--- a/samples/webview/makefile.vc
+++ b/samples/webview/makefile.vc
@@ -331,7 +331,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/webview/makefile.wat b/samples/webview/makefile.wat
index 562860b6897b38c0c5e859cfe26678b66e053e1a..d4aacaac7e354d45ff708edd65826bdd810ce547 100644 (file)
--- a/samples/webview/makefile.wat
+++ b/samples/webview/makefile.wat
@@ -175,8 +175,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/widgets/makefile.bcc b/samples/widgets/makefile.bcc
index 84005fe2c73d976bb690b7c34fadc1ca017a8d3d..9b753a33fc1f4b3b6ef9436b0f4e0d80a256a08b 100644 (file)
--- a/samples/widgets/makefile.bcc
+++ b/samples/widgets/makefile.bcc
@@ -214,7 +214,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/widgets/makefile.gcc b/samples/widgets/makefile.gcc
index d9cdb9bf6b4b00031625391d04191439417c375a..61fa36e3de9621848671f6953b981fe321a98483 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/widgets/makefile.vc b/samples/widgets/makefile.vc
index 8f04406bdd7f51e60bed78bda565c0fd9e837ad4..45d4c0def981d0b743d7816bc2bfd02ebf3af2f0 100644 (file)
--- a/samples/widgets/makefile.vc
+++ b/samples/widgets/makefile.vc
@@ -351,7 +351,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/widgets/makefile.wat b/samples/widgets/makefile.wat
index f10ed8bf2201c73e7e4f0de04e60c4ac8c84b6a3..415d058d7c78e76fb275cc0ab892721dff6a726f 100644 (file)
--- a/samples/widgets/makefile.wat
+++ b/samples/widgets/makefile.wat
@@ -163,8 +163,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/wizard/makefile.bcc b/samples/wizard/makefile.bcc
index f63da3ed0ce10e34d3cd5446601037f47a561177..7bfb73746e072aaaf0b4bf512cbf211e01ee9362 100644 (file)
--- a/samples/wizard/makefile.bcc
+++ b/samples/wizard/makefile.bcc
@@ -186,7 +186,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/wizard/makefile.gcc b/samples/wizard/makefile.gcc
index 321cba697bbb2af5e18da0ea538be29df569c95f..62d099eac82a45d9703eafe2b243126952b4afd1 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/wizard/makefile.vc b/samples/wizard/makefile.vc
index e1ed59ec42257034a29309a1d11da04cb052016a..567511853de9ec199c7bef97829cd03369f76741 100644 (file)
--- a/samples/wizard/makefile.vc
+++ b/samples/wizard/makefile.vc
@@ -323,7 +323,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/wizard/makefile.wat b/samples/wizard/makefile.wat
index f98f4d592034e77cf9e84985acbb68ce6a30445a..7bb6d6aae9d4e294d3c91ab1937e06bcbd586e23 100644 (file)
--- a/samples/wizard/makefile.wat
+++ b/samples/wizard/makefile.wat
@@ -163,8 +163,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/wrapsizer/makefile.bcc b/samples/wrapsizer/makefile.bcc
index 37ea250095ce24d81f51b91e5da2ed8c45446db1..c110fea88f086ece26809c7e3589d18c556617bc 100644 (file)
--- a/samples/wrapsizer/makefile.bcc
+++ b/samples/wrapsizer/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/wrapsizer/makefile.gcc b/samples/wrapsizer/makefile.gcc
index 8293e56f37bfc0bbcf213039663807cbdfcbd5d6..5a46f75bef88863d62e0251f551904ad8ee71361 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/wrapsizer/makefile.vc b/samples/wrapsizer/makefile.vc
index 6163400346d93108a76d56728868d52b71a638ae..adc8e94475f6ca6ad54433680617705b8f6efcca 100644 (file)
--- a/samples/wrapsizer/makefile.vc
+++ b/samples/wrapsizer/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/wrapsizer/makefile.wat b/samples/wrapsizer/makefile.wat
index 1e9367d15d55e4d43434b74511603ae2b570e7dd..1c154148f3346f830a439d7b69d60c643cef764e 100644 (file)
--- a/samples/wrapsizer/makefile.wat
+++ b/samples/wrapsizer/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/xrc/makefile.bcc b/samples/xrc/makefile.bcc
index 24f5d0027359c35c11c8f99f3a2c00d49a32e62e..bc3242b54b0269200ecd0bcba5bb53f4d7b83915 100644 (file)
--- a/samples/xrc/makefile.bcc
+++ b/samples/xrc/makefile.bcc
@@ -206,7 +206,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/xrc/makefile.gcc b/samples/xrc/makefile.gcc
index 60c60f62d3910f1e621d99ebab6f162ad0b4a0fa..f8ee559957c83fd71c80dc3be251117ab74daa66 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/xrc/makefile.vc b/samples/xrc/makefile.vc
index b6ed27fd958926e312ddb632c321b2c2c41fad22..a23a85603fc5dbe483b571d0eda87a5c2e6a5ba1 100644 (file)
--- a/samples/xrc/makefile.vc
+++ b/samples/xrc/makefile.vc
@@ -343,7 +343,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/xrc/makefile.wat b/samples/xrc/makefile.wat
index c52885a369de572f04fbeadedc0d6fb3556791e4..aa9239dfa7a4fb9620d7526e7353791c0fdf7daa 100644 (file)
--- a/samples/xrc/makefile.wat
+++ b/samples/xrc/makefile.wat
@@ -183,8 +183,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/samples/xti/makefile.bcc b/samples/xti/makefile.bcc
index f8ad77da0bcaff867ab552281b31c19692fcc834..641a6e63223b27633699eda3f2189e005ef145a9 100644 (file)
--- a/samples/xti/makefile.bcc
+++ b/samples/xti/makefile.bcc
@@ -188,7 +188,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/xti/makefile.gcc b/samples/xti/makefile.gcc
index c56b94093768c3cec14b1605ac0d6b4f8dbb57cc..47533b9a0a3f0f80fcfcc7ea9fbf2da37362c6df 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/samples/xti/makefile.vc b/samples/xti/makefile.vc
index f50096f91425b51c3f9f5119c24e44fe250a8656..1fb7ddfdc84c20db2a696c3786cf682c21f520a0 100644 (file)
--- a/samples/xti/makefile.vc
+++ b/samples/xti/makefile.vc
@@ -325,7 +325,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/samples/xti/makefile.wat b/samples/xti/makefile.wat
index 184c78efd046d7e9accce66bbc6f69670ff74f05..80b79aecfb0731f5f2790233bd29124a3474ecf2 100644 (file)
--- a/samples/xti/makefile.wat
+++ b/samples/xti/makefile.wat
@@ -163,8 +163,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/tests/benchmarks/makefile.bcc b/tests/benchmarks/makefile.bcc
index ff420e6cffbc144c67176ebb3be3ddc44da1d476..512f808b8bf5ec56b9abf42e9dfe7556449fe9a7 100644 (file)
--- a/tests/benchmarks/makefile.bcc
+++ b/tests/benchmarks/makefile.bcc
@@ -140,7 +140,7 @@ __DLLFLAG_p_3 = -dWXUSINGDLL
 __WXLIB_CORE_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/tests/benchmarks/makefile.gcc b/tests/benchmarks/makefile.gcc
index 437436918ddf4a1ffad000fdd437b825d66a2fa2..d96d6ada7bb38fb5c4f8d89659b1b85ab9b63063 100644 (file)
--- 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\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/tests/benchmarks/makefile.vc b/tests/benchmarks/makefile.vc
index 11be7fab301727de6d9a1198a9baa08952a8f325..9d28b26e35c5bc487a049876e98493cf0bc98714 100644 (file)
--- a/tests/benchmarks/makefile.vc
+++ b/tests/benchmarks/makefile.vc
@@ -234,7 +234,7 @@ __DLLFLAG_p_3 = /d WXUSINGDLL
 __WXLIB_CORE_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/tests/benchmarks/makefile.wat b/tests/benchmarks/makefile.wat
index c8474857ad3cfd98515a123151309e837d0d59b3..0ec083805999f791a77808ea318e7f8da63b51c6 100644 (file)
--- a/tests/benchmarks/makefile.wat
+++ b/tests/benchmarks/makefile.wat
@@ -92,8 +92,10 @@ __WXLIB_CORE_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/tests/makefile.bcc b/tests/makefile.bcc
index 6328a1813bd43dd4a165af8f15a0d098ad5c373c..17f4e2c29acd83851bb32116f11ccf1d0c919119 100644 (file)
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -321,7 +321,7 @@ __WXLIB_HTML_p = \
 __WXLIB_CORE_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index 13b4ebc306d985d4399cabcd128bf33ab4b3a03b..9354b5dd2873cfb7e0d723753f6c9d01551ca01d 100644 (file)
--- 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\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/tests/makefile.vc b/tests/makefile.vc
index 4cdc92534a51679936e28b13ef8ee0886fe4ad56..36c0ecce5cbf5bd81dd74b151cde4a01048bcd87 100644 (file)
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -416,7 +416,7 @@ __WXLIB_HTML_p = \
 __WXLIB_CORE_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/tests/makefile.wat b/tests/makefile.wat
index 3f2972d7e76e6624ba4b006ecfd2e62b29e78b7d..ed6db4428c08d21447c7431a083b5183a3445474 100644 (file)
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -121,8 +121,10 @@ __WXLIB_CORE_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/utils/emulator/src/makefile.bcc b/utils/emulator/src/makefile.bcc
index 40df6b6383998edd9026cba10cc2c266790d0ea2..6ef5534c0e8ce1114558da1733a24bf819aa5d36 100644 (file)
--- a/utils/emulator/src/makefile.bcc
+++ b/utils/emulator/src/makefile.bcc
@@ -182,7 +182,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/utils/emulator/src/makefile.gcc b/utils/emulator/src/makefile.gcc
index e6d063f3bef8f79bb2a734592ea247a483a00bb6..c1095117e224ed9bc0f38b7eb04b5fed1e9a5222 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/utils/emulator/src/makefile.vc b/utils/emulator/src/makefile.vc
index 0f771ed802f6f05429223c6af1d1f046cb8807d2..c41b63133819a3ef140138e08ad8361ed9469ba1 100644 (file)
--- a/utils/emulator/src/makefile.vc
+++ b/utils/emulator/src/makefile.vc
@@ -319,7 +319,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/utils/emulator/src/makefile.wat b/utils/emulator/src/makefile.wat
index 1bf6d20ba6d638ada4a070d6675a02d95a2f957b..dc0fb405519c8e21a2639fb557384de6e7889d05 100644 (file)
--- a/utils/emulator/src/makefile.wat
+++ b/utils/emulator/src/makefile.wat
@@ -158,8 +158,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/utils/helpview/src/makefile.bcc b/utils/helpview/src/makefile.bcc
index 793266d680d08ccb94aa498ea4fb7a8002c6168c..882251c26241c35b477d354d9c73886ef6330b61 100644 (file)
--- a/utils/helpview/src/makefile.bcc
+++ b/utils/helpview/src/makefile.bcc
@@ -190,7 +190,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/utils/helpview/src/makefile.gcc b/utils/helpview/src/makefile.gcc
index b3e508cc656e06f92e18b9cec0d1dae3b53ade1d..257373bf50e5aeb3e2efecd78753f5da14c08e23 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/utils/helpview/src/makefile.vc b/utils/helpview/src/makefile.vc
index b7b0f7c1880c5a738929de419224410e3b82b04c..0233e1e4d6a109323d2b7e8a503971567924cb30 100644 (file)
--- a/utils/helpview/src/makefile.vc
+++ b/utils/helpview/src/makefile.vc
@@ -327,7 +327,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/utils/helpview/src/makefile.wat b/utils/helpview/src/makefile.wat
index 9535587f6eee32019ce35426e5877fa108fce911..78fb95c6667d9d72460460f6cc1ef4d4997a2439 100644 (file)
--- a/utils/helpview/src/makefile.wat
+++ b/utils/helpview/src/makefile.wat
@@ -168,8 +168,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/utils/hhp2cached/makefile.bcc b/utils/hhp2cached/makefile.bcc
index 00a6ae008b68c908af59526841e4b114b1ca11af..14b19b2ef24060ea2009cd059634cf7e0cbe8e5e 100644 (file)
--- a/utils/hhp2cached/makefile.bcc
+++ b/utils/hhp2cached/makefile.bcc
@@ -186,7 +186,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/utils/hhp2cached/makefile.gcc b/utils/hhp2cached/makefile.gcc
index c703a2d8f66784c6dabeb63c37b3af6da5cf7f03..ef5c7b25826145105e3d4e06f8944f38b3455858 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/utils/hhp2cached/makefile.vc b/utils/hhp2cached/makefile.vc
index eb64ac0c229a75426aa3e7afc055dfa232aab9e6..1aa015a00a278833293c356e88869ac0ddf9db44 100644 (file)
--- a/utils/hhp2cached/makefile.vc
+++ b/utils/hhp2cached/makefile.vc
@@ -323,7 +323,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/utils/hhp2cached/makefile.wat b/utils/hhp2cached/makefile.wat
index b9fbc55823578d7d64b2d6fdb18230d1de5194fc..de43ad6c457ab5d834a71961b9d772686259ff33 100644 (file)
--- a/utils/hhp2cached/makefile.wat
+++ b/utils/hhp2cached/makefile.wat
@@ -163,8 +163,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

diff --git a/utils/screenshotgen/src/makefile.bcc b/utils/screenshotgen/src/makefile.bcc
index 5324f84bec77f3c8e960dcd50a8f63130a5e78fb..70d5ed5c4d5fb3cd5abf3e58c037d8b0c4629d0a 100644 (file)
--- a/utils/screenshotgen/src/makefile.bcc
+++ b/utils/screenshotgen/src/makefile.bcc
@@ -206,7 +206,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/utils/screenshotgen/src/makefile.gcc b/utils/screenshotgen/src/makefile.gcc
index a1ecfd44113fafd0395c3102a0a819b65a86e1a7..556a52dee6b3c7559b890cf204167b6749fdfbea 100644 (file)
--- 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)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
 endif\r
+endif
 ifeq ($(USE_GUI),1)\r
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
 endif\r

diff --git a/utils/screenshotgen/src/makefile.vc b/utils/screenshotgen/src/makefile.vc
index f4560c3101f418ea1981b365159f2f21f3c1bddc..ddaae34ac88e4eb07e82faf3ff4a15b110722b78 100644 (file)
--- a/utils/screenshotgen/src/makefile.vc
+++ b/utils/screenshotgen/src/makefile.vc
@@ -343,7 +343,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

diff --git a/utils/screenshotgen/src/makefile.wat b/utils/screenshotgen/src/makefile.wat
index bb09f1755962c1fc77d61f053754294f828661b3..1b8a4da889ffc93e694f472b161285731b38543b 100644 (file)
--- a/utils/screenshotgen/src/makefile.wat
+++ b/utils/screenshotgen/src/makefile.wat
@@ -183,8 +183,10 @@ __WXLIB_MONO_p = &
 !endif\r
 __LIB_SCINTILLA_IF_MONO_p =\r
 !ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r