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

More make tweaks, try to always use correct paths

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-02-07 22:10:47 +00:00
parent 0fc4a61870
commit 7fcb46832c
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
5 changed files with 33 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/CardinalCommon.cpp
View file

@ -208,7 +208,7 @@ static void saveAsDialog(const bool uncompressed)
FileBrowserOptions opts;
opts.startDir = dir.c_str();
opts.saving = ui->saving = true;
ui->savingUncompressed = true;
ui->savingUncompressed = uncompressed;
ui->openFileBrowser(opts);
}
#endif

20
src/Makefile.cardinal.mk
View file

@ -56,6 +56,12 @@ else
SYSDEPS ?= false
endif
ifeq ($(SYSDEPS),true)
DEP_LIB_PATH = $(abspath ../../deps/sysroot/lib)
else
DEP_LIB_PATH = $(abspath ../src/Rack/dep/lib)
endif
# --------------------------------------------------------------
# Files to build (DPF stuff)
@ -76,18 +82,18 @@ endif
RACK_EXTRA_LIBS = ../../plugins/plugins.a
RACK_EXTRA_LIBS += ../rack.a
RACK_EXTRA_LIBS += ../Rack/dep/lib/libquickjs.a
RACK_EXTRA_LIBS += $(DEP_LIB_PATH)/libquickjs.a
ifneq ($(SYSDEPS),true)
RACK_EXTRA_LIBS += ../Rack/dep/lib/libjansson.a
RACK_EXTRA_LIBS += ../Rack/dep/lib/libsamplerate.a
RACK_EXTRA_LIBS += ../Rack/dep/lib/libspeexdsp.a
RACK_EXTRA_LIBS += $(DEP_LIB_PATH)/libjansson.a
RACK_EXTRA_LIBS += $(DEP_LIB_PATH)/libsamplerate.a
RACK_EXTRA_LIBS += $(DEP_LIB_PATH)/libspeexdsp.a
ifeq ($(WINDOWS),true)
RACK_EXTRA_LIBS += ../Rack/dep/lib/libarchive_static.a
RACK_EXTRA_LIBS += $(DEP_LIB_PATH)/libarchive_static.a
else
RACK_EXTRA_LIBS += ../Rack/dep/lib/libarchive.a
RACK_EXTRA_LIBS += $(DEP_LIB_PATH)/libarchive.a
endif
RACK_EXTRA_LIBS += ../Rack/dep/lib/libzstd.a
RACK_EXTRA_LIBS += $(DEP_LIB_PATH)/libzstd.a
endif
# --------------------------------------------------------------