From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 22 Nov 2010 01:22:07 +0000 (+0000)
Subject: Always define WXUSINGDLL when compiling Scintilla in shared wx build.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/02c9115ba801f8ee22649331fb46a46241c2846a

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 ef6afab8ef..5819cf90a0 100644
--- 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 e016e08094..7360a644c5 100644
--- 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 0d0c3c8bab..397143a29d 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1526,7 +1526,7 @@ __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
 !if "$(USE_GUI)" == "1"
 __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
 !endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
+!if "$(SHARED)" == "1"
 __wxscintilla_usingdll_p = -DWXUSINGDLL
 !endif
 !if "$(MONOLITHIC)" == "0"
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 2474ededb4..6b670190db 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1532,11 +1532,9 @@ endif
 ifeq ($(USE_GUI),1)
 __wxtiff___depname = $(LIBDIRNAME)\libwxtiff$(WXDEBUGFLAG).a
 endif
-ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 __wxscintilla_usingdll_p = -DWXUSINGDLL
 endif
-endif
 ifeq ($(MONOLITHIC),0)
 EXTRALIBS_FOR_BASE = 
 endif
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 4920dfe706..5d6775fb73 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1716,7 +1716,7 @@ __RUNTIME_LIBS_100 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_100 = $(__THREADSFLAG)
 !endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
+!if "$(SHARED)" == "1"
 __wxscintilla_usingdll_p = /DWXUSINGDLL
 !endif
 !if "$(MONOLITHIC)" == "0"
diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index b17ef49e57..688311de51 100644
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -81,11 +81,9 @@ __wxtiff___depname =
 __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
 !endif
 __wxscintilla_usingdll_p =
-!ifeq MONOLITHIC 0
 !ifeq SHARED 1
 __wxscintilla_usingdll_p = -dWXUSINGDLL
 !endif
-!endif
 EXTRALIBS_FOR_BASE =
 !ifeq MONOLITHIC 0
 EXTRALIBS_FOR_BASE =