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

Fix monolithic build with USE_STC=0

Browse Source 
Don't add STC-related sources to MONOLIB_GUI_SRC unconditionally, as
this broke linking when specifying USE_STC=0 on make command line.

Closes #17895.
This commit is contained in:
Vadim Zeitlin
2018-01-26 23:38:01 +01:00
parent 9554f878b2
commit 7d6b44687f
5 changed files with 55 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
build/msw/makefile.bcc
View File

@@ -1786,9 +1786,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_richtextsymboldlg.obj \
$(OBJS)\monodll_richtextxml.obj \
$(OBJS)\monodll_xh_richtext.obj \
$(OBJS)\monodll_stc.obj \
$(OBJS)\monodll_PlatWX.obj \
$(OBJS)\monodll_ScintillaWX.obj
$(____MONOLIB_STC_SRC_FILENAMES_OBJECTS)
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
____CORE_SRC_FILENAMES_OBJECTS = \
@@ -2464,6 +2462,12 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_animateg.obj
!endif
!if "$(USE_STC)" == "1"
____MONOLIB_STC_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_stc.obj \
$(OBJS)\monodll_PlatWX.obj \
$(OBJS)\monodll_ScintillaWX.obj
!endif
!if "$(USE_STC)" == "1"
__wxscintilla_library_link_DEP = $(__wxscintilla)
!endif
!if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"
@@ -2619,9 +2623,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_richtextsymboldlg.obj \
$(OBJS)\monolib_richtextxml.obj \
$(OBJS)\monolib_xh_richtext.obj \
$(OBJS)\monolib_stc.obj \
$(OBJS)\monolib_PlatWX.obj \
$(OBJS)\monolib_ScintillaWX.obj
$(____MONOLIB_STC_SRC_FILENAMES_1_OBJECTS)
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
____CORE_SRC_FILENAMES_1_OBJECTS = \
@@ -3296,6 +3298,12 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_joystick.obj \
$(OBJS)\monolib_animateg.obj
!endif
!if "$(USE_STC)" == "1"
____MONOLIB_STC_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_stc.obj \
$(OBJS)\monolib_PlatWX.obj \
$(OBJS)\monolib_ScintillaWX.obj
!endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
__basedll___depname = \
$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll