minor clean up
This commit is contained in:
parent
96c66c6118
commit
04cb38e25d
1 changed files with 108 additions and 121 deletions
25
Jamulus.pro
25
Jamulus.pro
|
@ -148,9 +148,9 @@ win32 {
|
||||||
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
|
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
|
||||||
OTHER_FILES += android/AndroidManifest.xml
|
OTHER_FILES += android/AndroidManifest.xml
|
||||||
|
|
||||||
# if compiling for android you need to use Oboe library which is included as a git submodule
|
# if compiling for android you need to use Oboe library which is included as a git submodule
|
||||||
# make sure you git pull with submodules to pull the latest Oboe library
|
# make sure you git pull with submodules to pull the latest Oboe library
|
||||||
OBOE_SOURCES = libs/oboe/src/aaudio/AAudioLoader.cpp \
|
OBOE_SOURCES = libs/oboe/src/aaudio/AAudioLoader.cpp \
|
||||||
libs/oboe/src/aaudio/AudioStreamAAudio.cpp \
|
libs/oboe/src/aaudio/AudioStreamAAudio.cpp \
|
||||||
libs/oboe/src/common/AudioSourceCaller.cpp \
|
libs/oboe/src/common/AudioSourceCaller.cpp \
|
||||||
libs/oboe/src/common/AudioStream.cpp \
|
libs/oboe/src/common/AudioStream.cpp \
|
||||||
|
@ -200,7 +200,7 @@ OBOE_SOURCES = libs/oboe/src/aaudio/AAudioLoader.cpp \
|
||||||
libs/oboe/src/opensles/OpenSLESUtilities.cpp \
|
libs/oboe/src/opensles/OpenSLESUtilities.cpp \
|
||||||
libs/oboe/src/opensles/OutputMixerOpenSLES.cpp
|
libs/oboe/src/opensles/OutputMixerOpenSLES.cpp
|
||||||
|
|
||||||
OBOE_HEADERS = libs/oboe/src/aaudio/AAudioLoader.h \
|
OBOE_HEADERS = libs/oboe/src/aaudio/AAudioLoader.h \
|
||||||
libs/oboe/src/aaudio/AudioStreamAAudio.h \
|
libs/oboe/src/aaudio/AudioStreamAAudio.h \
|
||||||
libs/oboe/src/common/AudioClock.h \
|
libs/oboe/src/common/AudioClock.h \
|
||||||
libs/oboe/src/common/AudioSourceCaller.h \
|
libs/oboe/src/common/AudioSourceCaller.h \
|
||||||
|
@ -248,10 +248,10 @@ OBOE_HEADERS = libs/oboe/src/aaudio/AAudioLoader.h \
|
||||||
libs/oboe/src/opensles/OpenSLESUtilities.h \
|
libs/oboe/src/opensles/OpenSLESUtilities.h \
|
||||||
libs/oboe/src/opensles/OutputMixerOpenSLES.h
|
libs/oboe/src/opensles/OutputMixerOpenSLES.h
|
||||||
|
|
||||||
INCLUDEPATH_OBOE = libs/oboe/include/ \
|
INCLUDEPATH_OBOE = libs/oboe/include/ \
|
||||||
libs/oboe/src/
|
libs/oboe/src/
|
||||||
|
|
||||||
DISTFILES_OBOE += libs/oboe/AUTHORS \
|
DISTFILES_OBOE += libs/oboe/AUTHORS \
|
||||||
libs/oboe/CONTRIBUTING \
|
libs/oboe/CONTRIBUTING \
|
||||||
libs/oboe/LICENSE \
|
libs/oboe/LICENSE \
|
||||||
libs/oboe/README
|
libs/oboe/README
|
||||||
|
@ -260,7 +260,6 @@ DISTFILES_OBOE += libs/oboe/AUTHORS \
|
||||||
HEADERS += $$OBOE_HEADERS
|
HEADERS += $$OBOE_HEADERS
|
||||||
SOURCES += $$OBOE_SOURCES
|
SOURCES += $$OBOE_SOURCES
|
||||||
DISTFILES += $$DISTFILES_OBOE
|
DISTFILES += $$DISTFILES_OBOE
|
||||||
|
|
||||||
} else:unix {
|
} else:unix {
|
||||||
# we want to compile with C++11
|
# we want to compile with C++11
|
||||||
CONFIG += c++11
|
CONFIG += c++11
|
||||||
|
@ -290,18 +289,6 @@ DISTFILES_OBOE += libs/oboe/AUTHORS \
|
||||||
DEFINES += WITH_SOUND
|
DEFINES += WITH_SOUND
|
||||||
}
|
}
|
||||||
|
|
||||||
# Linux is our source distribution, include sources from other OSs
|
|
||||||
DISTFILES += mac/sound.h \
|
|
||||||
mac/sound.cpp \
|
|
||||||
mac/mainicon.icns \
|
|
||||||
windows/sound.h \
|
|
||||||
windows/sound.cpp \
|
|
||||||
windows/mainicon.rc \
|
|
||||||
windows/mainicon.ico \
|
|
||||||
android/AndroidManifest.xml \
|
|
||||||
android/sound.h \
|
|
||||||
android/sound.cpp
|
|
||||||
|
|
||||||
isEmpty(PREFIX) {
|
isEmpty(PREFIX) {
|
||||||
PREFIX = /usr/local
|
PREFIX = /usr/local
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue