From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 22 Nov 2010 12:49:25 +0000 (+0000)
Subject: Revert "Always define WXUSINGDLL when compiling Scintilla in shared wx build."
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2a9b583b4899e3352419cc4e6cf4c9b8a8a80df0?ds=inline

Revert "Always define WXUSINGDLL when compiling Scintilla in shared wx build."

Finally it's unnecessary to define WXUSINGDLL when building wxScintilla
library as it doesn't use the main DLL, it is simply used as part of it.

This reverts r66222 and finally closes #12626.

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

diff --git a/Makefile.in b/Makefile.in
index 317ebe4f93..dfca390d0b 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_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 282c1a656d..cd1e8aac6b 100644
--- 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 11b331b150..83d95a7641 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 "$(SHARED)" == "1"
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 __wxscintilla_usingdll_p = -DWXUSINGDLL
 !endif
 !if "$(MONOLITHIC)" == "0"
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 54811fcfe5..6e8a901b55 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1532,9 +1532,11 @@ 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 2735975633..6c8e2b983c 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 "$(SHARED)" == "1"
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 __wxscintilla_usingdll_p = /DWXUSINGDLL
 !endif
 !if "$(MONOLITHIC)" == "0"
diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 20ced87b09..2a77fdfcc3 100644
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -81,9 +81,11 @@ __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 =