@@ -38,7 +38,7 @@ build/dep/osdialog/osdialog_gtk3.c.o: FLAGS += $(shell pkg-config --cflags gtk+- | |||||
LDFLAGS += -static-libstdc++ -static-libgcc | LDFLAGS += -static-libstdc++ -static-libgcc | ||||
LDFLAGS += dep/lib/libGLEW.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a dep/lib/libarchive.a dep/lib/libzstd.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a dep/lib/librtmidi.a dep/lib/librtaudio.a | LDFLAGS += dep/lib/libGLEW.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a dep/lib/libarchive.a dep/lib/libzstd.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a dep/lib/librtmidi.a dep/lib/librtaudio.a | ||||
LDFLAGS += -Wl,--no-whole-archive | LDFLAGS += -Wl,--no-whole-archive | ||||
LDFLAGS += -lpthread -lGL -ldl -lX11 -lasound -ljack | |||||
LDFLAGS += -lpthread -lGL -ldl -lX11 -lasound -ljack -lpulse -lpulse-simple | |||||
LDFLAGS += $(shell pkg-config --libs gtk+-3.0) | LDFLAGS += $(shell pkg-config --libs gtk+-3.0) | ||||
STANDALONE_TARGET := Rack | STANDALONE_TARGET := Rack | ||||
@@ -208,7 +208,7 @@ $(rtmidi): | rtmidi-4.0.0 | |||||
RTAUDIO_FLAGS += -DRTAUDIO_BUILD_STATIC_LIBS=ON -DRTAUDIO_BUILD_TESTING=OFF | RTAUDIO_FLAGS += -DRTAUDIO_BUILD_STATIC_LIBS=ON -DRTAUDIO_BUILD_TESTING=OFF | ||||
ifdef ARCH_LIN | ifdef ARCH_LIN | ||||
RTAUDIO_FLAGS += -DRTAUDIO_API_ALSA=ON -DRTAUDIO_API_JACK=ON -DRTAUDIO_API_PULSE=OFF -DRTAUDIO_API_OSS=OFF | |||||
RTAUDIO_FLAGS += -DRTAUDIO_API_ALSA=ON -DRTAUDIO_API_JACK=ON -DRTAUDIO_API_PULSE=ON -DRTAUDIO_API_OSS=OFF | |||||
endif | endif | ||||
ifdef ARCH_MAC | ifdef ARCH_MAC | ||||
RTAUDIO_FLAGS += -DRTAUDIO_API_CORE=ON -DRTAUDIO_API_PULSE=OFF -DRTAUDIO_API_JACK=OFF | RTAUDIO_FLAGS += -DRTAUDIO_API_CORE=ON -DRTAUDIO_API_PULSE=OFF -DRTAUDIO_API_JACK=OFF | ||||
@@ -372,8 +372,8 @@ void rtaudioInit() { | |||||
// I don't like the order returned by getCompiledApi(), so reorder it here. | // I don't like the order returned by getCompiledApi(), so reorder it here. | ||||
std::vector<RtAudio::Api> orderedApis = { | std::vector<RtAudio::Api> orderedApis = { | ||||
RtAudio::LINUX_ALSA, | RtAudio::LINUX_ALSA, | ||||
RtAudio::UNIX_JACK, | |||||
RtAudio::LINUX_PULSE, | RtAudio::LINUX_PULSE, | ||||
RtAudio::UNIX_JACK, | |||||
RtAudio::LINUX_OSS, | RtAudio::LINUX_OSS, | ||||
RtAudio::WINDOWS_WASAPI, | RtAudio::WINDOWS_WASAPI, | ||||
RtAudio::WINDOWS_ASIO, | RtAudio::WINDOWS_ASIO, | ||||