From 7d6b44687f1511ef119c5a6e73d00ceb38faae41 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 26 Jan 2018 23:38:01 +0100 Subject: [PATCH] Fix monolithic build with USE_STC=0 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. --- Makefile.in | 12 ++++++------ build/bakefiles/monolithic.bkl | 8 +++++++- build/msw/makefile.bcc | 20 ++++++++++++++------ build/msw/makefile.gcc | 20 ++++++++++++++------ build/msw/makefile.vc | 20 ++++++++++++++------ 5 files changed, 55 insertions(+), 25 deletions(-) diff --git a/Makefile.in b/Makefile.in index cbca768f71..6d29b0e0eb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -4456,9 +4456,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \ monodll_richtextsymboldlg.o \ monodll_richtextxml.o \ monodll_xh_richtext.o \ - monodll_stc.o \ - monodll_PlatWX.o \ - monodll_ScintillaWX.o + $(__MONOLIB_STC_SRC_OBJECTS) @COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS) COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ $(__LOWLEVEL_SRC_OBJECTS) \ @@ -6296,6 +6294,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = monodll_tabartgtk.o @COND_TOOLKIT_MSW@__AUI_PLATFORM_SRC_OBJECTS = \ @COND_TOOLKIT_MSW@ monodll_tabartmsw.o monodll_barartmsw.o +@COND_USE_STC_1@__MONOLIB_STC_SRC_OBJECTS = monodll_stc.o \ +@COND_USE_STC_1@ monodll_PlatWX.o monodll_ScintillaWX.o @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS \ @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = monodll_sound_sdl.o @COND_PLATFORM_WIN32_1@__monodll___win32rc = monodll_version_rc.o @@ -6539,9 +6539,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ monolib_richtextsymboldlg.o \ monolib_richtextxml.o \ monolib_xh_richtext.o \ - monolib_stc.o \ - monolib_PlatWX.o \ - monolib_ScintillaWX.o + $(__MONOLIB_STC_SRC_OBJECTS_1) @COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS_1 = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1) COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ $(__LOWLEVEL_SRC_OBJECTS_2) \ @@ -8379,6 +8377,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = monolib_tabartgtk.o @COND_TOOLKIT_MSW@__AUI_PLATFORM_SRC_OBJECTS_1 = \ @COND_TOOLKIT_MSW@ monolib_tabartmsw.o monolib_barartmsw.o +@COND_USE_STC_1@__MONOLIB_STC_SRC_OBJECTS_1 = monolib_stc.o \ +@COND_USE_STC_1@ monolib_PlatWX.o monolib_ScintillaWX.o @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_1 \ @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = monolib_sound_sdl.o COND_MONOLITHIC_0_SHARED_1___basedll___depname = \ diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl index 22c14f6ce1..720e4f3f8f 100644 --- a/build/bakefiles/monolithic.bkl +++ b/build/bakefiles/monolithic.bkl @@ -1,11 +1,17 @@ + + + $(STC_SRC) + + + $(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(WEBVIEW_SRC) $(QA_SRC) $(XRC_SRC) $(AUI_SRC) $(PROPGRID_SRC) $(RIBBON_SRC) - $(RICHTEXT_SRC) $(STC_SRC) + $(RICHTEXT_SRC) $(MONOLIB_STC_SRC) diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 6cccbb80d7..786e7b5711 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -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 diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 2f6f1f2f0e..c7b3f16d74 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1811,9 +1811,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_richtextsymboldlg.o \ $(OBJS)\monodll_richtextxml.o \ $(OBJS)\monodll_xh_richtext.o \ - $(OBJS)\monodll_stc.o \ - $(OBJS)\monodll_PlatWX.o \ - $(OBJS)\monodll_ScintillaWX.o + $(____MONOLIB_STC_SRC_FILENAMES_OBJECTS) endif ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) @@ -2493,6 +2491,12 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_animateg.o endif ifeq ($(USE_STC),1) +____MONOLIB_STC_SRC_FILENAMES_OBJECTS = \ + $(OBJS)\monodll_stc.o \ + $(OBJS)\monodll_PlatWX.o \ + $(OBJS)\monodll_ScintillaWX.o +endif +ifeq ($(USE_STC),1) __wxscintilla_library_link_DEP = $(__wxscintilla) endif ifeq ($(MONOLITHIC),1) @@ -2650,9 +2654,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_richtextsymboldlg.o \ $(OBJS)\monolib_richtextxml.o \ $(OBJS)\monolib_xh_richtext.o \ - $(OBJS)\monolib_stc.o \ - $(OBJS)\monolib_PlatWX.o \ - $(OBJS)\monolib_ScintillaWX.o + $(____MONOLIB_STC_SRC_FILENAMES_1_OBJECTS) endif ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) @@ -3331,6 +3333,12 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_joystick.o \ $(OBJS)\monolib_animateg.o endif +ifeq ($(USE_STC),1) +____MONOLIB_STC_SRC_FILENAMES_1_OBJECTS = \ + $(OBJS)\monolib_stc.o \ + $(OBJS)\monolib_PlatWX.o \ + $(OBJS)\monolib_ScintillaWX.o +endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) __basedll___depname = \ diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 1e1acc8089..0f266fd231 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -2091,9 +2091,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 = \ @@ -2769,6 +2767,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" @@ -2930,9 +2934,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 = \ @@ -3607,6 +3609,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