Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only define WXUSINGDLL in multilib builds for wxscintilla.lib.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2010-07-25 18:39:22 +00:00
parent 833fb475ce
commit 354a9ddf94
6 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@@ -2045,7 +2045,7 @@ COND_USE_STC_1___wxscintilla___depname = \
@COND_SHARED_0_USE_STC_1@ = install_wxscintilla @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___depname \
@COND_SHARED_0_USE_STC_1@ = uninstall_wxscintilla @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_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)

2
build/bakefiles/scintilla.bkl
View File

@@ -39,7 +39,7 @@
</template> </template>
<set var="wxscintilla_usingdll"> <set var="wxscintilla_usingdll">
<if cond="SHARED=='1'">WXUSINGDLL</if> <if cond="SHARED=='1' and MONOLITHIC=='0'">WXUSINGDLL</if>
</set> </set>
<lib id="wxscintilla" template="3rdparty_lib,wxscintilla_cppflags" <lib id="wxscintilla" template="3rdparty_lib,wxscintilla_cppflags"

2
build/msw/makefile.bcc
View File

@@ -1519,7 +1519,7 @@ __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
__wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
!endif !endif
!if "$(SHARED)" == "1" !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
__wxscintilla_usingdll_p = -DWXUSINGDLL __wxscintilla_usingdll_p = -DWXUSINGDLL
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"

2
build/msw/makefile.gcc
View File

@@ -1525,9 +1525,11 @@ endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
__wxtiff___depname = $(LIBDIRNAME)\libwxtiff$(WXDEBUGFLAG).a __wxtiff___depname = $(LIBDIRNAME)\libwxtiff$(WXDEBUGFLAG).a
endif endif
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),1) ifeq ($(SHARED),1)
__wxscintilla_usingdll_p = -DWXUSINGDLL __wxscintilla_usingdll_p = -DWXUSINGDLL
endif endif
endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
endif endif

2
build/msw/makefile.vc
View File

@@ -1709,7 +1709,7 @@ __RUNTIME_LIBS_100 = D
!if "$(RUNTIME_LIBS)" == "static" !if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS_100 = $(__THREADSFLAG) __RUNTIME_LIBS_100 = $(__THREADSFLAG)
!endif !endif
!if "$(SHARED)" == "1" !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
__wxscintilla_usingdll_p = /DWXUSINGDLL __wxscintilla_usingdll_p = /DWXUSINGDLL
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"

2
build/msw/makefile.wat
View File

@@ -81,9 +81,11 @@ __wxtiff___depname =
__wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
!endif !endif
__wxscintilla_usingdll_p = __wxscintilla_usingdll_p =
!ifeq MONOLITHIC 0
!ifeq SHARED 1 !ifeq SHARED 1
__wxscintilla_usingdll_p = -dWXUSINGDLL __wxscintilla_usingdll_p = -dWXUSINGDLL
!endif !endif
!endif
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =