From a1d367d05a78af4a4459e7a0c9a92c84f1fce647 Mon Sep 17 00:00:00 2001
From: tresf <tres.finocchiaro@gmail.com>
Date: Tue, 5 Dec 2017 17:58:33 -0500
Subject: [PATCH] Add transfer.sh support

---
 .travis/linux..script.sh            |  2 +-
 .travis/osx..script.sh              |  2 +-
 .travis/script.sh                   | 20 ++++++++++++++++++++
 plugins/LadspaEffect/CMakeLists.txt |  9 +++++++--
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/.travis/linux..script.sh b/.travis/linux..script.sh
index ba771349c20..d24e4640b7d 100755
--- a/.travis/linux..script.sh
+++ b/.travis/linux..script.sh
@@ -6,4 +6,4 @@ source /opt/qt58/bin/qt58-env.sh
 set -e
 
 # shellcheck disable=SC2086
-cmake -DUSE_WERROR=ON $CMAKE_FLAGS ..
+cmake -DUSE_WERROR=ON -DCMAKE_INSTALL_PREFIX=../target $CMAKE_FLAGS ..
diff --git a/.travis/osx..script.sh b/.travis/osx..script.sh
index 6924fceaf68..d4e1689d062 100755
--- a/.travis/osx..script.sh
+++ b/.travis/osx..script.sh
@@ -7,4 +7,4 @@ CMAKE_PREFIX_PATH="$(brew --prefix qt@5.5)"
 export CMAKE_PREFIX_PATH
 
 # shellcheck disable=SC2086
-cmake $CMAKE_FLAGS -DUSE_WERROR=OFF ..
+cmake -DUSE_WERROR=OFF -DCMAKE_INSTALL_PREFIX=../target $CMAKE_FLAGS ..
diff --git a/.travis/script.sh b/.travis/script.sh
index 4da1d22aa8c..9f7e1081fa6 100755
--- a/.travis/script.sh
+++ b/.travis/script.sh
@@ -31,4 +31,24 @@ else
 		tests/tests
 
 	fi
+
+	# Package and upload non-tagged builds
+	if [ ! -z "$TRAVIS_TAG" ]; then
+		# Skip, handled by travis deploy instead
+		exit 0
+	elif [[ $TARGET_OS == win* ]]; then
+		make -j4 package
+		PACKAGE="$(ls lmms-*win*.exe)"
+	elif [[ $TRAVIS_OS_NAME == osx ]]; then
+		make -j4 install > /dev/null
+		make dmg
+		PACKAGE="$(ls lmms-*.dmg)"
+	else
+		make -j4 install > /dev/null
+		make appimage
+		PACKAGE="$(ls lmms-*.AppImage)"
+	fi
+
+	echo "Uploading $PACKAGE to transfer.sh..."
+	curl --upload-file "$PACKAGE" "https://transfer.sh/$PACKAGE" || true
 fi
diff --git a/plugins/LadspaEffect/CMakeLists.txt b/plugins/LadspaEffect/CMakeLists.txt
index 25ea5c4c859..90eb27dff66 100644
--- a/plugins/LadspaEffect/CMakeLists.txt
+++ b/plugins/LadspaEffect/CMakeLists.txt
@@ -4,8 +4,13 @@ BUILD_PLUGIN(ladspaeffect LadspaEffect.cpp LadspaControls.cpp LadspaControlDialo
 
 SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ladspa")
 
-# Disable C++11
-SET(CMAKE_CXX_STANDARD 98)
+# Enable C++11 for all except mingw builds
+# TODO: Validate against modern mingw compiler
+IF(NOT MINGW_PREFIX)
+	SET(CMAKE_CXX_STANDARD 11)
+ELSE()
+	SET(CMAKE_CXX_STANDARD 98)
+ENDIF()
 
 IF(WANT_CAPS)
 ADD_SUBDIRECTORY(caps)