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

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

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2010-11-22 12:49:25 +00:00
parent dd53b347de
commit 2a9b583b48
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

@@ -2053,7 +2053,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

@@ -1526,7 +1526,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

@@ -1532,9 +1532,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

@@ -1716,7 +1716,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 =