Only define WXUSINGDLL in multilib builds for wxscintilla.lib.

In monolithic builds wxscintilla is linked directly into the one and only wx
DLL and doesn't need to import anything from it, WXUSINGDLL is only needed in
multilib case when wxscintilla is part of wxCore DLL and does need to import
symbols (e.g. wxQsort() used by wxVector) from wxBase one.

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

diff --git a/Makefile.in b/Makefile.in
index 99bca80725df1c70672b557cd89b651369872e5c..b596d098b9bddf4002b1c13ab8f0ca9645004022 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2045,7 +2045,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_SHARED_1@__wxscintilla_usingdll_p = -DWXUSINGDLL
+@COND_MONOLITHIC_0_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 dfb993d3394940a91e764f4ae2f70c51cdc37152..e8da6c99db8c850a5d98a4eabbd322e9e4bd4251 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'">WXUSINGDLL</if>
+        <if cond="SHARED=='1' and MONOLITHIC=='0'">WXUSINGDLL</if>
     </set>
 
     <lib id="wxscintilla" template="3rdparty_lib,wxscintilla_cppflags"

diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 7bce73dd4c7cf56cf899fec57a7863c181bcb03d..6a124113c38790d5d65c4c22d25761535887035d 100644 (file)
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1519,7 +1519,7 @@ __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
 !if "$(USE_GUI)" == "1"\r
 __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib\r
 !endif\r
-!if "$(SHARED)" == "1"\r
+!if "$(MONOLITHIC)" == "0" && "$(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 f910aba2fb7ce7d42e82cf3fd31ad948c469e029..0c56aa6f7d8ff49ea54af3f61f26d5cb61b59f5e 100644 (file)
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1525,9 +1525,11 @@ endif
 ifeq ($(USE_GUI),1)\r
 __wxtiff___depname = $(LIBDIRNAME)\libwxtiff$(WXDEBUGFLAG).a\r
 endif\r
+ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)\r
 __wxscintilla_usingdll_p = -DWXUSINGDLL\r
 endif\r
+endif
 ifeq ($(MONOLITHIC),0)\r
 EXTRALIBS_FOR_BASE = \r
 endif\r

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 6b48f3c9ff662d653d2112946312d60b9da11c3e..369fffb449e9fea81c0cde1ec50e7e0a13a375b1 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1709,7 +1709,7 @@ __RUNTIME_LIBS_100 = D
 !if "$(RUNTIME_LIBS)" == "static"\r
 __RUNTIME_LIBS_100 = $(__THREADSFLAG)\r
 !endif\r
-!if "$(SHARED)" == "1"\r
+!if "$(MONOLITHIC)" == "0" && "$(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 f20b03f6efe2a5f193fb34407e3a89ae4789470d..c9befbc1423f352ac0d7b851bbf13712e255f8c7 100644 (file)
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -81,9 +81,11 @@ __wxtiff___depname =
 __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib\r
 !endif\r
 __wxscintilla_usingdll_p =\r
+!ifeq MONOLITHIC 0
 !ifeq SHARED 1\r
 __wxscintilla_usingdll_p = -dWXUSINGDLL\r
 !endif\r
+!endif
 EXTRALIBS_FOR_BASE =\r
 !ifeq MONOLITHIC 0\r
 EXTRALIBS_FOR_BASE = \r