More makefile tweaks, to help fix build

Signed-off-by: falkTX <falktx@falktx.com>
CryptoneanLabs · Jun 2, 2022 · 6171cca · 6171cca
1 parent 5d40a9d
commit 6171cca
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git 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
diff --git a/dpf b/dpf
diff --git 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
+18 −17		source/Makefile.deps.mk
+2 −0		source/modules/ysfx/Makefile
+1 −1		source/modules/ysfx/sources/eel2-gas/sources/asm-nseel-x64-sse.S