From 02c9115ba801f8ee22649331fb46a46241c2846a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 22 Nov 2010 01:22:07 +0000 Subject: [PATCH] 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 --- Makefile.in | 2 +- build/bakefiles/scintilla.bkl | 2 +- build/msw/makefile.bcc | 2 +- build/msw/makefile.gcc | 2 -- build/msw/makefile.vc | 2 +- build/msw/makefile.wat | 2 -- 6 files changed, 4 insertions(+), 8 deletions(-) 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 @@ - WXUSINGDLL + WXUSINGDLL