mirror of
https://github.com/bulletphysics/bullet3
synced 2024-12-05 01:50:05 +00:00
fix premake4 build
This commit is contained in:
parent
3315190d97
commit
e262b2b7ee
@ -66,6 +66,26 @@
|
|||||||
trigger = "enable_static_vr_plugin",
|
trigger = "enable_static_vr_plugin",
|
||||||
description = "Statically link vr plugin (in examples/SharedMemory/plugins/vrSyncPlugin)"
|
description = "Statically link vr plugin (in examples/SharedMemory/plugins/vrSyncPlugin)"
|
||||||
}
|
}
|
||||||
|
newoption
|
||||||
|
{
|
||||||
|
trigger = "enable_static_test_plugin",
|
||||||
|
description = "Statically link test plugin (in examples/SharedMemory/plugins/testPlugin)"
|
||||||
|
}
|
||||||
|
newoption
|
||||||
|
{
|
||||||
|
trigger = "enable_static_tiny_renderer__plugin",
|
||||||
|
description = "Statically link vr plugin (in examples/SharedMemory/plugins/tinyRendererPlugin)"
|
||||||
|
}
|
||||||
|
newoption
|
||||||
|
{
|
||||||
|
trigger = "enable_static_pd_control_plugin",
|
||||||
|
description = "Statically link vr plugin (in examples/SharedMemory/plugins/pdControlPlugin)"
|
||||||
|
}
|
||||||
|
newoption
|
||||||
|
{
|
||||||
|
trigger = "enable_static_collision_filter_plugin",
|
||||||
|
description = "Statically link vr plugin (in examples/SharedMemory/plugins/collisionFilterPlugin)"
|
||||||
|
}
|
||||||
|
|
||||||
newoption
|
newoption
|
||||||
{
|
{
|
||||||
@ -319,6 +339,12 @@ end
|
|||||||
trigger = "no-test",
|
trigger = "no-test",
|
||||||
description = "Disable all tests"
|
description = "Disable all tests"
|
||||||
}
|
}
|
||||||
|
newoption
|
||||||
|
{
|
||||||
|
trigger = "test-bullet2",
|
||||||
|
|
||||||
|
description = "Enable Bullet2 LinearMath test"
|
||||||
|
}
|
||||||
|
|
||||||
newoption
|
newoption
|
||||||
{
|
{
|
||||||
@ -646,7 +672,9 @@ end
|
|||||||
end
|
end
|
||||||
|
|
||||||
if not _OPTIONS["no-test"] then
|
if not _OPTIONS["no-test"] then
|
||||||
|
if _OPTIONS["test-bullet2"] then
|
||||||
include "../test/Bullet2"
|
include "../test/Bullet2"
|
||||||
|
end
|
||||||
|
|
||||||
if not _OPTIONS["no-gtest"] then
|
if not _OPTIONS["no-gtest"] then
|
||||||
include "../test/gtest-1.7.0"
|
include "../test/gtest-1.7.0"
|
||||||
|
@ -182,6 +182,7 @@ project "App_BulletExampleBrowser"
|
|||||||
"../VoronoiFracture/*",
|
"../VoronoiFracture/*",
|
||||||
"../SoftDemo/*",
|
"../SoftDemo/*",
|
||||||
"../DeformableDemo/*",
|
"../DeformableDemo/*",
|
||||||
|
"../ReducedDeformableDemo/*",
|
||||||
"../RollingFrictionDemo/*",
|
"../RollingFrictionDemo/*",
|
||||||
"../rbdl/*",
|
"../rbdl/*",
|
||||||
"../FractureDemo/*",
|
"../FractureDemo/*",
|
||||||
|
@ -123,7 +123,7 @@ if (_OPTIONS["enable_static_vr_plugin"]) then
|
|||||||
files {"plugins/vrSyncPlugin/vrSyncPlugin.cpp"}
|
files {"plugins/vrSyncPlugin/vrSyncPlugin.cpp"}
|
||||||
end
|
end
|
||||||
|
|
||||||
if (not _OPTIONS["disable_static_tinyrenderer_plugin"]) then
|
if (_OPTIONS["enable_static_tinyrenderer_plugin"]) then
|
||||||
files
|
files
|
||||||
{
|
{
|
||||||
"plugins/tinyRendererPlugin/tinyRendererPlugin.cpp",
|
"plugins/tinyRendererPlugin/tinyRendererPlugin.cpp",
|
||||||
@ -222,7 +222,7 @@ language "C++"
|
|||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
if (not _OPTIONS["disable_static_tinyrenderer_plugin"]) then
|
if ( _OPTIONS["enable_static_tinyrenderer_plugin"]) then
|
||||||
files
|
files
|
||||||
{
|
{
|
||||||
"plugins/tinyRendererPlugin/tinyRendererPlugin.cpp",
|
"plugins/tinyRendererPlugin/tinyRendererPlugin.cpp",
|
||||||
@ -381,7 +381,7 @@ if os.is("Windows") then
|
|||||||
initOpenGL()
|
initOpenGL()
|
||||||
initGlew()
|
initGlew()
|
||||||
|
|
||||||
if (not _OPTIONS["disable_static_tinyrenderer_plugin"]) then
|
if ( _OPTIONS["enable_static_tinyrenderer_plugin"]) then
|
||||||
files
|
files
|
||||||
{
|
{
|
||||||
"plugins/tinyRendererPlugin/tinyRendererPlugin.cpp",
|
"plugins/tinyRendererPlugin/tinyRendererPlugin.cpp",
|
||||||
@ -477,13 +477,24 @@ end
|
|||||||
include "udp"
|
include "udp"
|
||||||
include "tcp"
|
include "tcp"
|
||||||
|
|
||||||
|
if (_OPTIONS["enable_static_test_plugin"]) then
|
||||||
include "plugins/testPlugin"
|
include "plugins/testPlugin"
|
||||||
|
end
|
||||||
|
|
||||||
|
if (_OPTIONS["enable_vr_sync_plugin"]) then
|
||||||
include "plugins/vrSyncPlugin"
|
include "plugins/vrSyncPlugin"
|
||||||
|
end
|
||||||
|
|
||||||
|
if (_OPTIONS["enable_static_tiny_renderer__plugin"]) then
|
||||||
include "plugins/tinyRendererPlugin"
|
include "plugins/tinyRendererPlugin"
|
||||||
|
end
|
||||||
|
if (_OPTIONS["enable_static_pd_control_plugin"]) then
|
||||||
include "plugins/pdControlPlugin"
|
include "plugins/pdControlPlugin"
|
||||||
include "plugins/collisionFilterPlugin"
|
end
|
||||||
|
|
||||||
|
if (_OPTIONS["enable_static_collision_filter_plugin"]) then
|
||||||
|
include "plugins/collisionFilterPlugin"
|
||||||
|
end
|
||||||
if _OPTIONS["enable_egl"] then
|
if _OPTIONS["enable_egl"] then
|
||||||
include "plugins/eglPlugin"
|
include "plugins/eglPlugin"
|
||||||
end
|
end
|
||||||
|
@ -10,5 +10,6 @@
|
|||||||
end
|
end
|
||||||
files {
|
files {
|
||||||
"**.cpp",
|
"**.cpp",
|
||||||
|
"BulletReducedDeformableBody/**.cpp",
|
||||||
"**.h"
|
"**.h"
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user