replaced spaced indentation with tabs
This commit is contained in:
Andrew Meadows
@@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
solution "0_Bullet3Solution"
|
solution "0_Bullet3Solution"
|
||||||
|
|
||||||
local osversion = os.getversion()
|
local osversion = os.getversion()
|
||||||
print(string.format(" %d.%d.%d (%s)",
|
print(string.format(" %d.%d.%d (%s)",
|
||||||
@@ -14,26 +14,26 @@
|
|||||||
|
|
||||||
act = ""
|
act = ""
|
||||||
|
|
||||||
if _ACTION then
|
if _ACTION then
|
||||||
act = _ACTION
|
act = _ACTION
|
||||||
end
|
end
|
||||||
|
|
||||||
newoption {
|
newoption {
|
||||||
trigger = "ios",
|
trigger = "ios",
|
||||||
description = "Enable iOS target (requires xcode4)"
|
description = "Enable iOS target (requires xcode4)"
|
||||||
}
|
}
|
||||||
|
|
||||||
newoption
|
newoption
|
||||||
{
|
{
|
||||||
trigger = "force_dlopen_opengl",
|
trigger = "force_dlopen_opengl",
|
||||||
description = "Dynamically load OpenGL (instead of static/dynamic linking)"
|
description = "Dynamically load OpenGL (instead of static/dynamic linking)"
|
||||||
}
|
}
|
||||||
|
|
||||||
newoption
|
newoption
|
||||||
{
|
{
|
||||||
trigger = "force_dlopen_x11",
|
trigger = "force_dlopen_x11",
|
||||||
description = "Dynamically load OpenGL (instead of static/dynamic linking)"
|
description = "Dynamically load OpenGL (instead of static/dynamic linking)"
|
||||||
}
|
}
|
||||||
|
|
||||||
newoption
|
newoption
|
||||||
{
|
{
|
||||||
@@ -49,17 +49,17 @@
|
|||||||
|
|
||||||
-- --_OPTIONS["midi"] = "1";
|
-- --_OPTIONS["midi"] = "1";
|
||||||
|
|
||||||
newoption
|
newoption
|
||||||
{
|
{
|
||||||
trigger = "no-demos",
|
trigger = "no-demos",
|
||||||
description = "Don't build demos"
|
description = "Don't build demos"
|
||||||
}
|
}
|
||||||
|
|
||||||
newoption
|
newoption
|
||||||
{
|
{
|
||||||
trigger = "no-extras",
|
trigger = "no-extras",
|
||||||
description = "Don't build Extras"
|
description = "Don't build Extras"
|
||||||
}
|
}
|
||||||
|
|
||||||
newoption
|
newoption
|
||||||
{
|
{
|
||||||
@@ -74,10 +74,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
newoption {
|
newoption {
|
||||||
trigger = "targetdir",
|
trigger = "targetdir",
|
||||||
value = "path such as ../bin",
|
value = "path such as ../bin",
|
||||||
description = "Set the output location for the generated project files"
|
description = "Set the output location for the generated project files"
|
||||||
}
|
}
|
||||||
|
|
||||||
newoption
|
newoption
|
||||||
{
|
{
|
||||||
@@ -91,11 +91,11 @@
|
|||||||
description = "Disable unit tests using gtest"
|
description = "Disable unit tests using gtest"
|
||||||
}
|
}
|
||||||
|
|
||||||
newoption
|
newoption
|
||||||
{
|
{
|
||||||
trigger = "no-bullet3",
|
trigger = "no-bullet3",
|
||||||
description = "Do not build bullet3 libs"
|
description = "Do not build bullet3 libs"
|
||||||
}
|
}
|
||||||
|
|
||||||
configurations {"Release", "Debug"}
|
configurations {"Release", "Debug"}
|
||||||
configuration "Release"
|
configuration "Release"
|
||||||
@@ -130,25 +130,25 @@
|
|||||||
postfix=""
|
postfix=""
|
||||||
|
|
||||||
if _ACTION == "xcode4" then
|
if _ACTION == "xcode4" then
|
||||||
if _OPTIONS["ios"] then
|
if _OPTIONS["ios"] then
|
||||||
_OPTIONS["no-bullet3"] = "1"
|
_OPTIONS["no-bullet3"] = "1"
|
||||||
_OPTIONS["no-gtest"] = "1"
|
_OPTIONS["no-gtest"] = "1"
|
||||||
|
|
||||||
postfix = "ios";
|
postfix = "ios";
|
||||||
xcodebuildsettings
|
xcodebuildsettings
|
||||||
{
|
{
|
||||||
'INFOPLIST_FILE = "../../test/Bullet2/Info.plist"',
|
'INFOPLIST_FILE = "../../test/Bullet2/Info.plist"',
|
||||||
'CODE_SIGN_IDENTITY = "iPhone Developer"',
|
'CODE_SIGN_IDENTITY = "iPhone Developer"',
|
||||||
"SDKROOT = iphoneos",
|
"SDKROOT = iphoneos",
|
||||||
'ARCHS = "armv7"',
|
'ARCHS = "armv7"',
|
||||||
'TARGETED_DEVICE_FAMILY = "1,2"',
|
'TARGETED_DEVICE_FAMILY = "1,2"',
|
||||||
'VALID_ARCHS = "armv7"',
|
'VALID_ARCHS = "armv7"',
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
xcodebuildsettings
|
xcodebuildsettings
|
||||||
{
|
{
|
||||||
'ARCHS = "$(ARCHS_STANDARD_32_BIT) $(ARCHS_STANDARD_64_BIT)"',
|
'ARCHS = "$(ARCHS_STANDARD_32_BIT) $(ARCHS_STANDARD_64_BIT)"',
|
||||||
'VALID_ARCHS = "x86_64 i386"',
|
'VALID_ARCHS = "x86_64 i386"',
|
||||||
-- 'SDKROOT = "macosx10.9"',
|
-- 'SDKROOT = "macosx10.9"',
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
@@ -176,73 +176,73 @@
|
|||||||
|
|
||||||
language "C++"
|
language "C++"
|
||||||
|
|
||||||
if _OPTIONS["no-bullet3"] then
|
if _OPTIONS["no-bullet3"] then
|
||||||
print "--no-bullet3 implies --no-demos"
|
print "--no-bullet3 implies --no-demos"
|
||||||
_OPTIONS["no-demos"] = "1"
|
_OPTIONS["no-demos"] = "1"
|
||||||
else
|
else
|
||||||
include "../src/Bullet3Common"
|
include "../src/Bullet3Common"
|
||||||
include "../src/Bullet3Geometry"
|
include "../src/Bullet3Geometry"
|
||||||
include "../src/Bullet3Collision"
|
include "../src/Bullet3Collision"
|
||||||
include "../src/Bullet3Dynamics"
|
include "../src/Bullet3Dynamics"
|
||||||
include "../src/Bullet3OpenCL"
|
include "../src/Bullet3OpenCL"
|
||||||
include "../src/Bullet3Serialize/Bullet2FileLoader"
|
include "../src/Bullet3Serialize/Bullet2FileLoader"
|
||||||
end
|
end
|
||||||
|
|
||||||
if _OPTIONS["no-extras"] then
|
if _OPTIONS["no-extras"] then
|
||||||
print "--no-extras implies --no-demos"
|
print "--no-extras implies --no-demos"
|
||||||
_OPTIONS["no-demos"] = "1"
|
_OPTIONS["no-demos"] = "1"
|
||||||
else
|
else
|
||||||
include "../Extras"
|
include "../Extras"
|
||||||
end
|
end
|
||||||
|
|
||||||
if not _OPTIONS["no-demos"] then
|
if not _OPTIONS["no-demos"] then
|
||||||
include "../examples/ExampleBrowser"
|
include "../examples/ExampleBrowser"
|
||||||
include "../examples/OpenGLWindow"
|
include "../examples/OpenGLWindow"
|
||||||
include "../examples/ThirdPartyLibs/Gwen"
|
include "../examples/ThirdPartyLibs/Gwen"
|
||||||
|
|
||||||
include "../examples/HelloWorld"
|
include "../examples/HelloWorld"
|
||||||
include "../examples/BasicDemo"
|
include "../examples/BasicDemo"
|
||||||
|
|
||||||
include "../examples/SharedMemory"
|
include "../examples/SharedMemory"
|
||||||
include "../examples/MultiThreading"
|
include "../examples/MultiThreading"
|
||||||
|
|
||||||
if _OPTIONS["lua"] then
|
if _OPTIONS["lua"] then
|
||||||
include "../examples/ThirdPartyLibs/lua-5.2.3"
|
include "../examples/ThirdPartyLibs/lua-5.2.3"
|
||||||
end
|
end
|
||||||
|
|
||||||
if not _OPTIONS["no-test"] then
|
if not _OPTIONS["no-test"] then
|
||||||
include "../test/SharedMemory"
|
include "../test/SharedMemory"
|
||||||
if _OPTIONS["enet"] then
|
if _OPTIONS["enet"] then
|
||||||
include "../examples/ThirdPartyLibs/enet"
|
include "../examples/ThirdPartyLibs/enet"
|
||||||
include "../test/enet/client"
|
include "../test/enet/client"
|
||||||
include "../test/enet/server"
|
include "../test/enet/server"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if not _OPTIONS["no-test"] then
|
if not _OPTIONS["no-test"] then
|
||||||
include "../test/Bullet2"
|
include "../test/Bullet2"
|
||||||
|
|
||||||
if not _OPTIONS["no-gtest"] then
|
if not _OPTIONS["no-gtest"] then
|
||||||
include "../test/gtest-1.7.0"
|
include "../test/gtest-1.7.0"
|
||||||
-- include "../test/hello_gtest"
|
-- include "../test/hello_gtest"
|
||||||
include "../test/collision"
|
include "../test/collision"
|
||||||
if not _OPTIONS["no-bullet3"] then
|
if not _OPTIONS["no-bullet3"] then
|
||||||
if not _OPTIONS["no-extras"] then
|
if not _OPTIONS["no-extras"] then
|
||||||
include "../test/InverseDynamics"
|
include "../test/InverseDynamics"
|
||||||
end
|
end
|
||||||
include "../test/TestBullet3OpenCL"
|
include "../test/TestBullet3OpenCL"
|
||||||
end
|
end
|
||||||
if not _OPTIONS["no-demos"] then
|
if not _OPTIONS["no-demos"] then
|
||||||
-- Gwen is only used for demos
|
-- Gwen is only used for demos
|
||||||
include "../test/GwenOpenGLTest"
|
include "../test/GwenOpenGLTest"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
include "../src/BulletInverseDynamics"
|
include "../src/BulletInverseDynamics"
|
||||||
include "../src/BulletSoftBody"
|
include "../src/BulletSoftBody"
|
||||||
include "../src/BulletDynamics"
|
include "../src/BulletDynamics"
|
||||||
include "../src/BulletCollision"
|
include "../src/BulletCollision"
|
||||||
include "../src/LinearMath"
|
include "../src/LinearMath"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user