Sort out some makefile details

Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2021-10-23 01:13:15 +01:00
parent c55455eb21
commit d4b17e0a90
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
2 changed files with 31 additions and 10 deletions

View file

@ -21,16 +21,33 @@ SYSDEPS ?= false
ifeq ($(SYSDEPS),true)
ifneq ($(shell pkg-config --exists jansson && echo true),true)
$(error jansson dpendency not installed/available)
$(error jansson dependency not installed/available)
endif
ifneq ($(shell pkg-config --exists libarchive && echo true),true)
$(error libarchive dpendency not installed/available)
$(error libarchive dependency not installed/available)
endif
ifneq ($(shell pkg-config --exists samplerate && echo true),true)
$(error samplerate dpendency not installed/available)
$(error samplerate dependency not installed/available)
endif
ifneq ($(shell pkg-config --exists speexdsp && echo true),true)
$(error speexdsp dpendency not installed/available)
$(error speexdsp dependency not installed/available)
endif
endif
ifneq ($(HAIKU_OR_MACOS_OR_WINDOWS),true)
ifneq ($(HAVE_OPENGL),true)
$(error X11 dependency not installed/available)
endif
ifneq ($(HAVE_X11),true)
$(error X11 dependency not installed/available)
endif
ifneq ($(HAVE_XEXT),true)
$(warning Xext dependency not installed/available)
endif
ifneq ($(HAVE_XRANDR),true)
$(warning Xrandr dependency not installed/available)
endif
endif
@ -46,8 +63,7 @@ ifneq ($(SYSDEPS),true)
endif
dgl:
$(MAKE) USE_NANOVG_FBO=true -C dpf/dgl opengl
# $(MAKE) opengl -C dpf/dgl USE_NANOVG_FBO=true
$(MAKE) -C dpf/dgl opengl USE_NANOVG_FBO=true
plugins: deps
$(MAKE) all -C plugins

View file

@ -28,6 +28,10 @@ FILES_DSP = \
override/library.cpp \
override/network.cpp
# override/osdialog.cpp
# override/RemoteNanoVG.cpp
# override/RemoteWindow.cpp
FILES_UI = \
CardinalUI.cpp \
override/MenuBar.cpp \
@ -44,11 +48,10 @@ include ../dpf/Makefile.base.mk
FILES_DSP += Rack/dep/pffft/pffft.c
FILES_DSP += Rack/dep/pffft/fftpack.c
FILES_UI += Rack/dep/oui-blendish/blendish.c
FILES_DSP += Rack/dep/osdialog/osdialog.c
FILES_DSP += Rack/dep/oui-blendish/blendish.c
# FIXME dont use this
FILES_UI += Rack/dep/osdialog/osdialog.c
ifeq ($(MACOS),true)
FILES_UI += Rack/dep/osdialog/osdialog_mac.m
else ifeq ($(WINDOWS),true)
@ -68,11 +71,13 @@ IGNORED_FILES += Rack/src/library.cpp
IGNORED_FILES += Rack/src/network.cpp
IGNORED_FILES += Rack/src/rtaudio.cpp
IGNORED_FILES += Rack/src/rtmidi.cpp
IGNORED_FILES += Rack/src/app/MenuBar.cpp
IGNORED_FILES += Rack/src/window/Window.cpp
FILES_DSP += $(wildcard Rack/src/*.c)
FILES_DSP += $(wildcard Rack/src/*/*.c)
FILES_DSP += $(filter-out $(IGNORED_FILES),$(wildcard Rack/src/*.cpp))
FILES_DSP += $(filter-out Rack/src/app/MenuBar.cpp Rack/src/window/Window.cpp, $(wildcard Rack/src/*/*.cpp))
FILES_DSP += $(filter-out $(IGNORED_FILES), $(wildcard Rack/src/*/*.cpp))
# --------------------------------------------------------------
# Extra libraries to link against