Skip to content

Commit

Permalink
Removed to bitonic sort and ios, they were not used and confuse Bram :)
Browse files Browse the repository at this point in the history
  • Loading branch information
erwincoumans committed Nov 26, 2013
1 parent beb9e98 commit ec39c2f
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 557 deletions.
32 changes: 6 additions & 26 deletions build3/premake4.lua
Expand Up @@ -13,11 +13,6 @@
end


newoption
{
trigger = "ios",
description = "Enable iOS target (requires xcode4)"
}

newoption
{
Expand Down Expand Up @@ -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


Expand All @@ -99,8 +82,6 @@

language "C++"

if not _OPTIONS["ios"] then


include "../Demos3/GpuDemos"
-- include "../Demos3/CpuDemos"
Expand All @@ -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"
Expand Down Expand Up @@ -166,4 +147,3 @@ include "../Demos3/SimpleOpenGL3"
include "../Demos3"
end

end
171 changes: 0 additions & 171 deletions test/OpenCL/BitonicSort/BitonicSort.cl

This file was deleted.

90 changes: 0 additions & 90 deletions test/OpenCL/BitonicSort/b3BitonicSort.cpp

This file was deleted.

35 changes: 0 additions & 35 deletions test/OpenCL/BitonicSort/b3BitonicSort.h

This file was deleted.

0 comments on commit ec39c2f

Please sign in to comment.