Browse Source

More makefile tweaks, to help fix build

Signed-off-by: falkTX <falktx@falktx.com>
tags/22.06
falkTX 1 month ago
parent
commit
6171cca627
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
4 changed files with 7 additions and 6 deletions
  1. +4
    -0
      Makefile
  2. +1
    -1
      carla
  3. +1
    -1
      dpf
  4. +1
    -4
      src/Makefile.cardinal.mk

+ 4
- 0
Makefile View File

@@ -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



+ 1
- 1
carla

@@ -1 +1 @@
Subproject commit b38917a3f323baa6ab31d35bb340505dff475724
Subproject commit 0a2914088e6dc74d136bc3227d907606b872c22e

+ 1
- 1
dpf

@@ -1 +1 @@
Subproject commit bad716bc14e56c3a7c276b1a77bfdcefc4e8df37
Subproject commit cac6646370b6f83366c8289789f078733a14753a

+ 1
- 4
src/Makefile.cardinal.mk View File

@@ -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


Loading…
Cancel
Save