Removed to bitonic sort and ios, they were not used and confuse Bram :)

http://bulletphysics.org/Bullet/phpBB3/viewtopic.php?t=9570
This commit is contained in:
erwin coumans
2013-11-25 21:38:44 -08:00
parent beb9e98cd3
commit ec39c2f210
6 changed files with 6 additions and 557 deletions

View File

@@ -13,11 +13,6 @@
end
newoption
{
trigger = "ios",
description = "Enable iOS target (requires xcode4)"
}
newoption
{
@@ -64,23 +59,11 @@
postfix=""
if _ACTION == "xcode4" then
if _OPTIONS["ios"] then
postfix = "ios";
xcodebuildsettings
{
'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"',
}
end
xcodebuildsettings
{
'ARCHS = "$(ARCHS_STANDARD_32_BIT) $(ARCHS_STANDARD_64_BIT)"',
'VALID_ARCHS = "x86_64 i386"',
}
end
@@ -99,8 +82,6 @@
language "C++"
if not _OPTIONS["ios"] then
include "../Demos3/GpuDemos"
-- include "../Demos3/CpuDemos"
@@ -126,7 +107,7 @@ include "../Demos3/SimpleOpenGL3"
-- include "../test/OpenCL/NarrowphaseCollision"
include "../test/OpenCL/ParallelPrimitives"
include "../test/OpenCL/RadixSortBenchmark"
include "../test/OpenCL/BitonicSort"
include "../src/Bullet3Dynamics"
include "../src/Bullet3Common"
@@ -166,4 +147,3 @@ include "../Demos3/SimpleOpenGL3"
include "../Demos3"
end
end