fix premake4 build

This commit is contained in:
Erwin Coumans 2022-03-05 18:41:55 -08:00
parent 3315190d97
commit e262b2b7ee
4 changed files with 47 additions and 6 deletions

View File

@ -66,6 +66,26 @@
trigger = "enable_static_vr_plugin",
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
{
@ -319,6 +339,12 @@ end
trigger = "no-test",
description = "Disable all tests"
}
newoption
{
trigger = "test-bullet2",
description = "Enable Bullet2 LinearMath test"
}
newoption
{
@ -646,7 +672,9 @@ end
end
if not _OPTIONS["no-test"] then
if _OPTIONS["test-bullet2"] then
include "../test/Bullet2"
end
if not _OPTIONS["no-gtest"] then
include "../test/gtest-1.7.0"

View File

@ -182,6 +182,7 @@ project "App_BulletExampleBrowser"
"../VoronoiFracture/*",
"../SoftDemo/*",
"../DeformableDemo/*",
"../ReducedDeformableDemo/*",
"../RollingFrictionDemo/*",
"../rbdl/*",
"../FractureDemo/*",

View File

@ -123,7 +123,7 @@ if (_OPTIONS["enable_static_vr_plugin"]) then
files {"plugins/vrSyncPlugin/vrSyncPlugin.cpp"}
end
if (not _OPTIONS["disable_static_tinyrenderer_plugin"]) then
if (_OPTIONS["enable_static_tinyrenderer_plugin"]) then
files
{
"plugins/tinyRendererPlugin/tinyRendererPlugin.cpp",
@ -222,7 +222,7 @@ language "C++"
end
if (not _OPTIONS["disable_static_tinyrenderer_plugin"]) then
if ( _OPTIONS["enable_static_tinyrenderer_plugin"]) then
files
{
"plugins/tinyRendererPlugin/tinyRendererPlugin.cpp",
@ -381,7 +381,7 @@ if os.is("Windows") then
initOpenGL()
initGlew()
if (not _OPTIONS["disable_static_tinyrenderer_plugin"]) then
if ( _OPTIONS["enable_static_tinyrenderer_plugin"]) then
files
{
"plugins/tinyRendererPlugin/tinyRendererPlugin.cpp",
@ -477,13 +477,24 @@ end
include "udp"
include "tcp"
if (_OPTIONS["enable_static_test_plugin"]) then
include "plugins/testPlugin"
end
if (_OPTIONS["enable_vr_sync_plugin"]) then
include "plugins/vrSyncPlugin"
end
if (_OPTIONS["enable_static_tiny_renderer__plugin"]) then
include "plugins/tinyRendererPlugin"
end
if (_OPTIONS["enable_static_pd_control_plugin"]) then
include "plugins/pdControlPlugin"
include "plugins/collisionFilterPlugin"
end
if (_OPTIONS["enable_static_collision_filter_plugin"]) then
include "plugins/collisionFilterPlugin"
end
if _OPTIONS["enable_egl"] then
include "plugins/eglPlugin"
end

View File

@ -10,5 +10,6 @@
end
files {
"**.cpp",
"BulletReducedDeformableBody/**.cpp",
"**.h"
}