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

8
deps/Makefile vendored
View file

@ -4,8 +4,6 @@
# Created by falkTX
#
DEP_PATH = $(abspath ../src/Rack/dep)
# --------------------------------------------------------------
# Import base definitions
@ -21,6 +19,12 @@ else
SYSDEPS ?= false
endif
ifeq ($(SYSDEPS),true)
DEP_PATH = $(abspath sysroot)
else
DEP_PATH = $(abspath ../src/Rack/dep)
endif
# --------------------------------------------------------------
# custom build flags

13
doc/BUILDING.md
View file

@ -51,7 +51,7 @@ Dependencies for using system libraries:
```
# common
sudo pkg install -A dbus libglvnd liblo libsndfile libX11 libXcursor libXext libXrandr
sudo pkg install -A dbus libglvnd liblo libsndfile libX11 libXcursor libXext libXrandr python3
# system libraries
sudo pkg install -A libarchive libsamplerate jansson speexdsp
```
@ -67,7 +67,7 @@ Dependencies for using system libraries, that is, with `SYSDEPS=true`:
```
# common
sudo pacman -S dbus libgl liblo libsndfile libx11 libxcursor libxext libxrandr
sudo pacman -S dbus libgl liblo libsndfile libx11 libxcursor libxext libxrandr python3
# system libraries
sudo pacman -S libarchive libsamplerate jansson speexdsp
```
@ -76,7 +76,7 @@ Dependencies for vendored libraries:
```
# common
sudo pacman -S dbus libgl liblo libsndfile libx11 libxcursor libxext libxrandr
sudo pacman -S dbus libgl liblo libsndfile libx11 libxcursor libxext libxrandr python3
# nedeed by vendored libraries
sudo pacman -S cmake wget
```
@ -87,7 +87,7 @@ Dependencies for using system libraries, that is, with `SYSDEPS=true`:
```
# common
sudo apt install libdbus-1-dev libgl1-mesa-dev liblo-dev libsndfile1-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev
sudo apt install libdbus-1-dev libgl1-mesa-dev liblo-dev libsndfile1-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev python3
# system libraries
sudo apt install libarchive-dev libjansson-dev libsamplerate0-dev libspeexdsp-dev
```
@ -96,7 +96,7 @@ Dependencies for vendored libraries:
```
# common
sudo apt install libdbus-1-dev libgl1-mesa-dev liblo-dev libsndfile1-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev
sudo apt install libdbus-1-dev libgl1-mesa-dev liblo-dev libsndfile1-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev python3
# nedeed by vendored libraries
sudo apt install cmake wget
```
@ -104,7 +104,8 @@ sudo apt install cmake wget
## macOS
Installing Xcode and the "Command-Line utilities" add-on is required.
Additionally you can install libsndfile from Homebrew or MacPorts in order to make Cardinal's audio file module work. (Otherwise it will support only mp3 files)
Additionally you will need `python3` and `wget` from either Homebrew or MacPorts, whatever you prefer.
You can also install libsndfile in order to make Cardinal's audio file module work. (Otherwise it will support only mp3 files)
If you want to have universal builds similar to the ones officially published by Cardinal, simply setup the environment like this:

6
plugins/Makefile
View file

@ -738,6 +738,7 @@ endif
ifeq ($(SYSDEPS),true)
BASE_FLAGS += -DCARDINAL_SYSDEPS
BASE_FLAGS += $(shell pkg-config --cflags jansson libarchive samplerate speexdsp)
BASE_FLAGS += -I../deps/sysroot
else
BASE_FLAGS += -DZSTDLIB_VISIBILITY=
BASE_FLAGS += -I../src/Rack/dep/include
@ -765,6 +766,11 @@ BASE_FLAGS += -ffat-lto-objects
endif
endif
ifeq ($(BSD),true)
BASE_FLAGS += -D'aligned_alloc_16(ptr)'='aligned_alloc(16,ptr)'
BASE_FLAGS += -D'aligned_free_16(ptr)'='free(ptr)'
endif
ifeq ($(WASM),true)
BASE_FLAGS += -DNANOVG_GLES2=1
BASE_FLAGS += -msse -msse2 -msse3 -msimd128

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