Browse Source

Switch to VCV's rtmidi branch. Update rtmidi from upstream.

tags/v2.1.0
Andrew Belt 2 years ago
parent
commit
05d93da0ba
3 changed files with 11 additions and 12 deletions
  1. +3
    -0
      .gitmodules
  2. +7
    -12
      dep/Makefile
  3. +1
    -0
      dep/rtmidi

+ 3
- 0
.gitmodules View File

@@ -31,3 +31,6 @@
[submodule "dep/pffft"]
path = dep/pffft
url = https://bitbucket.org/jpommier/pffft.git
[submodule "dep/rtmidi"]
path = dep/rtmidi
url = https://github.com/VCVRack/rtmidi.git

+ 7
- 12
dep/Makefile View File

@@ -186,15 +186,9 @@ $(libsamplerate): | libsamplerate-0.1.9
$(MAKE) -C libsamplerate-0.1.9
$(MAKE) -C libsamplerate-0.1.9 install

rtmidi-4.0.0:
$(WGET) "http://www.music.mcgill.ca/~gary/rtmidi/release/rtmidi-4.0.0.tar.gz"
$(SHA256) rtmidi-4.0.0.tar.gz 370cfe710f43fbeba8d2b8c8bc310f314338c519c2cf2865e2d2737b251526cd
$(UNTAR) rtmidi-4.0.0.tar.gz
rm rtmidi-4.0.0.tar.gz

RTMIDI_FLAGS += --enable-shared=no
ifdef ARCH_LIN
RTMIDI_FLAGS += --with-jack --with-alsa
RTMIDI_FLAGS += --with-alsa --with-jack
endif
ifdef ARCH_MAC
RTMIDI_FLAGS += --with-core --without-jack
@@ -203,10 +197,11 @@ ifdef ARCH_WIN
RTMIDI_FLAGS += --with-winmm
endif

$(rtmidi): | rtmidi-4.0.0
cd rtmidi-4.0.0 && $(CONFIGURE) $(RTMIDI_FLAGS)
$(MAKE) -C rtmidi-4.0.0
$(MAKE) -C rtmidi-4.0.0 install
$(rtmidi): | rtmidi
cd rtmidi && ./autogen.sh --no-configure
cd rtmidi && $(CONFIGURE) $(RTMIDI_FLAGS)
$(MAKE) -C rtmidi
$(MAKE) -C rtmidi install

RTAUDIO_FLAGS += -DRTAUDIO_BUILD_STATIC_LIBS=ON -DRTAUDIO_BUILD_TESTING=OFF
ifdef ARCH_LIN
@@ -262,7 +257,7 @@ $(ghcfilesystem): filesystem/include/ghc

# Helpers

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

clean:
git clean -fdx


+ 1
- 0
dep/rtmidi

@@ -0,0 +1 @@
Subproject commit 2c5b0778e38b5030afc80c8e9d7adc9b58ef650e

Loading…
Cancel
Save