Browse Source

Fix dep build on Mac arm64. Update speexdsp to git submodule.

tags/v2.2.0
Andrew Belt 2 years ago
parent
commit
a053c4bbad
5 changed files with 19 additions and 16 deletions
  1. +3
    -0
      .gitmodules
  2. +0
    -3
      Makefile
  3. +9
    -2
      dep.mk
  4. +6
    -11
      dep/Makefile
  5. +1
    -0
      dep/speexdsp

+ 3
- 0
.gitmodules View File

@@ -40,3 +40,6 @@
[submodule "dep/tinyexpr"] [submodule "dep/tinyexpr"]
path = dep/tinyexpr path = dep/tinyexpr
url = https://github.com/codeplea/tinyexpr.git url = https://github.com/codeplea/tinyexpr.git
[submodule "dep/speexdsp"]
path = dep/speexdsp
url = https://gitlab.xiph.org/xiph/speexdsp.git

+ 0
- 3
Makefile View File

@@ -79,9 +79,6 @@ endif
ifdef ARCH_MAC ifdef ARCH_MAC
STANDALONE_TARGET := Rack STANDALONE_TARGET := Rack
STANDALONE_LDFLAGS += -stdlib=libc++ STANDALONE_LDFLAGS += -stdlib=libc++
# For LuaJIT to work inside plugins
STANDALONE_LDFLAGS += -Wl,-pagezero_size,10000 -Wl,-image_base,100000000
STANDALONE_LDFLAGS += $(MAC_SDK_FLAGS)
endif endif
ifdef ARCH_WIN ifdef ARCH_WIN
STANDALONE_TARGET := Rack.exe STANDALONE_TARGET := Rack.exe


+ 9
- 2
dep.mk View File

@@ -5,11 +5,18 @@ DEP_LOCAL ?= dep
$(shell mkdir -p $(DEP_LOCAL)) $(shell mkdir -p $(DEP_LOCAL))
DEP_PATH := $(abspath $(DEP_LOCAL)) DEP_PATH := $(abspath $(DEP_LOCAL))


DEP_FLAGS += -g -O3 -march=nehalem
DEP_FLAGS += -g -O3
# This is needed for Rack for DAWs. # This is needed for Rack for DAWs.
# Static libs don't usually compiled with -fPIC, but since we're including them in a shared library, it's needed. # Static libs don't usually compiled with -fPIC, but since we're including them in a shared library, it's needed.
DEP_FLAGS += -fPIC DEP_FLAGS += -fPIC


ifdef ARCH_X64
DEP_FLAGS += -march=nehalem
endif
ifdef ARCH_ARM64
DEP_FLAGS += -march=armv8-a+fp+simd
endif

ifdef ARCH_MAC ifdef ARCH_MAC
DEP_MAC_SDK_FLAGS := -mmacosx-version-min=10.9 DEP_MAC_SDK_FLAGS := -mmacosx-version-min=10.9
DEP_FLAGS += $(DEP_MAC_SDK_FLAGS) -stdlib=libc++ DEP_FLAGS += $(DEP_MAC_SDK_FLAGS) -stdlib=libc++
@@ -23,7 +30,7 @@ DEP_CXXFLAGS += $(DEP_FLAGS)
WGET := wget -c WGET := wget -c
UNTAR := tar xf UNTAR := tar xf
UNZIP := unzip -o UNZIP := unzip -o
CONFIGURE := ./configure --prefix="$(DEP_PATH)" --host=$(MACHINE)
CONFIGURE := ./configure --prefix="$(DEP_PATH)"


CMAKE := cmake CMAKE := cmake
# We must use the MSYS Makefile generator in an MSYS shell. # We must use the MSYS Makefile generator in an MSYS shell.


+ 6
- 11
dep/Makefile View File

@@ -168,16 +168,11 @@ $(libarchive): | $(zstd) libarchive-3.4.3
$(MAKE) -C libarchive-3.4.3/build $(MAKE) -C libarchive-3.4.3/build
$(MAKE) -C libarchive-3.4.3/build install $(MAKE) -C libarchive-3.4.3/build install


speexdsp-SpeexDSP-1.2rc3:
$(WGET) "https://vcvrack.com/downloads/dep/speexdsp-SpeexDSP-1.2rc3.tgz"
$(SHA256) speexdsp-SpeexDSP-1.2rc3.tgz c8dded1454747f65956f981c95e7f89a06abdaa2a53e8aeaa66bab2a3d59cebd
$(UNTAR) speexdsp-SpeexDSP-1.2rc3.tgz
rm speexdsp-SpeexDSP-1.2rc3.tgz

$(libspeexdsp): | speexdsp-SpeexDSP-1.2rc3
cd speexdsp-SpeexDSP-1.2rc3 && $(CONFIGURE)
$(MAKE) -C speexdsp-SpeexDSP-1.2rc3
$(MAKE) -C speexdsp-SpeexDSP-1.2rc3 install
$(libspeexdsp): | speexdsp
cd speexdsp && ./autogen.sh
cd speexdsp && $(CONFIGURE)
$(MAKE) -C speexdsp
$(MAKE) -C speexdsp install


libsamplerate-0.1.9: libsamplerate-0.1.9:
$(WGET) "https://github.com/libsndfile/libsamplerate/releases/download/0.1.9/libsamplerate-0.1.9.tar.gz" || $(WGET) "http://www.mega-nerd.com/SRC/libsamplerate-0.1.9.tar.gz" $(WGET) "https://github.com/libsndfile/libsamplerate/releases/download/0.1.9/libsamplerate-0.1.9.tar.gz" || $(WGET) "http://www.mega-nerd.com/SRC/libsamplerate-0.1.9.tar.gz"
@@ -269,7 +264,7 @@ $(sse2neon): sse2neon/sse2neon.h


# Helpers # Helpers


src: glew-2.1.0 glfw jansson-2.12 speexdsp-SpeexDSP-1.2rc3 libsamplerate-0.1.9 openssl-1.1.1k curl-7.79.1 zstd-1.4.5 libarchive-3.4.3 rtaudio nanovg nanosvg oui-blendish osdialog
src: glew-2.1.0 glfw jansson-2.12 libsamplerate-0.1.9 openssl-1.1.1k curl-7.79.1 zstd-1.4.5 libarchive-3.4.3 rtaudio nanovg nanosvg oui-blendish osdialog


clean: clean:
git clean -fdx git clean -fdx


+ 1
- 0
dep/speexdsp

@@ -0,0 +1 @@
Subproject commit 27ddf98b627ab425d5337b1a0d8b80d7528f9b30

Loading…
Cancel
Save