Merge pull request #4190 from erwincoumans/master

fix build
This commit is contained in:
erwincoumans
2022-03-06 18:54:04 -08:00
committed by GitHub
6 changed files with 93 additions and 7 deletions

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