diff --git a/.gitmodules b/.gitmodules index 577b352..91755d3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -248,3 +248,6 @@ [submodule "plugins/PdArray"] path = plugins/PdArray url = https://github.com/mgunyho/PdArray.git +[submodule "deps/JUCE"] + path = deps/JUCE + url = https://github.com/CardinalModules/JUCE.git diff --git a/deps/JUCE b/deps/JUCE new file mode 160000 index 0000000..4aaa2a7 --- /dev/null +++ b/deps/JUCE @@ -0,0 +1 @@ +Subproject commit 4aaa2a7f4c83bd9807070825fbccd9d6d582e34d diff --git a/deps/Makefile b/deps/Makefile index 29cca40..6e985d4 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -266,6 +266,9 @@ ifeq ($(CPU_I386),true) SURGE_CXX_FLAGS += -D__sigemptyset=sigemptyset endif +# use custom JUCE +SURGE_CXX_FLAGS += -I$(abspath ../deps/JUCE/modules) + # possibly use fftw? # ifeq ($(shell $(PKG_CONFIG) --exists fftw3 fftw3f && echo true),true) # 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_LUA=TRUE \ -DSURGE_SKIP_ODDSOUND_MTS=TRUE \ + -DSURGE_JUCE_PATH=$(abspath ../deps/JUCE) \ -DSURGE_SIMDE_PATH=$(abspath ../src/Rack/dep/simde) \ $(SURGE_SRC_PATH) diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk index 16e6250..56b3dd9 100644 --- a/src/Makefile.cardinal.mk +++ b/src/Makefile.cardinal.mk @@ -188,7 +188,7 @@ endif ifeq ($(MACOS),true) EXTRA_DSP_LIBS += -framework Accelerate -framework AppKit else ifeq ($(WINDOWS),true) -EXTRA_DSP_LIBS += -lole32 -lshlwapi -luuid -lversion -lwininet +EXTRA_DSP_LIBS += -lole32 -lshlwapi -luuid -lversion endif # --------------------------------------------------------------