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

Make sure to use custom JUCE version for surgext builds

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2024-05-24 12:23:57 +02:00
parent 41bd519de7
commit 9ed8f34025
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
4 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -248,3 +248,6 @@
[submodule "plugins/PdArray"] [submodule "plugins/PdArray"]
path = plugins/PdArray path = plugins/PdArray
url = https://github.com/mgunyho/PdArray.git url = https://github.com/mgunyho/PdArray.git
[submodule "deps/JUCE"]
path = deps/JUCE
url = https://github.com/CardinalModules/JUCE.git

1
deps/JUCE vendored Submodule

@ -0,0 +1 @@
Subproject commit 4aaa2a7f4c83bd9807070825fbccd9d6d582e34d

4
deps/Makefile vendored
View file

@ -266,6 +266,9 @@ ifeq ($(CPU_I386),true)
SURGE_CXX_FLAGS += -D__sigemptyset=sigemptyset SURGE_CXX_FLAGS += -D__sigemptyset=sigemptyset
endif endif
# use custom JUCE
SURGE_CXX_FLAGS += -I$(abspath ../deps/JUCE/modules)
# possibly use fftw? # possibly use fftw?
# ifeq ($(shell $(PKG_CONFIG) --exists fftw3 fftw3f && echo true),true) # ifeq ($(shell $(PKG_CONFIG) --exists fftw3 fftw3f && echo true),true)
# SURGE_CXX_FLAGS += -DJUCE_DSP_USE_STATIC_FFTW=1 # SURGE_CXX_FLAGS += -DJUCE_DSP_USE_STATIC_FFTW=1
@ -295,6 +298,7 @@ $(SURGE_DEP_PATH)/Makefile: $(SURGE_SRC_PATH)/CMakeLists.txt
-DSURGE_SKIP_JUCE_FOR_RACK=TRUE \ -DSURGE_SKIP_JUCE_FOR_RACK=TRUE \
-DSURGE_SKIP_LUA=TRUE \ -DSURGE_SKIP_LUA=TRUE \
-DSURGE_SKIP_ODDSOUND_MTS=TRUE \ -DSURGE_SKIP_ODDSOUND_MTS=TRUE \
-DSURGE_JUCE_PATH=$(abspath ../deps/JUCE) \
-DSURGE_SIMDE_PATH=$(abspath ../src/Rack/dep/simde) \ -DSURGE_SIMDE_PATH=$(abspath ../src/Rack/dep/simde) \
$(SURGE_SRC_PATH) $(SURGE_SRC_PATH)

2
src/Makefile.cardinal.mk
View file

@ -188,7 +188,7 @@ endif
ifeq ($(MACOS),true) ifeq ($(MACOS),true)
EXTRA_DSP_LIBS += -framework Accelerate -framework AppKit EXTRA_DSP_LIBS += -framework Accelerate -framework AppKit
else ifeq ($(WINDOWS),true) else ifeq ($(WINDOWS),true)
EXTRA_DSP_LIBS += -lole32 -lshlwapi -luuid -lversion -lwininet EXTRA_DSP_LIBS += -lole32 -lshlwapi -luuid -lversion
endif endif
# -------------------------------------------------------------- # --------------------------------------------------------------