enable premake4 option --ios and Test_LinearMath
usage: ./premake4_osx --ios xcode4 open xcode4ios/0_Bullet3Solution.xcworkspace
This commit is contained in:
@@ -18,6 +18,11 @@
|
||||
act = _ACTION
|
||||
end
|
||||
|
||||
newoption {
|
||||
trigger = "ios",
|
||||
description = "Enable iOS target (requires xcode4)"
|
||||
}
|
||||
|
||||
newoption
|
||||
{
|
||||
trigger = "force_dlopen_opengl",
|
||||
@@ -95,12 +100,25 @@
|
||||
postfix=""
|
||||
|
||||
if _ACTION == "xcode4" then
|
||||
if _OPTIONS["ios"] then
|
||||
postfix = "ios";
|
||||
xcodebuildsettings
|
||||
{
|
||||
'INFOPLIST_FILE = "../../test/Bullet2/Info.plist"',
|
||||
'CODE_SIGN_IDENTITY = "iPhone Developer"',
|
||||
"SDKROOT = iphoneos",
|
||||
'ARCHS = "armv7"',
|
||||
'TARGETED_DEVICE_FAMILY = "1,2"',
|
||||
'VALID_ARCHS = "armv7"',
|
||||
}
|
||||
else
|
||||
xcodebuildsettings
|
||||
{
|
||||
'ARCHS = "$(ARCHS_STANDARD_32_BIT) $(ARCHS_STANDARD_64_BIT)"',
|
||||
'VALID_ARCHS = "x86_64 i386"',
|
||||
'SDKROOT = "macosx10.9"',
|
||||
}
|
||||
end
|
||||
end
|
||||
|
||||
-- comment-out for now, URDF reader needs exceptions
|
||||
@@ -123,6 +141,8 @@
|
||||
|
||||
language "C++"
|
||||
|
||||
if not _OPTIONS["ios"] then
|
||||
|
||||
include "../examples/ExampleBrowser"
|
||||
include "../examples/OpenGLWindow"
|
||||
|
||||
@@ -137,26 +157,25 @@
|
||||
include "../test/enet/server"
|
||||
end
|
||||
|
||||
if not _OPTIONS["without-gtest"] then
|
||||
include "../test/gtest-1.7.0"
|
||||
-- include "../test/hello_gtest"
|
||||
include "../test/collision"
|
||||
include "../test/TestBullet3OpenCL"
|
||||
include "../test/GwenOpenGLTest"
|
||||
end
|
||||
|
||||
|
||||
include "../src/BulletSoftBody"
|
||||
include "../src/BulletDynamics"
|
||||
include "../src/BulletCollision"
|
||||
include "../src/LinearMath"
|
||||
|
||||
include "../src/Bullet3Common"
|
||||
include "../src/Bullet3Geometry"
|
||||
include "../src/Bullet3Collision"
|
||||
include "../src/Bullet3Dynamics"
|
||||
include "../src/Bullet3OpenCL"
|
||||
include "../src/Bullet3Serialize/Bullet2FileLoader"
|
||||
|
||||
|
||||
|
||||
if not _OPTIONS["without-gtest"] then
|
||||
include "../test/gtest-1.7.0"
|
||||
-- include "../test/hello_gtest"
|
||||
include "../test/collision"
|
||||
include "../test/TestBullet3OpenCL"
|
||||
include "../test/GwenOpenGLTest"
|
||||
end
|
||||
end
|
||||
|
||||
include "../test/Bullet2"
|
||||
include "../src/BulletSoftBody"
|
||||
include "../src/BulletDynamics"
|
||||
include "../src/BulletCollision"
|
||||
include "../src/LinearMath"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user