Always define WXUSINGDLL when compiling Scintilla in shared wx build.

We need WXUSINGDLL even in monolithic build because Scintilla references wx
debugging functions (wxOnAssert(), wxTheAssertHandler &c) which still must be
seen as being exported from the (monolithic) DLL in this case.

See #12626.

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

diff --git a/Makefile.in b/Makefile.in
index ef6afab8ef4cbdf480f9c6dd2bf69799c8a07a0d..5819cf90a03eb0971895a7e0c6a53097a256f647 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2053,7 +2053,7 @@ COND_USE_STC_1___wxscintilla___depname = \
 @COND_SHARED_0_USE_STC_1@      = install_wxscintilla
 @COND_SHARED_0_USE_STC_1@__uninstall_wxscintilla___depname \
 @COND_SHARED_0_USE_STC_1@      = uninstall_wxscintilla
-@COND_MONOLITHIC_0_SHARED_1@__wxscintilla_usingdll_p = -DWXUSINGDLL
+@COND_SHARED_1@__wxscintilla_usingdll_p = -DWXUSINGDLL
 @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
 @COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
 @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)

diff --git a/build/bakefiles/scintilla.bkl b/build/bakefiles/scintilla.bkl
index e016e080947897d0b6bb40700b799f0094b90416..7360a644c5f3783061720b4f6c3626b705d9cb8f 100644 (file)
--- a/build/bakefiles/scintilla.bkl
+++ b/build/bakefiles/scintilla.bkl
@@ -39,7 +39,7 @@
     </template>
 
     <set var="wxscintilla_usingdll">
-        <if cond="SHARED=='1' and MONOLITHIC=='0'">WXUSINGDLL</if>
+        <if cond="SHARED=='1'">WXUSINGDLL</if>
     </set>
 
     <lib id="wxscintilla" template="3rdparty_lib,wxscintilla_cppflags"

diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 0d0c3c8babbcb7ebc6f2a516781f2bf4ba689b28..397143a29dec364f2902ae7287766b97a45f139f 100644 (file)
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1526,7 +1526,7 @@ __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
 !if "$(USE_GUI)" == "1"\r
 __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"\r
+!if "$(SHARED)" == "1"
 __wxscintilla_usingdll_p = -DWXUSINGDLL\r
 !endif\r
 !if "$(MONOLITHIC)" == "0"\r

diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 2474ededb4cc062c56f60e8f947afbc27a9b28f8..6b670190db6f82058dd1517f232f14d26f6d9f4c 100644 (file)
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1532,11 +1532,9 @@ endif
 ifeq ($(USE_GUI),1)\r
 __wxtiff___depname = $(LIBDIRNAME)\libwxtiff$(WXDEBUGFLAG).a\r
 endif\r
-ifeq ($(MONOLITHIC),0)\r
 ifeq ($(SHARED),1)\r
 __wxscintilla_usingdll_p = -DWXUSINGDLL\r
 endif\r
-endif\r
 ifeq ($(MONOLITHIC),0)\r
 EXTRALIBS_FOR_BASE = \r
 endif\r

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 4920dfe706afeaeb470e71594e3b8f805edc857b..5d6775fb730c66e734a09a295f833d2800760afc 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1716,7 +1716,7 @@ __RUNTIME_LIBS_100 = D
 !if "$(RUNTIME_LIBS)" == "static"\r
 __RUNTIME_LIBS_100 = $(__THREADSFLAG)\r
 !endif\r
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"\r
+!if "$(SHARED)" == "1"
 __wxscintilla_usingdll_p = /DWXUSINGDLL\r
 !endif\r
 !if "$(MONOLITHIC)" == "0"\r

diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index b17ef49e5713a25fd79a888d7b1b87d033da4bbf..688311de51f5cc48d0ff1b6802cf62110b9c0d8e 100644 (file)
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -81,11 +81,9 @@ __wxtiff___depname =
 __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib\r
 !endif\r
 __wxscintilla_usingdll_p =\r
-!ifeq MONOLITHIC 0\r
 !ifeq SHARED 1\r
 __wxscintilla_usingdll_p = -dWXUSINGDLL\r
 !endif\r
-!endif\r
 EXTRALIBS_FOR_BASE =\r
 !ifeq MONOLITHIC 0\r
 EXTRALIBS_FOR_BASE = \r