From f1177d42dfd11c4f6f0dff5fbf9b27b8999e10b1 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Tue, 21 Apr 2020 16:12:55 +0200 Subject: [PATCH] try to make Travis happy again --- .travis.yml | 2 +- ChangeLog | 2 ++ Jamulus.pro | 8 ++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index bc089ed5..00e79453 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ matrix: - brew install qt5 - brew link qt5 --force script: - - qmake -spec macx-xcode Jamulus.pro + - qmake "CONFIG+=istravis" -spec macx-xcode Jamulus.pro - xcodebuild -list -project Jamulus.xcodeproj - xcodebuild -scheme Jamulus build #deploy function is only available in travis-ci.com (not free) but not in travis-ci.org (free) diff --git a/ChangeLog b/ChangeLog index 771bf03a..56562eb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,8 @@ TODO improve audio drop out behaviour with OPUS64 by tuning the coding rate (it seems that for some coding rates we get loud artifacts on audio drop outs whereas for slightly different rates the behavior is much more pleasent) +TODO support internationalization + TODO try to find a way to catch Windows exceptions in case a 64 bit Jamulus tries to load a 32 bit Jack Audio ASIO dll diff --git a/Jamulus.pro b/Jamulus.pro index 3f9fec99..2b360205 100755 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -14,6 +14,8 @@ QT += widgets \ network \ xml +#TRANSLATIONS = src/res/translation_de.ts + INCLUDEPATH += src INCLUDEPATH_OPUS = libs/opus/include \ @@ -78,8 +80,10 @@ win32 { SOURCES += mac/sound.cpp RC_FILE = mac/mainicon.icns CONFIG += x86 - QMAKE_INFO_PLIST = mac/Info.plist - QMAKE_TARGET_BUNDLE_PREFIX = net.sourceforge.llcon + !contains(CONFIG, "istravis") { + QMAKE_INFO_PLIST = mac/Info.plist + QMAKE_TARGET_BUNDLE_PREFIX = net.sourceforge.llcon + } LIBS += -framework CoreFoundation \ -framework CoreServices \