minor clean up
This commit is contained in:
Volker Fischer
parent
96c66c6118
commit
04cb38e25d
1 changed files with 108 additions and 121 deletions
229
Jamulus.pro
229
Jamulus.pro
|
|
@ -148,119 +148,118 @@ 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 \
|
||||||
libs/oboe/src/common/AudioStreamBuilder.cpp \
|
libs/oboe/src/common/AudioStreamBuilder.cpp \
|
||||||
libs/oboe/src/common/DataConversionFlowGraph.cpp \
|
libs/oboe/src/common/DataConversionFlowGraph.cpp \
|
||||||
libs/oboe/src/common/FilterAudioStream.cpp \
|
libs/oboe/src/common/FilterAudioStream.cpp \
|
||||||
libs/oboe/src/common/FixedBlockAdapter.cpp \
|
libs/oboe/src/common/FixedBlockAdapter.cpp \
|
||||||
libs/oboe/src/common/FixedBlockReader.cpp \
|
libs/oboe/src/common/FixedBlockReader.cpp \
|
||||||
libs/oboe/src/common/FixedBlockWriter.cpp \
|
libs/oboe/src/common/FixedBlockWriter.cpp \
|
||||||
libs/oboe/src/common/LatencyTuner.cpp \
|
libs/oboe/src/common/LatencyTuner.cpp \
|
||||||
libs/oboe/src/common/QuirksManager.cpp \
|
libs/oboe/src/common/QuirksManager.cpp \
|
||||||
libs/oboe/src/common/SourceFloatCaller.cpp \
|
libs/oboe/src/common/SourceFloatCaller.cpp \
|
||||||
libs/oboe/src/common/SourceI16Caller.cpp \
|
libs/oboe/src/common/SourceI16Caller.cpp \
|
||||||
libs/oboe/src/common/StabilizedCallback.cpp \
|
libs/oboe/src/common/StabilizedCallback.cpp \
|
||||||
libs/oboe/src/common/Trace.cpp \
|
libs/oboe/src/common/Trace.cpp \
|
||||||
libs/oboe/src/common/Utilities.cpp \
|
libs/oboe/src/common/Utilities.cpp \
|
||||||
libs/oboe/src/common/Version.cpp \
|
libs/oboe/src/common/Version.cpp \
|
||||||
libs/oboe/src/fifo/FifoBuffer.cpp \
|
libs/oboe/src/fifo/FifoBuffer.cpp \
|
||||||
libs/oboe/src/fifo/FifoController.cpp \
|
libs/oboe/src/fifo/FifoController.cpp \
|
||||||
libs/oboe/src/fifo/FifoControllerBase.cpp \
|
libs/oboe/src/fifo/FifoControllerBase.cpp \
|
||||||
libs/oboe/src/fifo/FifoControllerIndirect.cpp \
|
libs/oboe/src/fifo/FifoControllerIndirect.cpp \
|
||||||
libs/oboe/src/flowgraph/ClipToRange.cpp \
|
libs/oboe/src/flowgraph/ClipToRange.cpp \
|
||||||
libs/oboe/src/flowgraph/FlowGraphNode.cpp \
|
libs/oboe/src/flowgraph/FlowGraphNode.cpp \
|
||||||
libs/oboe/src/flowgraph/ManyToMultiConverter.cpp \
|
libs/oboe/src/flowgraph/ManyToMultiConverter.cpp \
|
||||||
libs/oboe/src/flowgraph/MonoToMultiConverter.cpp \
|
libs/oboe/src/flowgraph/MonoToMultiConverter.cpp \
|
||||||
libs/oboe/src/flowgraph/RampLinear.cpp \
|
libs/oboe/src/flowgraph/RampLinear.cpp \
|
||||||
libs/oboe/src/flowgraph/SampleRateConverter.cpp \
|
libs/oboe/src/flowgraph/SampleRateConverter.cpp \
|
||||||
libs/oboe/src/flowgraph/SinkFloat.cpp \
|
libs/oboe/src/flowgraph/SinkFloat.cpp \
|
||||||
libs/oboe/src/flowgraph/SinkI16.cpp \
|
libs/oboe/src/flowgraph/SinkI16.cpp \
|
||||||
libs/oboe/src/flowgraph/SinkI24.cpp \
|
libs/oboe/src/flowgraph/SinkI24.cpp \
|
||||||
libs/oboe/src/flowgraph/SourceFloat.cpp \
|
libs/oboe/src/flowgraph/SourceFloat.cpp \
|
||||||
libs/oboe/src/flowgraph/SourceI16.cpp \
|
libs/oboe/src/flowgraph/SourceI16.cpp \
|
||||||
libs/oboe/src/flowgraph/SourceI24.cpp \
|
libs/oboe/src/flowgraph/SourceI24.cpp \
|
||||||
libs/oboe/src/flowgraph/resampler/IntegerRatio.cpp \
|
libs/oboe/src/flowgraph/resampler/IntegerRatio.cpp \
|
||||||
libs/oboe/src/flowgraph/resampler/LinearResampler.cpp \
|
libs/oboe/src/flowgraph/resampler/LinearResampler.cpp \
|
||||||
libs/oboe/src/flowgraph/resampler/MultiChannelResampler.cpp \
|
libs/oboe/src/flowgraph/resampler/MultiChannelResampler.cpp \
|
||||||
libs/oboe/src/flowgraph/resampler/PolyphaseResampler.cpp \
|
libs/oboe/src/flowgraph/resampler/PolyphaseResampler.cpp \
|
||||||
libs/oboe/src/flowgraph/resampler/PolyphaseResamplerMono.cpp \
|
libs/oboe/src/flowgraph/resampler/PolyphaseResamplerMono.cpp \
|
||||||
libs/oboe/src/flowgraph/resampler/PolyphaseResamplerStereo.cpp \
|
libs/oboe/src/flowgraph/resampler/PolyphaseResamplerStereo.cpp \
|
||||||
libs/oboe/src/flowgraph/resampler/SincResampler.cpp \
|
libs/oboe/src/flowgraph/resampler/SincResampler.cpp \
|
||||||
libs/oboe/src/flowgraph/resampler/SincResamplerStereo.cpp \
|
libs/oboe/src/flowgraph/resampler/SincResamplerStereo.cpp \
|
||||||
libs/oboe/src/opensles/AudioInputStreamOpenSLES.cpp \
|
libs/oboe/src/opensles/AudioInputStreamOpenSLES.cpp \
|
||||||
libs/oboe/src/opensles/AudioOutputStreamOpenSLES.cpp \
|
libs/oboe/src/opensles/AudioOutputStreamOpenSLES.cpp \
|
||||||
libs/oboe/src/opensles/AudioStreamBuffered.cpp \
|
libs/oboe/src/opensles/AudioStreamBuffered.cpp \
|
||||||
libs/oboe/src/opensles/AudioStreamOpenSLES.cpp \
|
libs/oboe/src/opensles/AudioStreamOpenSLES.cpp \
|
||||||
libs/oboe/src/opensles/EngineOpenSLES.cpp \
|
libs/oboe/src/opensles/EngineOpenSLES.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 \
|
||||||
libs/oboe/src/common/DataConversionFlowGraph.h \
|
libs/oboe/src/common/DataConversionFlowGraph.h \
|
||||||
libs/oboe/src/common/FilterAudioStream.h \
|
libs/oboe/src/common/FilterAudioStream.h \
|
||||||
libs/oboe/src/common/FixedBlockAdapter.h \
|
libs/oboe/src/common/FixedBlockAdapter.h \
|
||||||
libs/oboe/src/common/FixedBlockReader.h \
|
libs/oboe/src/common/FixedBlockReader.h \
|
||||||
libs/oboe/src/common/FixedBlockWriter.h \
|
libs/oboe/src/common/FixedBlockWriter.h \
|
||||||
libs/oboe/src/common/MonotonicCounter.h \
|
libs/oboe/src/common/MonotonicCounter.h \
|
||||||
libs/oboe/src/common/OboeDebug.h \
|
libs/oboe/src/common/OboeDebug.h \
|
||||||
libs/oboe/src/common/QuirksManager.h \
|
libs/oboe/src/common/QuirksManager.h \
|
||||||
libs/oboe/src/common/SourceFloatCaller.h \
|
libs/oboe/src/common/SourceFloatCaller.h \
|
||||||
libs/oboe/src/common/SourceI16Caller.h \
|
libs/oboe/src/common/SourceI16Caller.h \
|
||||||
libs/oboe/src/common/Trace.h \
|
libs/oboe/src/common/Trace.h \
|
||||||
libs/oboe/src/fifo/FifoBuffer.h \
|
libs/oboe/src/fifo/FifoBuffer.h \
|
||||||
libs/oboe/src/fifo/FifoController.h \
|
libs/oboe/src/fifo/FifoController.h \
|
||||||
libs/oboe/src/fifo/FifoControllerBase.h \
|
libs/oboe/src/fifo/FifoControllerBase.h \
|
||||||
libs/oboe/src/fifo/FifoControllerIndirect.h \
|
libs/oboe/src/fifo/FifoControllerIndirect.h \
|
||||||
libs/oboe/src/flowgraph/ClipToRange.h \
|
libs/oboe/src/flowgraph/ClipToRange.h \
|
||||||
libs/oboe/src/flowgraph/FlowGraphNode.h \
|
libs/oboe/src/flowgraph/FlowGraphNode.h \
|
||||||
libs/oboe/src/flowgraph/ManyToMultiConverter.h \
|
libs/oboe/src/flowgraph/ManyToMultiConverter.h \
|
||||||
libs/oboe/src/flowgraph/MonoToMultiConverter.h \
|
libs/oboe/src/flowgraph/MonoToMultiConverter.h \
|
||||||
libs/oboe/src/flowgraph/RampLinear.h \
|
libs/oboe/src/flowgraph/RampLinear.h \
|
||||||
libs/oboe/src/flowgraph/SampleRateConverter.h \
|
libs/oboe/src/flowgraph/SampleRateConverter.h \
|
||||||
libs/oboe/src/flowgraph/SinkFloat.h \
|
libs/oboe/src/flowgraph/SinkFloat.h \
|
||||||
libs/oboe/src/flowgraph/SinkI16.h \
|
libs/oboe/src/flowgraph/SinkI16.h \
|
||||||
libs/oboe/src/flowgraph/SinkI24.h \
|
libs/oboe/src/flowgraph/SinkI24.h \
|
||||||
libs/oboe/src/flowgraph/SourceFloat.h \
|
libs/oboe/src/flowgraph/SourceFloat.h \
|
||||||
libs/oboe/src/flowgraph/SourceI16.h \
|
libs/oboe/src/flowgraph/SourceI16.h \
|
||||||
libs/oboe/src/flowgraph/SourceI24.h \
|
libs/oboe/src/flowgraph/SourceI24.h \
|
||||||
libs/oboe/src/flowgraph/resampler/HyperbolicCosineWindow.h \
|
libs/oboe/src/flowgraph/resampler/HyperbolicCosineWindow.h \
|
||||||
libs/oboe/src/flowgraph/resampler/IntegerRatio.h \
|
libs/oboe/src/flowgraph/resampler/IntegerRatio.h \
|
||||||
libs/oboe/src/flowgraph/resampler/LinearResampler.h \
|
libs/oboe/src/flowgraph/resampler/LinearResampler.h \
|
||||||
libs/oboe/src/flowgraph/resampler/MultiChannelResampler.h \
|
libs/oboe/src/flowgraph/resampler/MultiChannelResampler.h \
|
||||||
libs/oboe/src/flowgraph/resampler/PolyphaseResampler.h \
|
libs/oboe/src/flowgraph/resampler/PolyphaseResampler.h \
|
||||||
libs/oboe/src/flowgraph/resampler/PolyphaseResamplerMono.h \
|
libs/oboe/src/flowgraph/resampler/PolyphaseResamplerMono.h \
|
||||||
libs/oboe/src/flowgraph/resampler/PolyphaseResamplerStereo.h \
|
libs/oboe/src/flowgraph/resampler/PolyphaseResamplerStereo.h \
|
||||||
libs/oboe/src/flowgraph/resampler/SincResampler.h \
|
libs/oboe/src/flowgraph/resampler/SincResampler.h \
|
||||||
libs/oboe/src/flowgraph/resampler/SincResamplerStereo.h \
|
libs/oboe/src/flowgraph/resampler/SincResamplerStereo.h \
|
||||||
libs/oboe/src/opensles/AudioInputStreamOpenSLES.h \
|
libs/oboe/src/opensles/AudioInputStreamOpenSLES.h \
|
||||||
libs/oboe/src/opensles/AudioOutputStreamOpenSLES.h \
|
libs/oboe/src/opensles/AudioOutputStreamOpenSLES.h \
|
||||||
libs/oboe/src/opensles/AudioStreamBuffered.h \
|
libs/oboe/src/opensles/AudioStreamBuffered.h \
|
||||||
libs/oboe/src/opensles/AudioStreamOpenSLES.h \
|
libs/oboe/src/opensles/AudioStreamOpenSLES.h \
|
||||||
libs/oboe/src/opensles/EngineOpenSLES.h \
|
libs/oboe/src/opensles/EngineOpenSLES.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
|
||||||
|
|
||||||
INCLUDEPATH += $$INCLUDEPATH_OBOE
|
|
||||||
HEADERS += $$OBOE_HEADERS
|
|
||||||
SOURCES += $$OBOE_SOURCES
|
|
||||||
DISTFILES += $$DISTFILES_OBOE
|
|
||||||
|
|
||||||
|
INCLUDEPATH += $$INCLUDEPATH_OBOE
|
||||||
|
HEADERS += $$OBOE_HEADERS
|
||||||
|
SOURCES += $$OBOE_SOURCES
|
||||||
|
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