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

Replace PLUGIN_ADV_SRC to PLUGIN_SRC and put them into "core"

Browse Source 
wxSound SDL plugin should be in "core" too, when linking the plugins
statically, rather than in "adv", now that wxSound itself is in core.
This commit is contained in:
Vadim Zeitlin
2018-09-02 23:36:41 +02:00
parent 967ff67459
commit 0225f191e8
4 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/bakefiles/files.bkl
View File

@@ -3676,12 +3676,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<!-- ================================================================ -->
<!-- wxAdv sources -->
<set var="PLUGIN_ADV_SRC">
<set var="PLUGIN_SRC">
<if cond="FORMAT=='autoconf' and PLATFORM_UNIX=='1' and USE_PLUGINS=='0'">
$(UNIX_SOUND_SRC_SDL)
</if>
</set>
<set var="PLUGIN_MONOLIB_SRC">$(PLUGIN_ADV_SRC)</set>
<set var="PLUGIN_MONOLIB_SRC">$(PLUGIN_SRC)</set>
</makefile>

2
build/bakefiles/monolithic.bkl
View File

@@ -9,7 +9,7 @@
<set var="MONOLIB_GUI_SRC">
<if cond="USE_GUI=='1'">
$(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(WEBVIEW_SRC)
$(CORE_SRC) $(MEDIA_SRC) $(HTML_SRC) $(WEBVIEW_SRC)
$(QA_SRC) $(XRC_SRC) $(AUI_SRC) $(PROPGRID_SRC) $(RIBBON_SRC)
$(RICHTEXT_SRC) $(MONOLIB_STC_SRC)
</if>

8
build/bakefiles/multilib.bkl
View File

@@ -73,7 +73,7 @@
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_CORE</define>
<define>wxUSE_BASE=0</define>
<sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
<sources>$(BASE_AND_GUI_SRC) $(CORE_SRC) $(PLUGIN_SRC)</sources>
<msvc-headers>$(ALL_GUI_HEADERS)</msvc-headers>
<library>basedll</library>
</dll>
@@ -81,7 +81,7 @@
<lib id="corelib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
<define>wxUSE_BASE=0</define>
<sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
<sources>$(BASE_AND_GUI_SRC) $(CORE_SRC) $(PLUGIN_SRC)</sources>
<msvc-headers>$(ALL_GUI_HEADERS)</msvc-headers>
</lib>
@@ -98,7 +98,7 @@
cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_ADV</define>
<sources>$(ADVANCED_SRC) $(PLUGIN_ADV_SRC)</sources>
<sources>$(ADVANCED_SRC)</sources>
<msvc-headers>$(ADVANCED_HDR)</msvc-headers>
<library>coredll</library>
<library>basedll</library>
@@ -107,7 +107,7 @@
<lib id="advlib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
<sources>$(ADVANCED_SRC) $(PLUGIN_ADV_SRC)</sources>
<sources>$(ADVANCED_SRC)</sources>
<msvc-headers>$(ADVANCED_HDR)</msvc-headers>
</lib>