diff --git a/Makefile b/Makefile index faf7c52e..560602f5 100644 --- a/Makefile +++ b/Makefile @@ -18,18 +18,6 @@ STRIP ?= strip SOURCES += $(wildcard src/*.cpp src/*/*.cpp) 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) SOURCES += dep/osdialog/osdialog_mac.m CXXFLAGS += -stdlib=libc++ @@ -51,6 +39,18 @@ ifeq ($(ARCH), win) OBJECTS += Rack.res 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 diff --git a/dep/Makefile b/dep/Makefile index 44996deb..0822fefb 100755 --- a/dep/Makefile +++ b/dep/Makefile @@ -126,7 +126,7 @@ ifeq ($(ARCH),win) RTAUDIO_FLAGS += -DAUDIO_WINDOWS_DS=ON -DAUDIO_WINDOWS_WASAPI=ON -DAUDIO_WINDOWS_ASIO=ON endif ifeq ($(ARCH),lin) -RTAUDIO_FLAGS += -DAUDIO_LINUX_ALSA=ON +RTAUDIO_FLAGS += -DAUDIO_LINUX_ALSA=ON -DAUDIO_UNIX_JACK=ON endif ifdef RTAUDIO_ALL_APIS @@ -134,7 +134,7 @@ ifeq ($(ARCH),mac) RTAUDIO_FLAGS += -DAUDIO_UNIX_JACK=ON endif ifeq ($(ARCH),lin) -RTAUDIO_FLAGS += -DAUDIO_LINUX_PULSE=ON -DAUDIO_UNIX_JACK=ON +RTAUDIO_FLAGS += -DAUDIO_LINUX_PULSE=ON endif endif