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

No real changes, just use FOO_CMN_{SRC,HDR} for all libraries in files.bkl.

Browse Source 
Make variable definitions consistent for all libraries: previously some of
them were decomposed in FOO_CMN_SRC and FOO_PLATFORM_SRC parts while others
just defined FOO_SRC directly and interpolated FOO_PLATFORM_SRC into it.

Use helper FOO_CMN_SRC for all of them now, as it will make it easier to
update them automatically (and the same thing for headers, i.e. HDR variables).

No changes to the generated project/make files.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-05-26 20:14:56 +00:00
parent da422ea6a3
commit 477fd425e4
1 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
build/bakefiles/files.bkl
View File

@@ -3112,8 +3112,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/html/chm.cpp
</if>
</set>
<set var="HTML_SRC" hints="files">
$(HTML_SRC_PLATFORM)
<set var="HTML_CMN_SRC" hints="files">
src/html/helpctrl.cpp
src/html/helpdata.cpp
src/html/helpdlg.cpp
@@ -3141,10 +3140,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<!-- wxHTML users: -->
src/generic/htmllbox.cpp
</set>
<set var="HTML_SRC" hints="files">
$(HTML_SRC_PLATFORM)
$(HTML_CMN_SRC)
</set>
<set var="MSW_HTML_HDR" hints="files">
<if cond="TOOLKIT=='MSW'">wx/msw/helpbest.h</if>
</set>
<set var="HTML_HDR" hints="files">
<set var="HTML_CMN_HDR" hints="files">
wx/html/helpctrl.h
wx/html/helpdata.h
wx/html/helpdlg.h
@@ -3164,6 +3167,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/wxhtml.h
<!-- wxHTML users: -->
wx/htmllbox.h
</set>
<set var="HTML_HDR" hints="files">
$(HTML_CMN_HDR)
$(MSW_HTML_HDR)
</set>
@@ -3176,12 +3182,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='GTK'">src/gtk/webview_webkit.cpp</if>
<if cond="PLATFORM_MACOSX=='1'">src/osx/webview_webkit.mm</if>
</set>
<set var="WEBVIEW_SRC" hints="files">
$(WEBVIEW_SRC_PLATFORM)
<set var="WEBVIEW_CMN_SRC" hints="files">
src/common/webview.cpp
src/common/webviewarchivehandler.cpp
src/common/webviewfshandler.cpp
</set>
<set var="WEBVIEW_SRC" hints="files">
$(WEBVIEW_SRC_PLATFORM)
$(WEBVIEW_CMN_SRC)
</set>
<set var="WEBVIEW_HDR_PLATFORM" hints="files">
<if cond="TOOLKIT=='MSW'">
@@ -3198,12 +3207,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/osx/webview_webkit.h
</if>
</set>
<set var="WEBVIEW_HDR" hints="files">
$(WEBVIEW_HDR_PLATFORM)
<set var="WEBVIEW_CMN_HDR" hints="files">
wx/webview.h
wx/webviewarchivehandler.h
wx/webviewfshandler.h
</set>
<set var="WEBVIEW_HDR" hints="files">
$(WEBVIEW_HDR_PLATFORM)
$(WEBVIEW_CMN_HDR)
</set>
<!-- ====================================================================== -->
<!-- wxXRC -->
@@ -3442,7 +3454,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/aui/tabartgtk.h
</if>
</set>
<set var="AUI_SRC" hints="files">
<set var="AUI_CMN_SRC" hints="files">
src/aui/framemanager.cpp
src/aui/dockart.cpp
src/aui/floatpane.cpp
@@ -3452,9 +3464,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/aui/tabart.cpp
src/xrc/xh_auinotbk.cpp
src/xrc/xh_auitoolb.cpp
</set>
<set var="AUI_SRC" hints="files">
$(AUI_CMN_SRC)
$(AUI_GTK_SRC)
</set>
<set var="AUI_HDR" hints="files">
<set var="AUI_CMN_HDR" hints="files">
wx/aui/framemanager.h
wx/aui/dockart.h
wx/aui/floatpane.h
@@ -3465,6 +3480,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/aui/tabart.h
wx/xrc/xh_auinotbk.h
wx/xrc/xh_auitoolb.h
</set>
<set var="AUI_HDR" hints="files">
$(AUI_CMN_HDR)
$(AUI_GTK_HDR)
</set>