Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

combine checks for "ios" premake option

Browse Source 
The "ios" option now only makes sense when action is "xcode"
This commit is contained in:
Andrew Meadows
2015-12-03 20:39:29 -08:00
parent f385bffffb
commit d8b7d12707
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build3/premake4.lua
View File

@@ -125,6 +125,9 @@
if _ACTION == "xcode4" then if _ACTION == "xcode4" then
if _OPTIONS["ios"] then if _OPTIONS["ios"] then
_OPTIONS["no-bullet3"] = "1"
_OPTIONS["no-gtest"] = "1"
postfix = "ios"; postfix = "ios";
xcodebuildsettings xcodebuildsettings
{ {
@@ -167,11 +170,6 @@
language "C++" language "C++"
if _OPTIONS["ios"] then
_OPTIONS["no-bullet3"] = "1"
_OPTIONS["no-gtest"] = "1"
end
if _OPTIONS["no-bullet3"] then if _OPTIONS["no-bullet3"] then
_OPTIONS["no-demos"] = "1" _OPTIONS["no-demos"] = "1"
else else