diff options
| -rw-r--r-- | scripts/installer.nsi | 11 | ||||
| -rw-r--r-- | xmake/plugins/project/vstudio/impl/vs201x.lua | 25 |
2 files changed, 34 insertions, 2 deletions
diff --git a/scripts/installer.nsi b/scripts/installer.nsi index e2deebfc0..f4dd014b5 100644 --- a/scripts/installer.nsi +++ b/scripts/installer.nsi @@ -44,6 +44,13 @@ RequestExecutionLevel admin !insertmacro MUI_UNPAGE_CONFIRM
!insertmacro MUI_UNPAGE_INSTFILES
+
+;--------------------------------
+; Finish Pages
+
+!define MUI_FINISHPAGE_LINK "Donate $$5"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://xmake.io/pages/donation.html#donate"
+!insertmacro MUI_PAGE_FINISH
;--------------------------------
; Languages
@@ -53,13 +60,13 @@ RequestExecutionLevel admin ;--------------------------------
; Version Information
-VIProductVersion "2.1.4.0402"
+VIProductVersion "2.1.5.0630"
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "XMake"
VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "website: http://www.xmake.io"
VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "The TBOOX Open Source Group"
VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright 2015-2017 tboox.org"
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "The Make-like Build Utility based on Lua"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.1.4"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.1.5"
;--------------------------------
diff --git a/xmake/plugins/project/vstudio/impl/vs201x.lua b/xmake/plugins/project/vstudio/impl/vs201x.lua index 1c5921ec8..adb9b00cf 100644 --- a/xmake/plugins/project/vstudio/impl/vs201x.lua +++ b/xmake/plugins/project/vstudio/impl/vs201x.lua @@ -69,6 +69,28 @@ function _make_targetinfo(mode, arch, target) return targetinfo end +-- make target headers +function _make_targetheaders(target) + + -- only for static and shared target + local kind = target:get("kind") + if kind == "static" or kind == "shared" then + + -- make headers + local srcheaders, dstheaders = target:headerfiles() + if srcheaders and dstheaders then + local i = 1 + for _, srcheader in ipairs(srcheaders) do + local dstheader = dstheaders[i] + if dstheader then + os.cp(srcheader, dstheader) + end + i = i + 1 + end + end + end +end + -- make vstudio project function make(outputdir, vsinfo) @@ -135,6 +157,9 @@ function make(outputdir, vsinfo) -- save all sourcefiles and headerfiles _target.sourcefiles = table.unique(table.join(_target.sourcefiles or {}, (target:sourcefiles()))) _target.headerfiles = table.unique(table.join(_target.headerfiles or {}, (target:headerfiles()))) + + -- make target headers + _make_targetheaders(target) end end end |