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

Fix build of plugin libraries after recent *FLAGS changes

Browse Source 
Since ec091c9f2b building plugin libraries
such as webkit2_ext and sound_sdl was broken, as they didn't use the
correct CPPFLAGS any longer.

Fix this by explicitly inheriting from "common_settings" template which
adds the use of WX_CPPFLAGS etc now.
This commit is contained in:
Vadim Zeitlin 2020-02-19 22:11:20 +01:00
parent 108e18ee24
commit eb7b84f781
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.in
View File

@ -2120,12 +2120,12 @@ GLLIB_OBJECTS = \
gllib_glcmn.o \
$(__OPENGL_SRC_PLATFORM_OBJECTS_1)
GLLIB_ODEP = $(_____pch_wxprec_gllib_wx_wxprec_h_gch___depname)
SOUND_SDL_CXXFLAGS = -DWXUSINGDLL -DwxUSE_GUI=0 $(PIC_FLAG) $(CPPFLAGS) \
$(CXXFLAGS)
SOUND_SDL_CXXFLAGS = $(WX_CPPFLAGS) -DWXUSINGDLL -DwxUSE_GUI=0 $(PIC_FLAG) \
$(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
SOUND_SDL_OBJECTS = \
sound_sdl_sound_sdl.o
WEBKIT2_EXT_CXXFLAGS = -DWXUSINGDLL -DwxUSE_GUI=0 $(PIC_FLAG) $(CPPFLAGS) \
$(CXXFLAGS)
WEBKIT2_EXT_CXXFLAGS = $(WX_CPPFLAGS) -DWXUSINGDLL -DwxUSE_GUI=0 $(PIC_FLAG) \
$(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
WEBKIT2_EXT_OBJECTS = \
webkit2_ext_webview_webkit2_extension.o
LOCALE_LINGUAS = ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk zh zh_CN zh_TW
@ -14704,7 +14704,7 @@ distclean: clean
@COND_USE_GUI_1_USE_OPENGL_1@wxgl: $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP)
@COND_WITH_PLUGIN_SDL_1@$(DLLPREFIX_MODULE)sound_sdl$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE): $(SOUND_SDL_OBJECTS)
@COND_WITH_PLUGIN_SDL_1@ $(SHARED_LD_MODULE_CXX) $@ $(SOUND_SDL_OBJECTS) $(LDFLAGS) $(EXTRALIBS_SDL) $(LIBS)
@COND_WITH_PLUGIN_SDL_1@ $(SHARED_LD_MODULE_CXX) $@ $(SOUND_SDL_OBJECTS) $(WX_LDFLAGS) $(LDFLAGS) $(EXTRALIBS_SDL) $(LIBS)
@COND_WITH_PLUGIN_SDL_1@install_sound_sdl: $(__sound_sdl___depname)
@COND_WITH_PLUGIN_SDL_1@ $(INSTALL_DIR) $(DESTDIR)$(PLUGINS_INST_DIR)
@ -14714,7 +14714,7 @@ distclean: clean
@COND_WITH_PLUGIN_SDL_1@ rm -f $(DESTDIR)$(PLUGINS_INST_DIR)/$(DLLPREFIX_MODULE)sound_sdl$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
@COND_USE_WEBVIEW_WEBKIT2_1@$(DLLPREFIX_MODULE)webkit2_ext$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE): $(WEBKIT2_EXT_OBJECTS)
@COND_USE_WEBVIEW_WEBKIT2_1@ $(SHARED_LD_MODULE_CXX) $@ $(WEBKIT2_EXT_OBJECTS) $(LDFLAGS) $(EXTRALIBS_WEBVIEW) $(LIBS)
@COND_USE_WEBVIEW_WEBKIT2_1@ $(SHARED_LD_MODULE_CXX) $@ $(WEBKIT2_EXT_OBJECTS) $(WX_LDFLAGS) $(LDFLAGS) $(EXTRALIBS_WEBVIEW) $(LIBS)
@COND_USE_WEBVIEW_WEBKIT2_1@install_webkit2_ext: $(__webkit2_ext___depname)
@COND_USE_WEBVIEW_WEBKIT2_1@ $(INSTALL_DIR) $(DESTDIR)$(PLUGINS_INST_DIR)/web-extensions

2
build/bakefiles/common.bkl
View File

@ -801,7 +801,7 @@ $(TAB)cl /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
</set>
<define-rule name="wx-base-plugin" extends="module">
<template>
<template template="common_settings">
<dllname>
$(id)$(WX_U_D_SUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER)
</dllname>