brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More makefile tweaks, to help fix build

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-06-02 12:59:42 +01:00
parent 5d40a9dbf8
commit 6171cca627
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
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

2
carla

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

2
dpf

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

5
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