eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

move the OPUS conditions in one place

Browse source
This commit is contained in:
Volker Fischer 2020-05-22 18:55:07 +02:00
parent e014301b58
commit 2c21e435a0
1 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Jamulus.pro
View file

@ -422,24 +422,6 @@ HEADERS_OPUS_X86 = libs/opus/celt/x86/celt_lpc_sse.h \
libs/opus/celt/x86/vq_sse.h \ libs/opus/celt/x86/vq_sse.h \
libs/opus/celt/x86/x86cpu.h libs/opus/celt/x86/x86cpu.h
android {
contains(ANDROID_ARCHITECTURE, arm) | contains(ANDROID_ARCHITECTURE, arm64) {
HEADERS_OPUS += $$HEADERS_OPUS_ARM
} else:contains(ANDROID_ARCHITECTURE, x86) | contains(ANDROID_ARCHITECTURE, x86_64) {
HEADERS_OPUS += $$HEADERS_OPUS_X86
}
} else:win32 | unix | macx {
contains(QT_ARCH, arm) | contains(QT_ARCH, arm64) {
HEADERS_OPUS += $$HEADERS_OPUS_ARM
} else:contains(QT_ARCH, x86) | contains(QT_ARCH, x86_64) {
HEADERS_OPUS += $$HEADERS_OPUS_X86
}
win32 {
HEADERS_OPUS += libs/opus/win32/config.h
}
}
SOURCES += src/audiomixerboard.cpp \ SOURCES += src/audiomixerboard.cpp \
src/buffer.cpp \ src/buffer.cpp \
src/channel.cpp \ src/channel.cpp \
@ -610,16 +592,23 @@ SOURCES_OPUS_X86 = libs/opus/celt/x86/celt_lpc_sse4_1.c \
android { android {
contains(ANDROID_ARCHITECTURE, arm) | contains(ANDROID_ARCHITECTURE, arm64) { contains(ANDROID_ARCHITECTURE, arm) | contains(ANDROID_ARCHITECTURE, arm64) {
HEADERS_OPUS += $$HEADERS_OPUS_ARM
SOURCE_OPUS += $$SOURCES_OPUS_ARM SOURCE_OPUS += $$SOURCES_OPUS_ARM
} else:contains(ANDROID_ARCHITECTURE, x86) | contains(ANDROID_ARCHITECTURE, x86_64) { } else:contains(ANDROID_ARCHITECTURE, x86) | contains(ANDROID_ARCHITECTURE, x86_64) {
HEADERS_OPUS += $$HEADERS_OPUS_X86
SOURCE_OPUS += $$SOURCES_OPUS_X86 SOURCE_OPUS += $$SOURCES_OPUS_X86
} }
} else:win32 | unix | macx { } else:win32 | unix | macx {
contains(QT_ARCH, arm) | contains(QT_ARCH, arm64) { contains(QT_ARCH, arm) | contains(QT_ARCH, arm64) {
HEADERS_OPUS += $$HEADERS_OPUS_ARM
SOURCE_OPUS += $$SOURCES_OPUS_ARM SOURCE_OPUS += $$SOURCES_OPUS_ARM
} else:contains(QT_ARCH, x86) | contains(QT_ARCH, x86_64) { } else:contains(QT_ARCH, x86) | contains(QT_ARCH, x86_64) {
HEADERS_OPUS += $$HEADERS_OPUS_X86
SOURCE_OPUS += $$SOURCES_OPUS_X86 SOURCE_OPUS += $$SOURCES_OPUS_X86
} }
win32 {
HEADERS_OPUS += libs/opus/win32/config.h
}
} }
DISTFILES += ChangeLog \ DISTFILES += ChangeLog \