Commit f80101fe authored by jcacerec's avatar jcacerec
Browse files

Using shared lib for RtAudio on Linux

parent 83fbb337
--- ---
master master
- (update) Updated to RtAudio 4.1.1. - (update) Updated to RtAudio 4.1.1, and using shared lib in linux.
--- ---
1.1 1.1
......
...@@ -23,15 +23,16 @@ Dependencies: ...@@ -23,15 +23,16 @@ Dependencies:
You need to have installed the libraries in your system: You need to have installed the libraries in your system:
Qt 5.3 or higher Qt 5.3 or higher
jack-audio-connection-kit-devel jack-audio-connection-kit-devel
rtaudio
If you are using yum (in Fedora 8 or later) you can just install them (as root) with: If you are using yum you can just install them (as root) with:
yum install jack-audio-connection-kit-devel yum install jack-audio-connection-kit-devel
and install qt from the qt site. and install qt from the qt site.
If you want to build on MacOS X, you need JackOSX If you want to build on MacOS X, you need JackOSX
http://www.jackosx.com/ http://www.jackosx.com/
and Qt 5.3 or higher. and Qt 5.3 or higher.
It is also possible to build without jack, see below. It is also possible to build without jack, see below.
--- ---
......
...@@ -36,20 +36,24 @@ macx { ...@@ -36,20 +36,24 @@ macx {
LIBS += -framework CoreAudio -framework CoreFoundation LIBS += -framework CoreAudio -framework CoreFoundation
DEFINES += __MAC_OSX__ DEFINES += __MAC_OSX__
} }
linux-g++ {
message(Linux) linux-g++ | linux-g++-64 {
LIBS += -lasound LIBS += -lasound -lrtaudio
QMAKE_CXXFLAGS += -D__LINUX_ALSA__ #-D__LINUX_OSS__ #RtAudio Flags QMAKE_CXXFLAGS += -D__LINUX_ALSA__ #-D__LINUX_OSS__ #RtAudio Flags
QMAKE_CXXFLAGS += -g -O2 QMAKE_CXXFLAGS += -g -O2
DEFINES += __LINUX__ DEFINES += __LINUX__
} }
linux-g++ {
message(Linux)
QMAKE_CXXFLAGS += -D__LINUX_ALSA__ #-D__LINUX_OSS__ #RtAudio Flags
}
linux-g++-64 { linux-g++-64 {
message(Linux 64bit) message(Linux 64bit)
LIBS += -lasound
QMAKE_CXXFLAGS += -fPIC -D__LINUX_ALSA__ #-D__LINUX_OSS__ #RtAudio Flags QMAKE_CXXFLAGS += -fPIC -D__LINUX_ALSA__ #-D__LINUX_OSS__ #RtAudio Flags
QMAKE_CXXFLAGS += -g -O2
DEFINES += __LINUX__
} }
win32 { win32 {
message(win32) message(win32)
CONFIG += x86 console CONFIG += x86 console
...@@ -68,14 +72,6 @@ QMAKE_CLEAN += -r ./jacktrip ./jacktrip_debug ./release ./debug ...@@ -68,14 +72,6 @@ QMAKE_CLEAN += -r ./jacktrip ./jacktrip_debug ./release ./debug
target.path = /usr/bin target.path = /usr/bin
INSTALLS += target INSTALLS += target
#INCLUDEPATH += ../externals/includes/rtaudio-4.0.7
#DEPENDPATH += ../externals/includes/rtaudio-4.0.7
win32 {
INCLUDEPATH += ../externals/rtaudio-4.1.1/include
INCLUDEPATH += ../externals/includes
DEPENDPATH += ../externals/rtaudio-4.1.1/include
DEPENDPATH += ../externals/includes
}
# Input # Input
HEADERS += DataProtocol.h \ HEADERS += DataProtocol.h \
...@@ -124,10 +120,17 @@ SOURCES += JackAudioInterface.cpp ...@@ -124,10 +120,17 @@ SOURCES += JackAudioInterface.cpp
} }
# RtAduio Input # RtAduio Input
win32 {
INCLUDEPATH += ../externals/rtaudio-4.1.1/include
DEPENDPATH += ../externals/rtaudio-4.1.1/include
}
macx | win32 {
INCLUDEPATH += ../externals/rtaudio-4.1.1/ INCLUDEPATH += ../externals/rtaudio-4.1.1/
DEPENDPATH += ../externals/rtaudio-4.1.1/ DEPENDPATH += ../externals/rtaudio-4.1.1/
HEADERS += ../externals/rtaudio-4.1.1/RtAudio.h HEADERS += ../externals/rtaudio-4.1.1/RtAudio.h
SOURCES += ../externals/rtaudio-4.1.1/RtAudio.cpp SOURCES += ../externals/rtaudio-4.1.1/RtAudio.cpp
}
win32 { win32 {
HEADERS += asio.h \ HEADERS += asio.h \
asiodrivers.h \ asiodrivers.h \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment