Browse Source

Add JACK driver to Linux rtaudio, forcing Linux users to have JACK

installed
tags/v0.6.1
Andrew Belt 7 years ago
parent
commit
f3a7f1a524
2 changed files with 14 additions and 14 deletions
  1. +12
    -12
      Makefile
  2. +2
    -2
      dep/Makefile

+ 12
- 12
Makefile View File

@@ -18,18 +18,6 @@ STRIP ?= strip
SOURCES += $(wildcard src/*.cpp src/*/*.cpp) SOURCES += $(wildcard src/*.cpp src/*/*.cpp)
SOURCES += dep/nanovg/src/nanovg.c SOURCES += dep/nanovg/src/nanovg.c


ifeq ($(ARCH), lin)
SOURCES += dep/osdialog/osdialog_gtk2.c
CFLAGS += $(shell pkg-config --cflags gtk+-2.0)
LDFLAGS += -rdynamic \
-lpthread -lGL -ldl -lX11 -lasound \
$(shell pkg-config --libs gtk+-2.0) \
-Ldep/lib \
-Wl,-Bstatic -lglfw3 -lGLEW -ljansson -lspeexdsp -lzip -lz -lrtmidi -lrtaudio -lcurl -lssl -lcrypto \
-Wl,-Bdynamic
TARGET := Rack
endif

ifeq ($(ARCH), mac) ifeq ($(ARCH), mac)
SOURCES += dep/osdialog/osdialog_mac.m SOURCES += dep/osdialog/osdialog_mac.m
CXXFLAGS += -stdlib=libc++ CXXFLAGS += -stdlib=libc++
@@ -51,6 +39,18 @@ ifeq ($(ARCH), win)
OBJECTS += Rack.res OBJECTS += Rack.res
endif endif


ifeq ($(ARCH), lin)
SOURCES += dep/osdialog/osdialog_gtk2.c
CFLAGS += $(shell pkg-config --cflags gtk+-2.0)
LDFLAGS += -rdynamic \
-lpthread -lGL -ldl -lX11 -lasound -ljack \
$(shell pkg-config --libs gtk+-2.0) \
-Ldep/lib \
-Wl,-Bstatic -lglfw3 -lGLEW -ljansson -lspeexdsp -lzip -lz -lrtmidi -lrtaudio -lcurl -lssl -lcrypto \
-Wl,-Bdynamic
TARGET := Rack
endif



# Convenience targets # Convenience targets




+ 2
- 2
dep/Makefile View File

@@ -126,7 +126,7 @@ ifeq ($(ARCH),win)
RTAUDIO_FLAGS += -DAUDIO_WINDOWS_DS=ON -DAUDIO_WINDOWS_WASAPI=ON -DAUDIO_WINDOWS_ASIO=ON RTAUDIO_FLAGS += -DAUDIO_WINDOWS_DS=ON -DAUDIO_WINDOWS_WASAPI=ON -DAUDIO_WINDOWS_ASIO=ON
endif endif
ifeq ($(ARCH),lin) ifeq ($(ARCH),lin)
RTAUDIO_FLAGS += -DAUDIO_LINUX_ALSA=ON
RTAUDIO_FLAGS += -DAUDIO_LINUX_ALSA=ON -DAUDIO_UNIX_JACK=ON
endif endif


ifdef RTAUDIO_ALL_APIS ifdef RTAUDIO_ALL_APIS
@@ -134,7 +134,7 @@ ifeq ($(ARCH),mac)
RTAUDIO_FLAGS += -DAUDIO_UNIX_JACK=ON RTAUDIO_FLAGS += -DAUDIO_UNIX_JACK=ON
endif endif
ifeq ($(ARCH),lin) ifeq ($(ARCH),lin)
RTAUDIO_FLAGS += -DAUDIO_LINUX_PULSE=ON -DAUDIO_UNIX_JACK=ON
RTAUDIO_FLAGS += -DAUDIO_LINUX_PULSE=ON
endif endif
endif endif




Loading…
Cancel
Save