Browse Source

Merge branch 'master' of github.com:VCVRack/Rack

tags/v0.4.0
Andrew Belt 7 years ago
parent
commit
98c6df1932
2 changed files with 11 additions and 8 deletions
  1. +10
    -7
      dep/Makefile
  2. +1
    -1
      src/core/MidiInterface.cpp

+ 10
- 7
dep/Makefile View File

@@ -4,9 +4,11 @@ LOCAL = $(shell pwd)
include ../arch.mk

ifeq ($(ARCH),mac)
export CFLAGS = -mmacosx-version-min=10.7
export CXXFLAGS = $(CFLAGS)
export LDFLAGS = $(CFLAGS)
MACOS_FLAGS = -mmacosx-version-min=10.7 -stdlib=libc++
export CFLAGS = $(MACOS_FLAGS)
export CXXFLAGS = $(MACOS_FLAGS)
export CPPFLAGS = $(MACOS_FLAGS)
export LDFLAGS = $(MACOS_FLAGS)
endif

# Commands
@@ -114,10 +116,11 @@ $(libzip):
$(MAKE) -C libzip-1.2.0 install

$(rtmidi):
git clone https://github.com/thestk/rtmidi.git rtmidi
cd rtmidi && ./autogen.sh && ./configure --prefix="$(LOCAL)"
$(MAKE) -C rtmidi
$(MAKE) -C rtmidi install
$(WGET) http://www.music.mcgill.ca/~gary/rtmidi/release/rtmidi-3.0.0.tar.gz
$(UNTAR) rtmidi-3.0.0.tar.gz
cd rtmidi-3.0.0 && ./configure --prefix="$(LOCAL)"
$(MAKE) -C rtmidi-3.0.0
$(MAKE) -C rtmidi-3.0.0 install

$(portaudio):
ifeq ($(ARCH),win)


+ 1
- 1
src/core/MidiInterface.cpp View File

@@ -40,7 +40,7 @@ struct MidiInterface : Module {

MidiInterface() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS) {
try {
midiIn = new RtMidiIn(RtMidi::UNSPECIFIED, "VCVRack");
midiIn = new RtMidiIn(RtMidi::UNSPECIFIED, "Rack");
}
catch ( RtMidiError &error ) {
fprintf(stderr, "Failed to create RtMidiIn: %s\n", error.getMessage().c_str());


Loading…
Cancel
Save