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

Separate MSW resource files from the headers.

Browse Source 
Use separate MSW_HDR and MSW_RSC variables instead of putting everything into
MSW_HDR: resources, such as .manifest, .bmp, .ico and .cur files, don't belong
to the headers.

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

5
build/bakefiles/files.bkl
View File

@@ -1877,7 +1877,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/toplevel.h
wx/msw/treectrl.h
wx/msw/window.h
</set>
<set var="MSW_RSC" hints="files">
<!-- Resources must be installed together with headers: -->
wx/msw/wx.manifest
wx/msw/amd64.manifest
@@ -3738,7 +3739,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_DESKTOP_HDR)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_DESKTOP_HDR) $(MSW_RSC)</if>
<if cond="TOOLKIT=='WINCE'">$(MSW_HDR) $(WINCE_HDR)</if>
<if cond="TOOLKIT=='OSX_CARBON'">$(OSX_SHARED_HDR) $(OSX_CARBON_HDR)</if>
<if cond="TOOLKIT=='OSX_COCOA'">$(OSX_SHARED_HDR) $(OSX_COCOA_HDR)</if>