From 6171cca627e00554ec2ecd1ce6284388ec0c616f Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 2 Jun 2022 12:59:42 +0100 Subject: [PATCH] More makefile tweaks, to help fix build Signed-off-by: falkTX --- Makefile | 4 ++++ carla | 2 +- dpf | 2 +- src/Makefile.cardinal.mk | 5 +---- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index bb86982..e89029e 100644 --- a/Makefile +++ b/Makefile @@ -104,6 +104,9 @@ endif ifneq ($(HAVE_X11),true) $(error X11 dependency not installed/available) endif +ifneq ($(HAVE_XCURSOR),true) +$(warning Xcursor dependency not installed/available) +endif ifneq ($(HAVE_XEXT),true) $(warning Xext dependency not installed/available) endif @@ -115,6 +118,7 @@ else CARLA_EXTRA_ARGS += HAVE_OPENGL=false CARLA_EXTRA_ARGS += HAVE_X11=false +CARLA_EXTRA_ARGS += HAVE_XCURSOR=false CARLA_EXTRA_ARGS += HAVE_XEXT=false CARLA_EXTRA_ARGS += HAVE_XRANDR=false diff --git a/carla b/carla index b38917a..0a29140 160000 --- a/carla +++ b/carla @@ -1 +1 @@ -Subproject commit b38917a3f323baa6ab31d35bb340505dff475724 +Subproject commit 0a2914088e6dc74d136bc3227d907606b872c22e diff --git a/dpf b/dpf index bad716b..cac6646 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit bad716bc14e56c3a7c276b1a77bfdcefc4e8df37 +Subproject commit cac6646370b6f83366c8289789f078733a14753a diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk index d140023..5690058 100644 --- a/src/Makefile.cardinal.mk +++ b/src/Makefile.cardinal.mk @@ -19,11 +19,8 @@ endif ifneq ($(STATIC_BUILD),true) -ifneq ($(DEBUG),true) -EXTERNAL_PLUGINS = true -endif - CWD = ../../carla/source +STATIC_PLUGIN_TARGET = true include $(CWD)/Makefile.deps.mk CARLA_BUILD_DIR = ../../carla/build