Skip to content

Commit

Permalink
Add VS2017 support (premake#2)
Browse files Browse the repository at this point in the history
  • Loading branch information
pdoane-blizzard authored and GitHub Enterprise committed Jul 5, 2017
1 parent 568a84b commit 109f247
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
1 change: 1 addition & 0 deletions _preload.lua
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
api.addAllowed("kind", p.ANDROIDPROJ)

premake.action._list["vs2015"].valid_kinds = table.join(premake.action._list["vs2015"].valid_kinds, { p.ANDROIDPROJ })
premake.action._list["vs2017"].valid_kinds = table.join(premake.action._list["vs2017"].valid_kinds, { p.ANDROIDPROJ })

-- TODO: can I api.addAllowed() a key-value pair?
local os = p.fields["os"];
Expand Down
6 changes: 5 additions & 1 deletion vsandroid_vcxproj.lua
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,11 @@
_p(2, "<RootNamespace>%s</RootNamespace>", cfg.project.name)
_p(2, "<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>")
_p(2, "<ApplicationType>Android</ApplicationType>")
_p(2, "<ApplicationTypeRevision>1.0</ApplicationTypeRevision>")
if _ACTION >= "vs2017" then
_p(2, "<ApplicationTypeRevision>3.0</ApplicationTypeRevision>")
else
_p(2, "<ApplicationTypeRevision>1.0</ApplicationTypeRevision>")
end
end

--
Expand Down

0 comments on commit 109f247

Please sign in to comment.