Bump version to 1.2.0-rc8

Population of the PortAudio setup widget has been delayed until it is shown, as it was causing crashes on some systems.

.circleci/config.yml

@@ -0,0 +1,11 @@
+# Dummy CircleCI Config File
+version: 2
+jobs:
+  build:
+    machine: true
+    branches:
+      ignore: stable-1.2
+    steps:
+      - run:
+          name: Dummy
+          command: echo "Dummy command to prevent error"

.gitattributes

@@ -1,2 +1,3 @@
 .gitattributes export-ignore
 .gitignore export-ignore
+data/locale/* linguist-documentation

.github/no-response.yml

@@ -0,0 +1,2 @@
+# Label requiring a response
+responseRequiredLabel: "response required"

.gitignore

@@ -1,9 +1,11 @@
 /build
 /target
 .*.sw?
+.DS_Store
 *~
 /CMakeLists.txt.user
 /plugins/zynaddsubfx/zynaddsubfx/ExternalPrograms/Controller/Makefile
 /plugins/zynaddsubfx/zynaddsubfx/ExternalPrograms/Spliter/Makefile
 /plugins/zynaddsubfx/zynaddsubfx/doc/Makefile
 /plugins/zynaddsubfx/zynaddsubfx/doc/gen/Makefile
+/data/locale/*.qm

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "src/3rdparty/qt5-x11embed"]
+	path = src/3rdparty/qt5-x11embed
+	url = https://github.com/Lukas-W/qt5-x11embed.git
+[submodule "src/3rdparty/rpmalloc/rpmalloc"]
+	path = src/3rdparty/rpmalloc/rpmalloc
+	url = https://github.com/rampantpixels/rpmalloc.git

.mailmap

@@ -1,4 +1,6 @@
-Tobias Doerffel <tobias.doerffel@gmail.com>
+Alexandre Almeida <wilsalx@gmail.com> <meta.lx@hotmail.com>
+Tobias Junghans <tobias.doerffel@gmail.com>
+Dave French <dave.french3@googlemail.com>
 Paul Giblock <drfaygo@gmail.com> <pgib@users.sf.net>
 Paul Giblock <drfaygo@gmail.com> <p@pgiblock.net>
 Andrew Kelley <superjoe30@gmail.com> <andrew.r.kelley@gmail.com>
@@ -6,6 +8,24 @@ Andrew Kelley <superjoe30@gmail.com> <andy@debian.superjoesoftware>
 Janne Sinisalo <janne.m.sinisalo@gmail.com> <janne@janne-desktop.(none)>
 Raine M. Ekman <raine@iki.fi> <raine@raine.(none)>
 Raine M. Ekman <raine@iki.fi> <raine@raine.damex.fi>
-Lukas W <lukaswhl@googlemail.com> <lukaswhl@gmail.com>
+Lukas W <lukaswhl@gmail.com> <lukaswhl@googlemail.com>
 Vesa <contact.diizy@nbl.fi> <vesa@isokone.(none)>
+Vesa <contact.diizy@nbl.fi> <diizy@users.noreply.github.com>
+Tres Finocchiaro <tres.finocchiaro@gmail.com>
+Tres Finocchiaro <tres.finocchiaro@gmail.com> <tres@ubuntu-1204.(none)>
+Tres Finocchiaro <tres.finocchiaro@gmail.com> <ubuntu@ubuntu-1204.(none)>
+Tres Finocchiaro <tres.finocchiaro@gmail.com> <tresf@github.com>
+Rüdiger Ranft <rudi@qzzq.de> <_rdi_@web.de>
+Spekular <Spekularr@gmail.com> <Spekular@users.noreply.github.com>
+unfa <unfa00@gmail.com> <unfa@unfa.(none)>
+mikobuntu <chrissy.mc.1@hotmail.co.uk> <mikobuntu@mikobuntu-Aspire-5332.(none)>
 Jonathan Aquilina <eagles051387@gmail.com>
+midi-pascal <midi-pascal@videotron.ca>
+midi-pascal <midi-pascal@videotron.ca> <pascal@TDE.(none)>
+Thomas Clark <the.thomas.j.clark@gmail.com>
+Thomas Clark <the.thomas.j.clark@gmail.com> <tjclark@wpi.edu>
+anonymous <support@lmms.io> Locale updater <>
+grejppi <grejppi@gmail.com>
+Johannes Lorenz <j.git@lorenz-ho.me> <johannes89@mailueberfall.de>
+Johannes Lorenz <j.git@lorenz-ho.me> <1042576+JohannesLorenz@users.noreply.github.com>
+Noah Brecht <noahb2713@gmail.com>

.svnignore

@@ -1,6 +0,0 @@
-Makefile.in
-*.moc
-.libs
-embedded_resources.h
-.deps
-Makefile

.travis.yml

@@ -1,32 +1,60 @@
 language: cpp
 compiler: gcc
-env:
-    - TARGET_OS=linux
-    - TARGET_OS=win32
-    - TARGET_OS=win64
+dist: trusty
+sudo: required
+cache:
+    directories:
+        - apt_mingw_cache
+        - $HOME/.ccache
+        - $HOME/pbuilder-bases
+matrix:
+    include:
+        - env: TARGET_OS=win32
+        - env: TARGET_OS=win64
+        - os: osx
+          osx_image: xcode8.2
+        - env: QT5=
+        - env: QT5=True
+        - env: QT5=True TARGET_OS=win32 TARGET_DEPLOY=True
+        - env: QT5=True TARGET_OS=win64 TARGET_DEPLOY=True
+        - os: osx
+          osx_image: xcode8.2
+          env: QT5=True
+        - env: TARGET_OS=debian-sid TARGET_DEPLOY=True
+        - env: TARGET_OS=debian-sid TARGET_ARCH=i386
+        - compiler: clang
+          env: TARGET_OS=debian-sid
 before_install:
-    - if [ $TARGET_OS != linux ]; then sudo add-apt-repository ppa:tobydox/mingw -y; fi
-    - sudo apt-get update -qq
+   - . ${TRAVIS_BUILD_DIR}/.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.before_install.sh
 install:
-    - if [ $TARGET_OS != linux ]; then sudo apt-get install -y nsis cloog-isl libmpc2 mingw32; fi
-    - if [ $TARGET_OS != linux ]; then sudo apt-get install -y mingw32-x-qt mingw32-x-sdl mingw32-x-libvorbis mingw32-x-fluidsynth mingw32-x-stk mingw32-x-glib2 mingw32-x-portaudio mingw32-x-libsndfile mingw32-x-fftw mingw32-x-flac mingw32-x-fltk mingw32-x-libsamplerate mingw32-x-pkgconfig mingw32-x-binutils mingw32-x-gcc mingw32-x-runtime; fi
-    - if [ $TARGET_OS == win64 ]; then sudo apt-get install -y mingw64-x-qt mingw64-x-sdl mingw64-x-libvorbis mingw64-x-fluidsynth mingw64-x-stk mingw64-x-glib2 mingw64-x-portaudio mingw64-x-libsndfile mingw64-x-fftw mingw64-x-flac mingw64-x-fltk mingw64-x-libsamplerate mingw64-x-pkgconfig mingw64-x-binutils mingw64-x-gcc mingw64-x-runtime; fi
-    - if [ $TARGET_OS == linux ]; then sudo apt-get install -y libqt4-dev libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev libstk0-dev libfluidsynth-dev portaudio19-dev wine-dev g++-multilib libfltk1.3-dev; fi
+    - . ${TRAVIS_BUILD_DIR}/.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.install.sh
 before_script:
-    - mkdir build && cd build
+    - export CMAKE_FLAGS="-DWANT_QT5=$QT5 -DUSE_WERROR=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo"
+    - if [ -z "$TRAVIS_TAG" ]; then export CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_CCACHE=ON"; fi
 script:
-    - if [ $TARGET_OS == win32 ]; then ../build_mingw32 || ../build_mingw32; fi
-    - if [ $TARGET_OS == win64 ]; then ../build_mingw64 || ../build_mingw64; fi
-    - if [ $TARGET_OS == linux ]; then cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .. && make -j4 VERBOSE=1; fi
-    - if [ $TARGET_OS != linux ]; then make; fi
-before_deploy: make package
+    - . ${TRAVIS_BUILD_DIR}/.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.script.sh
+after_script:
+    - ccache -s
+before_deploy:
+    - if [ "$TARGET_OS" != debian-sid ]; then make package; fi
 deploy:
     provider: releases
     api_key:
         secure: d4a+x4Gugpss7JK2DcHjyBZDmEFFh4iVfKDfITSD50T6Mc6At4LMgojvEu+6qT6IyOY2vm3UVT6fhyeuWDTRDwW9tfFlaHVA0h8aTRD+eAXOA7pQ8rEMwQO3+WCKuKTfEqUkpL4wxhww8dpkv54tqeIs0S4TBqz9tk8UhzU7XbE=
-    file: lmms-${TRAVIS_TAG:1}-$TARGET_OS.exe
+    file_glob: true
+    file:
+        - lmms-${TRAVIS_TAG:1}-$TARGET_OS.exe
+        - /var/cache/pbuilder/result/lmms_*.tar.xz
+    skip_cleanup: true
     on:
         tags: true
         all_branches: true
-        condition: "$TARGET_OS != linux"
+        condition: '"$TARGET_DEPLOY" = True'
     repo: LMMS/lmms
+notifications:
+    webhooks:
+       urls:
+           - https://webhooks.gitter.im/e/1ac7fc698195981a9227
+       on_success: change  # options: [always|never|change] default: always
+       on_failure: always  # options: [always|never|change] default: always
+       on_start: never     # options: [always|never|change] default: always 

.travis/ccache.sha256

@@ -0,0 +1 @@
+0de866bc0ee26de392e037104b174474989a830e2249280a136144baa44557aa ccache_3.2.4-1_amd64.deb

.travis/debian_pkgs.sha256

@@ -0,0 +1,2 @@
+314ef4af137903dfb13e8c3ef1e6ea56cfdb23808d52ec4f5f50e288c73610c5  pbuilder_0.229.1_all.deb
+fa82aa8ed3055c6f6330104deedf080b26778295e589426d4c4dd0f2c2a5defa  debootstrap_1.0.95_all.deb

.travis/linux..before_install.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+sudo add-apt-repository ppa:beineri/opt-qt592-trusty -y
+sudo add-apt-repository ppa:andrewrk/libgroove -y
+sudo sed -e "s/trusty/precise/" -i \
+	/etc/apt/sources.list.d/andrewrk-libgroove-trusty.list
+
+sudo dpkg --add-architecture i386
+sudo apt-get update -qq || true

.travis/linux..install.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+PACKAGES="cmake libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libmp3lame-dev
+	libasound2-dev libjack-jackd2-dev libsdl-dev libsamplerate0-dev libstk0-dev stk
+	libfluidsynth-dev portaudio19-dev g++-multilib libfltk1.3-dev
+	libgig-dev libsoundio-dev"
+
+VST_PACKAGES="wine-dev libqt5x11extras5-dev qtbase5-private-dev libxcb-util0-dev libxcb-keysyms1-dev"
+
+# Help with unmet dependencies
+PACKAGES="$PACKAGES $VST_PACKAGES libjack-jackd2-0"
+
+if [ $QT5 ]; then
+	PACKAGES="$PACKAGES qt59base qt59translations qt59tools"
+else
+	PACKAGES="$PACKAGES libqt4-dev"
+fi
+
+sudo apt-get install -y $PACKAGES
+
+# kxstudio repo offers Carla; avoid package conflicts (wine, etc) by running last
+sudo add-apt-repository -y ppa:kxstudio-debian/libs
+sudo add-apt-repository -y ppa:kxstudio-debian/apps
+sudo apt-get update
+sudo apt-get install -y carla-git

.travis/linux..script.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+mkdir build
+cd build
+
+if [ $QT5 ]; then
+	unset QTDIR QT_PLUGIN_PATH LD_LIBRARY_PATH
+	source /opt/qt59/bin/qt59-env.sh
+fi
+
+cmake -DUSE_WERROR=ON $CMAKE_FLAGS ..
+
+make -j4
+make tests
+./tests/tests

.travis/linux.debian-sid.before_install.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+sudo apt-get update -qq

.travis/linux.debian-sid.install.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+
+sudo apt-get install -y \
+	debian-archive-keyring \
+	dpkg \
+	pbuilder
+
+# work around a pbuilder bug which breaks ccache
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666525
+cd /tmp
+wget http://archive.ubuntu.com/ubuntu/pool/main/p/pbuilder/pbuilder_0.229.1_all.deb
+wget http://archive.ubuntu.com/ubuntu/pool/main/d/debootstrap/debootstrap_1.0.95_all.deb
+sha256sum -c "$TRAVIS_BUILD_DIR/.travis/debian_pkgs.sha256"
+sudo dpkg -i pbuilder_0.229.1_all.deb debootstrap_1.0.95_all.deb
+cd "$OLDPWD"

.travis/linux.debian-sid.script.sh

@@ -0,0 +1,38 @@
+#!/bin/sh
+set -e
+
+: ${TARGET_ARCH:=amd64}
+
+BASETGZ="$HOME/pbuilder-bases/debian-sid-$TARGET_ARCH.tgz"
+MIRROR=http://cdn-fastly.deb.debian.org/debian
+KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
+
+if [ -z "$TRAVIS_TAG" ]
+then
+	sudo \
+	sh -c "echo CCACHEDIR=$HOME/.ccache >> /etc/pbuilderrc"
+fi
+
+if [ "$CC" = clang ]
+then
+	sudo sh -c "echo EXTRAPACKAGES=clang >> /etc/pbuilderrc"
+fi
+
+if [ ! -e "$BASETGZ.stamp" ]
+then
+	mkdir -p "$HOME/pbuilder-bases"
+	sudo pbuilder --create --basetgz "$BASETGZ" --mirror $MIRROR \
+		--distribution sid --architecture $TARGET_ARCH \
+		--debootstrapopts --variant=buildd \
+		--debootstrapopts --keyring=$KEYRING \
+		--debootstrapopts --include=perl
+	touch "$BASETGZ.stamp"
+else
+	sudo pbuilder --update --basetgz "$BASETGZ"
+fi
+
+DIR="$PWD"
+cd ..
+dpkg-source -b "$DIR"
+env -i CC="$CC" CXX="$CXX" sudo pbuilder --build --debbuildopts "--jobs=auto" \
+	--basetgz "$BASETGZ" ./*.dsc

.travis/linux.win.download.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -e
+
+CACHE_DIR=$TRAVIS_BUILD_DIR/apt_mingw_cache/$1
+mkdir -p $CACHE_DIR
+
+pushd $CACHE_DIR
+
+apt-get --print-uris --yes install $MINGW_PACKAGES | grep ^\' | cut -d\' -f2 > downloads.list
+wget -N --input-file downloads.list
+
+sudo cp ./*.deb /var/cache/apt/archives/
+
+popd

.travis/linux.win32.before_install.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+sudo add-apt-repository ppa:tobydox/mingw-x-trusty -y
+sudo apt-get update -qq

.travis/linux.win32.install.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+set -e
+
+if [ $QT5 ]; then
+	MINGW_PACKAGES="mingw32-x-qt5base"
+else
+	MINGW_PACKAGES="mingw32-x-qt"
+fi
+
+MINGW_PACKAGES="mingw32-x-sdl mingw32-x-libvorbis mingw32-x-fluidsynth mingw32-x-stk
+	mingw32-x-glib2 mingw32-x-portaudio mingw32-x-libsndfile mingw32-x-fftw
+	mingw32-x-flac mingw32-x-fltk mingw32-x-libsamplerate
+	mingw32-x-pkgconfig mingw32-x-binutils mingw32-x-gcc mingw32-x-runtime
+	mingw32-x-libgig mingw32-x-libsoundio mingw32-x-lame $MINGW_PACKAGES"
+
+export MINGW_PACKAGES
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+. $DIR/linux.win.download.sh win32
+
+PACKAGES="nsis cloog-isl libmpc3 qt4-linguist-tools mingw32 $MINGW_PACKAGES"
+
+sudo apt-get install -y $PACKAGES
+
+# ccache 3.2 is needed because mingw32-x-gcc is version 4.9, which causes cmake
+# to use @file command line passing, which in turn ccache 3.1.9 doesn't support
+pushd /tmp
+wget http://archive.ubuntu.com/ubuntu/pool/main/c/ccache/ccache_3.2.4-1_amd64.deb
+sha256sum -c $TRAVIS_BUILD_DIR/.travis/ccache.sha256
+sudo dpkg -i ccache_3.2.4-1_amd64.deb
+popd

.travis/linux.win32.script.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+mkdir build
+cd build
+
+export CMAKE_OPTS="$CMAKE_FLAGS -DUSE_WERROR=ON"
+../cmake/build_mingw32.sh
+
+make -j4

.travis/linux.win64.before_install.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+. .travis/linux.win32.before_install.sh

.travis/linux.win64.install.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+set -e
+
+# First, install 32-bit deps
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+. $DIR/linux.win32.install.sh
+
+
+if [ $QT5 ]; then
+	MINGW_PACKAGES="mingw64-x-qt5base"
+else
+	MINGW_PACKAGES="mingw64-x-qt"
+fi
+
+MINGW_PACKAGES="mingw64-x-sdl mingw64-x-libvorbis mingw64-x-fluidsynth mingw64-x-stk
+	mingw64-x-glib2 mingw64-x-portaudio mingw64-x-libsndfile
+	mingw64-x-fftw mingw64-x-flac mingw64-x-fltk mingw64-x-libsamplerate
+	mingw64-x-pkgconfig mingw64-x-binutils mingw64-x-gcc mingw64-x-runtime
+	mingw64-x-libgig mingw64-x-libsoundio mingw64-x-lame $MINGW_PACKAGES"
+
+export MINGW_PACKAGES
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+. $DIR/linux.win.download.sh win64
+
+sudo apt-get install -y $MINGW_PACKAGES

.travis/linux.win64.script.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+mkdir build
+cd build
+
+export CMAKE_OPTS="$CMAKE_FLAGS -DUSE_WERROR=ON"
+../cmake/build_mingw64.sh
+
+make -j4

.travis/osx..before_install.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+brew update

.travis/osx..install.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+PACKAGES="cmake pkgconfig fftw libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk fluid-synth portaudio node fltk carla"
+
+if [ $QT5 ]; then
+	PACKAGES="$PACKAGES qt5"
+fi
+
+brew install $PACKAGES ccache
+
+if [ -z "$QT5" ]; then
+	brew tap cartr/qt4
+	brew tap-pin cartr/qt4
+	brew install qt@4
+fi
+
+sudo npm install -g appdmg

.travis/osx..script.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+mkdir build
+cd build
+
+if [ $QT5 ]; then
+        # Workaround; No FindQt5.cmake module exists
+        export CMAKE_PREFIX_PATH="$(brew --prefix qt5)"
+fi
+
+cmake $CMAKE_FLAGS -DUSE_WERROR=OFF ..
+
+make -j4
+make tests
+./tests/tests

.tx/config

@@ -0,0 +1,11 @@
+[main]
+host = https://www.transifex.com
+minimum_perc = 51
+#Need to finish at least 51% before merging back
+
+[lmms.lmms]
+file_filter = data/locale/<lang>.ts
+source_file = data/locale/en.ts
+source_lang = en
+type = QT
+

CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)
 
 PROJECT(lmms)
 
@@ -7,22 +7,41 @@ SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
 IF(COMMAND CMAKE_POLICY)
 	CMAKE_POLICY(SET CMP0005 NEW)
 	CMAKE_POLICY(SET CMP0003 NEW)
+	IF (CMAKE_MAJOR_VERSION GREATER 2)
+		CMAKE_POLICY(SET CMP0026 OLD)
+		CMAKE_POLICY(SET CMP0045 NEW)
+		CMAKE_POLICY(SET CMP0050 OLD)
+	ENDIF()
 ENDIF(COMMAND CMAKE_POLICY)
 
 INCLUDE(AddFileDependencies)
 INCLUDE(CheckIncludeFiles)
 INCLUDE(FindPkgConfig)
 
-SET(VERSION_MAJOR "1")
-SET(VERSION_MINOR "0")
-SET(VERSION_PATCH "100")
-#SET(VERSION_SUFFIX "")
-SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
-IF(VERSION_SUFFIX)
-	SET(VERSION "${VERSION}-${VERSION_SUFFIX}")
-ENDIF(VERSION_SUFFIX)
+STRING(TOUPPER          "${CMAKE_PROJECT_NAME}" PROJECT_NAME_UCASE)
 
+SET(PROJECT_YEAR 2019)
 
+SET(PROJECT_AUTHOR      "LMMS Developers")
+SET(PROJECT_URL         "https://lmms.io")
+SET(PROJECT_EMAIL       "lmms-devel@lists.sourceforge.net")
+SET(PROJECT_DESCRIPTION "${PROJECT_NAME_UCASE} - Free music production software")
+SET(PROJECT_COPYRIGHT   "2008-${PROJECT_YEAR} ${PROJECT_AUTHOR}")
+SET(VERSION_MAJOR       "1")
+SET(VERSION_MINOR       "2")
+SET(VERSION_RELEASE     "0")
+SET(VERSION_STAGE       "rc8")
+SET(VERSION_BUILD       "0")
+SET(VERSION             "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}")
+IF(VERSION_STAGE)
+	SET(VERSION     "${VERSION}-${VERSION_STAGE}")
+ENDIF()
+IF(VERSION_BUILD)
+	SET(VERSION     "${VERSION}.${VERSION_BUILD}")
+ENDIF()
+
+# Override version information for non-base builds
+INCLUDE(VersionInfo)
 INCLUDE(DetectMachine)
 
 
@@ -32,28 +51,36 @@ OPTION(WANT_CAPS	"Include C* Audio Plugin Suite (LADSPA plugins)" ON)
 OPTION(WANT_CARLA	"Include Carla plugin" ON)
 OPTION(WANT_CMT		"Include Computer Music Toolkit LADSPA plugins" ON)
 OPTION(WANT_JACK	"Include JACK (Jack Audio Connection Kit) support" ON)
+OPTION(WANT_WEAKJACK	"Loosely link JACK libraries" ON)
+OPTION(WANT_MP3LAME	"Include MP3/Lame support" ON)
 OPTION(WANT_OGGVORBIS	"Include OGG/Vorbis support" ON)
 OPTION(WANT_PULSEAUDIO	"Include PulseAudio support" ON)
 OPTION(WANT_PORTAUDIO	"Include PortAudio support" ON)
+OPTION(WANT_SNDIO	"Include sndio support" ON)
+OPTION(WANT_SOUNDIO	"Include libsoundio support" ON)
 OPTION(WANT_SDL		"Include SDL (Simple DirectMedia Layer) support" ON)
 OPTION(WANT_SF2		"Include SoundFont2 player plugin" ON)
+OPTION(WANT_GIG		"Include GIG player plugin" ON)
 OPTION(WANT_STK		"Include Stk (Synthesis Toolkit) support" ON)
 OPTION(WANT_SWH		"Include Steve Harris's LADSPA plugins" ON)
 OPTION(WANT_TAP		"Include Tom's Audio Processing LADSPA plugins" ON)
 OPTION(WANT_VST		"Include VST support" ON)
 OPTION(WANT_VST_NOWINE	"Include partial VST support (without wine)" OFF)
 OPTION(WANT_WINMM	"Include WinMM MIDI support" OFF)
+OPTION(WANT_QT5		"Build with Qt5" OFF)
 
 
 IF(LMMS_BUILD_APPLE)
-	SET(WANT_SF2 OFF)
+	# Fix linking on 10.14+. See issue #4762 on github
+	LINK_DIRECTORIES(/usr/local/lib)
 	SET(WANT_ALSA OFF)
 	SET(WANT_PULSEAUDIO OFF)
 	SET(WANT_VST OFF)
 	SET(STATUS_ALSA "<not supported on this platform>")
 	SET(STATUS_PULSEAUDIO "<not supported on this platform>")
-	# MacPorts: /opt/local/lib
-	LINK_DIRECTORIES(${LINK_DIRECTORIES} /opt/local/lib)
+	SET(STATUS_APPLEMIDI "OK")
+ELSE(LMMS_BUILD_APPLE)
+	SET(STATUS_APPLEMIDI "<not supported on this platform>")
 ENDIF(LMMS_BUILD_APPLE)
 
 
@@ -61,18 +88,30 @@ IF(LMMS_BUILD_WIN32)
 	SET(WANT_ALSA OFF)
 	SET(WANT_JACK OFF)
 	SET(WANT_PULSEAUDIO OFF)
-	SET(WANT_SYSTEM_SR OFF)
+	SET(WANT_SNDIO OFF)
+	SET(WANT_SOUNDIO OFF)
 	SET(WANT_WINMM ON)
 	SET(LMMS_HAVE_WINMM TRUE)
 	SET(STATUS_ALSA "<not supported on this platform>")
 	SET(STATUS_JACK "<not supported on this platform>")
 	SET(STATUS_PULSEAUDIO "<not supported on this platform>")
+	SET(STATUS_SOUNDIO "<disabled in this release>")
 	SET(STATUS_WINMM "OK")
+	SET(STATUS_APPLEMIDI "<not supported on this platform>")
 ELSE(LMMS_BUILD_WIN32)
 	SET(STATUS_WINMM "<not supported on this platform>")
 ENDIF(LMMS_BUILD_WIN32)
 
 
+# TODO: Fix linking issues with msys debug builds
+IF(LMMS_BUILD_MSYS AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+	SET(WANT_GIG OFF)
+	SET(WANT_STK OFF)
+	SET(WANT_SWH OFF)
+	SET(STATUS_GIG "not built as requested")
+	SET(STATUS_STK "not built as requested")
+ENDIF()
+
 
 CHECK_INCLUDE_FILES(stdint.h LMMS_HAVE_STDINT_H)
 CHECK_INCLUDE_FILES(stdlib.h LMMS_HAVE_STDLIB_H)
@@ -83,10 +122,6 @@ CHECK_INCLUDE_FILES(sys/types.h LMMS_HAVE_SYS_TYPES_H)
 CHECK_INCLUDE_FILES(sys/ipc.h LMMS_HAVE_SYS_IPC_H)
 CHECK_INCLUDE_FILES(sys/shm.h LMMS_HAVE_SYS_SHM_H)
 CHECK_INCLUDE_FILES(sys/time.h LMMS_HAVE_SYS_TIME_H)
-CHECK_INCLUDE_FILES(sys/wait.h LMMS_HAVE_SYS_WAIT_H)
-CHECK_INCLUDE_FILES(sys/select.h LMMS_HAVE_SYS_SELECT_H)
-CHECK_INCLUDE_FILES(stdarg.h LMMS_HAVE_STDARG_H)
-CHECK_INCLUDE_FILES(signal.h LMMS_HAVE_SIGNAL_H)
 CHECK_INCLUDE_FILES(sched.h LMMS_HAVE_SCHED_H)
 CHECK_INCLUDE_FILES(sys/soundcard.h LMMS_HAVE_SYS_SOUNDCARD_H)
 CHECK_INCLUDE_FILES(soundcard.h LMMS_HAVE_SOUNDCARD_H)
@@ -99,22 +134,58 @@ CHECK_INCLUDE_FILES(locale.h LMMS_HAVE_LOCALE_H)
 
 LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}")
 
-# check for Qt4
-SET(QT_MIN_VERSION "4.3.0" COMPONENTS QtCore QtGui QtXml)
-FIND_PACKAGE(Qt4 REQUIRED)
-SET(QT_USE_QTXML 1)
-EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_TRANSLATIONS" OUTPUT_VARIABLE QT_TRANSLATIONS_DIR)
-IF(WIN32)
-	SET(QT_TRANSLATIONS_DIR "${MINGW_PREFIX}/share/qt4/translations/")
-ENDIF(WIN32)
-IF(EXISTS "${QT_TRANSLATIONS_DIR}")
-	MESSAGE("-- Found Qt translations in ${QT_TRANSLATIONS_DIR}")
-	ADD_DEFINITIONS(-D'QT_TRANSLATIONS_DIR="${QT_TRANSLATIONS_DIR}"')
-ENDIF(EXISTS "${QT_TRANSLATIONS_DIR}")
-IF(NOT WIN32)
-	STRING(REPLACE "-DQT_DLL" "" QT_DEFINITIONS "${QT_DEFINITIONS}")
-ENDIF(NOT WIN32)
-INCLUDE("${QT_USE_FILE}")
+IF(WANT_QT5)
+	SET(QT5 TRUE)
+
+	FIND_PACKAGE(Qt5Core REQUIRED)
+	FIND_PACKAGE(Qt5Gui REQUIRED)
+	FIND_PACKAGE(Qt5LinguistTools)
+	FIND_PACKAGE(Qt5Widgets REQUIRED)
+	FIND_PACKAGE(Qt5Xml REQUIRED)
+
+	INCLUDE_DIRECTORIES(
+		${Qt5Core_INCLUDE_DIRS}
+		${Qt5Gui_INCLUDE_DIRS}
+		${Qt5Widgets_INCLUDE_DIRS}
+		${Qt5Xml_INCLUDE_DIRS}
+	)
+
+	SET(QT_LIBRARIES
+		Qt5::Core
+		Qt5::Gui
+		Qt5::Widgets
+		Qt5::Xml
+	)
+
+	IF(LMMS_BUILD_LINUX)
+		FIND_PACKAGE(Qt5X11Extras REQUIRED)
+		LIST(APPEND QT_LIBRARIES Qt5::X11Extras)
+	ENDIF()
+
+	# Resolve Qt5::qmake to full path for use in packaging scripts
+	GET_TARGET_PROPERTY(QT_QMAKE_EXECUTABLE "${Qt5Core_QMAKE_EXECUTABLE}" IMPORTED_LOCATION)
+
+	FIND_PACKAGE(Qt5Test)
+	SET(QT_QTTEST_LIBRARY Qt5::Test)
+ELSE()
+	SET(QT5 FALSE)
+
+	# check for Qt4
+	SET(QT_MIN_VERSION "4.6.0" COMPONENTS QtCore QtGui QtXml)
+	FIND_PACKAGE(Qt4 REQUIRED)
+	SET(QT_USE_QTXML 1)
+	IF(WIN32)
+		SET(QT_TRANSLATIONS_DIR "${MINGW_PREFIX}/share/qt4/translations/")
+	ENDIF(WIN32)
+	IF(EXISTS "${QT_TRANSLATIONS_DIR}")
+		MESSAGE("-- Found Qt translations in ${QT_TRANSLATIONS_DIR}")
+		ADD_DEFINITIONS(-D'QT_TRANSLATIONS_DIR="${QT_TRANSLATIONS_DIR}"')
+	ENDIF()
+	IF(NOT WIN32)
+		STRING(REPLACE "-DQT_DLL" "" QT_DEFINITIONS "${QT_DEFINITIONS}")
+	ENDIF()
+	INCLUDE("${QT_USE_FILE}")
+ENDIF()
 
 # check for libsndfile
 PKG_CHECK_MODULES(SNDFILE REQUIRED sndfile>=1.0.11)
@@ -123,44 +194,48 @@ IF(NOT SNDFILE_FOUND)
 ENDIF(NOT SNDFILE_FOUND)
 
 IF(WANT_CALF)
-SET(LMMS_HAVE_CALF TRUE)
-SET(STATUS_CALF "OK")
+	SET(LMMS_HAVE_CALF TRUE)
+	SET(STATUS_CALF "OK")
 ELSE(WANT_CALF)
-SET(STATUS_CALF "not built as requested")
+	SET(STATUS_CALF "not built as requested")
 ENDIF(WANT_CALF)
 
 IF(WANT_CAPS)
-SET(LMMS_HAVE_CAPS TRUE)
-SET(STATUS_CAPS "OK")
+	SET(LMMS_HAVE_CAPS TRUE)
+	SET(STATUS_CAPS "OK")
 ELSE(WANT_CAPS)
-SET(STATUS_CAPS "not built as requested")
+	SET(STATUS_CAPS "not built as requested")
 ENDIF(WANT_CAPS)
 
 IF(WANT_CMT)
-SET(LMMS_HAVE_CMT TRUE)
-SET(STATUS_CMT "OK")
+	SET(LMMS_HAVE_CMT TRUE)
+	SET(STATUS_CMT "OK")
 ELSE(WANT_CMT)
-SET(STATUS_CMT "not built as requested")
+	SET(STATUS_CMT "not built as requested")
 ENDIF(WANT_CMT)
 
 IF(WANT_SWH)
-SET(LMMS_HAVE_SWH TRUE)
-SET(STATUS_SWH "OK")
+	SET(LMMS_HAVE_SWH TRUE)
+	SET(STATUS_SWH "OK")
 ELSE(WANT_SWH)
-SET(STATUS_SWH "not built as requested")
+	SET(STATUS_SWH "not built as requested")
 ENDIF(WANT_SWH)
 
 IF(WANT_TAP)
-SET(LMMS_HAVE_TAP TRUE)
-SET(STATUS_TAP "OK")
+	SET(LMMS_HAVE_TAP TRUE)
+	SET(STATUS_TAP "OK")
 ELSE(WANT_TAP)
-SET(STATUS_TAP "not built as requested")
+	SET(STATUS_TAP "not built as requested")
 ENDIF(WANT_TAP)
 
 
 # check for CARLA
 IF(WANT_CARLA)
-	PKG_CHECK_MODULES(CARLA carla-standalone>=1.9.5)
+	PKG_CHECK_MODULES(CARLA carla-native-plugin)
+	# look for carla under old name
+	IF(NOT CARLA_FOUND)
+		PKG_CHECK_MODULES(CARLA carla-standalone>=1.9.5)
+	ENDIF()
 	IF(CARLA_FOUND)
 		SET(LMMS_HAVE_CARLA TRUE)
 		SET(STATUS_CARLA "OK")
@@ -178,7 +253,7 @@ IF(WANT_SDL)
 		SET(LMMS_HAVE_SDL TRUE)
 		SET(STATUS_SDL "OK")
 	ELSE(SDL_FOUND)
-		SET(STATUS_SDL "not found, please install libsdl1.2-dev (or similiar) "
+		SET(STATUS_SDL "not found, please install libsdl1.2-dev (or similar) "
 			"if you require SDL support")
 	ENDIF(SDL_FOUND)
 ENDIF(WANT_SDL)
@@ -199,7 +274,7 @@ IF(WANT_STK)
 		SET(STATUS_STK "OK")
 	ELSE(STK_FOUND)
 		SET(STK_INCLUDE_DIR "")
-		SET(STATUS_STK "not found, please install libstk0-dev (or similiar) "
+		SET(STATUS_STK "not found, please install libstk0-dev (or similar) "
 			"if you require the Mallets instrument")
 	ENDIF(STK_FOUND)
 ENDIF(WANT_STK)
@@ -212,11 +287,25 @@ IF(WANT_PORTAUDIO)
 		SET(LMMS_HAVE_PORTAUDIO TRUE)
 		SET(STATUS_PORTAUDIO "OK")
 	ELSE(PORTAUDIO_FOUND)
-		SET(STATUS_PORTAUDIO "not found, please install portaudio19-dev (or similiar, version >= 1.9) "
+		SET(STATUS_PORTAUDIO "not found, please install portaudio19-dev (or similar, version >= 1.9) "
 			"if you require PortAudio support")
 	ENDIF(PORTAUDIO_FOUND)
 ENDIF(WANT_PORTAUDIO)
 
+# check for libsoundio
+IF(WANT_SOUNDIO)
+  FIND_PACKAGE(SoundIo)
+  IF(SOUNDIO_FOUND)
+    SET(LMMS_HAVE_SOUNDIO TRUE)
+    SET(STATUS_SOUNDIO "OK")
+    INCLUDE_DIRECTORIES("${SOUNDIO_INCLUDE_DIR}")
+  ELSE(SOUNDIO_FOUND)
+    SET(SOUNDIO_INCLUDE_DIR "")
+    SET(STATUS_SOUNDIO "not found, please install libsoundio if you require libsoundio support")
+    SET(SOUNDIO_LIBRARY "")
+  ENDIF(SOUNDIO_FOUND)
+ENDIF(WANT_SOUNDIO)
+
 
 # check for PulseAudio
 IF(WANT_PULSEAUDIO)
@@ -225,7 +314,7 @@ IF(WANT_PULSEAUDIO)
 		SET(LMMS_HAVE_PULSEAUDIO TRUE)
 		SET(STATUS_PULSEAUDIO "OK")
 	ELSE(PULSEAUDIO_FOUND)
-		SET(STATUS_PULSEAUDIO "not found, please install libpulse-dev (or similiar) "
+		SET(STATUS_PULSEAUDIO "not found, please install libpulse-dev (or similar) "
 			"if you require PulseAudio support")
 	ENDIF(PULSEAUDIO_FOUND)
 ENDIF(WANT_PULSEAUDIO)
@@ -235,6 +324,21 @@ IF(NOT LMMS_HAVE_PULSEAUDIO)
 ENDIF(NOT LMMS_HAVE_PULSEAUDIO)
 
 
+# check for MP3/Lame-libraries
+IF(WANT_MP3LAME)
+	FIND_PACKAGE(Lame)
+	IF(LAME_FOUND)
+		SET(LMMS_HAVE_MP3LAME TRUE)
+		SET(STATUS_MP3LAME "OK")
+	ELSE(LAME_FOUND)
+		SET(STATUS_MP3LAME "not found, please install libmp3lame-dev (or similar)")
+		SET(LAME_LIBRARIES "")
+		SET(LAME_INCLUDE_DIRS "")
+	ENDIF(LAME_FOUND)
+ELSE(WANT_MP3LAME)
+	SET(STATUS_MP3LAME "Disabled for build")
+ENDIF(WANT_MP3LAME)
+
 # check for OGG/Vorbis-libraries
 IF(WANT_OGGVORBIS)
 	FIND_PACKAGE(OggVorbis)
@@ -242,7 +346,7 @@ IF(WANT_OGGVORBIS)
 		SET(LMMS_HAVE_OGGVORBIS TRUE)
 		SET(STATUS_OGGVORBIS "OK")
 	ELSE(OGGVORBIS_FOUND)
-		SET(STATUS_OGGVORBIS "not found, libogg-dev and libvorbis-dev (or similiar) "
+		SET(STATUS_OGGVORBIS "not found, libogg-dev and libvorbis-dev (or similar) "
 			"is highly recommended")
 	ENDIF(OGGVORBIS_FOUND)
 ENDIF(WANT_OGGVORBIS)
@@ -264,7 +368,7 @@ IF(WANT_ALSA)
 		SET(LMMS_HAVE_ALSA TRUE)
 		SET(STATUS_ALSA "OK")
 	ELSE(ALSA_FOUND)
-		SET(STATUS_ALSA "not found, please install libasound2-dev (or similiar) "
+		SET(STATUS_ALSA "not found, please install libasound2-dev (or similar) "
 			"if you require ALSA support")
 	ENDIF(ALSA_FOUND)
 ENDIF(WANT_ALSA)
@@ -277,10 +381,18 @@ ENDIF(NOT LMMS_HAVE_ALSA)
 IF(WANT_JACK)
 	PKG_CHECK_MODULES(JACK jack>=0.77)
 	IF(JACK_FOUND)
+		IF(WANT_WEAKJACK)
+			SET(LMMS_HAVE_WEAKJACK TRUE)
+			SET(STATUS_JACK "OK (weak linking enabled)")
+			SET(JACK_INCLUDE_DIRS "")
+			# use dlsym instead
+			SET(JACK_LIBRARIES ${CMAKE_DL_LIBS})
+		ELSE()
+			SET(STATUS_JACK "OK")
+		ENDIF()
 		SET(LMMS_HAVE_JACK TRUE)
-		SET(STATUS_JACK "OK")
 	ELSE(JACK_FOUND)
-		SET(STATUS_JACK "not found, please install libjack0.100.0-dev (or similiar) "
+		SET(STATUS_JACK "not found, please install libjack0.100.0-dev (or similar) "
 			"if you require JACK support")
 	ENDIF(JACK_FOUND)
 ENDIF(WANT_JACK)
@@ -290,6 +402,10 @@ ENDIF(WANT_JACK)
 PKG_CHECK_MODULES(FFTW3F REQUIRED fftw3f>=3.0.0)
 
 
+# check for FLTK
+FIND_PACKAGE(FLTK)
+
+
 # check for Fluidsynth
 IF(WANT_SF2)
 	PKG_CHECK_MODULES(FLUIDSYNTH fluidsynth>=1.0.7)
@@ -297,24 +413,52 @@ IF(WANT_SF2)
 		SET(LMMS_HAVE_FLUIDSYNTH TRUE)
 		SET(STATUS_FLUIDSYNTH "OK")
 	ELSE(FLUIDSYNTH_FOUND)
-		SET(STATUS_FLUIDSYNTH "not found, libfluidsynth-dev (or similiar)"
+		SET(STATUS_FLUIDSYNTH "not found, libfluidsynth-dev (or similar)"
 			"is highly recommended")
 	ENDIF(FLUIDSYNTH_FOUND)
 ENDIF(WANT_SF2)
 
+# check for libgig
+If(WANT_GIG)
+	PKG_CHECK_MODULES(GIG gig)
+	IF(GIG_FOUND)
+		SET(LMMS_HAVE_GIG TRUE)
+		SET(STATUS_GIG "OK")
+	ELSE(GIG_FOUND)
+		SET(STATUS_GIG "not found, libgig needed for decoding .gig files")
+	ENDIF(GIG_FOUND)
+ENDIF(WANT_GIG)
+
 # check for pthreads
-IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE)
+IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD)
 	FIND_PACKAGE(Threads)
-ENDIF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE)
+ENDIF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD)
+
+IF(WANT_SNDIO)
+	FIND_PACKAGE(Sndio)
+	IF(SNDIO_FOUND)
+		SET(LMMS_HAVE_SNDIO TRUE)
+        	SET(STATUS_SNDIO "OK")
+    	ELSE()
+        	SET(STATUS_SNDIO "<not found or not supported on this platform>")
+	ENDIF(SNDIO_FOUND)
+ENDIF(WANT_SNDIO)
 
 # check for WINE
 IF(WANT_VST)
 	FIND_PACKAGE(Wine)
 	IF(WINE_FOUND)
+		SET(LMMS_SUPPORT_VST TRUE)
+		IF(WINE_LIBRARY_FIX)
+			SET(STATUS_VST "OK, with workaround linking ${WINE_LIBRARY_FIX}")
+		ELSE()
+			SET(STATUS_VST "OK")
+		ENDIF()
+	ELSEIF(WANT_VST_NOWINE)
 		SET(LMMS_SUPPORT_VST TRUE)
 		SET(STATUS_VST "OK")
 	ELSE(WINE_FOUND)
-		SET(STATUS_VST "not found, please install (lib)wine-dev (or similiar) - 64 bit systems additionally need gcc-multilib and g++-multilib")
+		SET(STATUS_VST "not found, please install (lib)wine-dev (or similar) - 64 bit systems additionally need gcc-multilib and g++-multilib")
 	ENDIF(WINE_FOUND)
 ENDIF(WANT_VST)
 IF(LMMS_BUILD_WIN32)
@@ -326,40 +470,45 @@ ENDIF(LMMS_BUILD_WIN32)
 # check for libsamplerate
 PKG_CHECK_MODULES(SAMPLERATE REQUIRED samplerate>=0.1.8)
 
-
-CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/lmmsconfig.h.in" "${CMAKE_BINARY_DIR}/lmmsconfig.h")
-CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/lmmsversion.h.in" "${CMAKE_BINARY_DIR}/lmmsversion.h")
-CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/lmms.rc.in" "${CMAKE_BINARY_DIR}/lmms.rc")
-CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc.in" "${CMAKE_BINARY_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc")
-
 # set compiler flags
 SET(WERROR_FLAGS "-Wall -Werror=unused-function -Wno-sign-compare -Wno-strict-overflow")
-IF(NOT LMMS_BUILD_APPLE)
+OPTION(USE_WERROR "Add -werror to the build flags. Stops the build on warnings" OFF)
+IF(${USE_WERROR})
    SET(WERROR_FLAGS "${WERROR_FLAGS} -Werror")
 ENDIF()
 
 # Due to a regression in gcc-4.8.X, we need to disable array-bounds check
-IF (CMAKE_COMPILER_IS_GNUCXX AND ((CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL "4.8.0") OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.8.0")))
+IF (CMAKE_COMPILER_IS_GNUCXX AND ((CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL "4.8.0") OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.8.0") OR LMMS_BUILD_WIN32))
    SET(WERROR_FLAGS "${WERROR_FLAGS} -Wno-array-bounds")
 ENDIF()
 
-SET(CMAKE_C_FLAGS "-O2 -g ${WERROR_FLAGS} ${CMAKE_C_FLAGS}")
-SET(CMAKE_CXX_FLAGS "-O2 -g -fno-exceptions ${WERROR_FLAGS} ${CMAKE_CXX_FLAGS}")
-set(CMAKE_C_FLAGS_DEBUG "-DLMMS_DEBUG")
+IF(NOT CMAKE_BUILD_TYPE)
+	message(STATUS "Setting build type to 'Release' as none was specified.")
+	set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
+	# Set the possible values of build type for cmake-gui
+	SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release"
+  		"MinSizeRel" "RelWithDebInfo")
+ENDIF()
+
+SET(CMAKE_C_FLAGS "${WERROR_FLAGS} ${CMAKE_C_FLAGS}")
+SET(CMAKE_CXX_FLAGS "-fno-exceptions ${WERROR_FLAGS} ${CMAKE_CXX_FLAGS}")
+SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DLMMS_DEBUG")
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DLMMS_DEBUG")
 
 
 # people simply updating git will still have this and mess up build with it
 FILE(REMOVE include/lmmsconfig.h)
 
-FILE(GLOB lmms_INCLUDES "${CMAKE_SOURCE_DIR}/include/*.h")
-FILE(GLOB lmms_UI "${CMAKE_SOURCE_DIR}/src/gui/dialogs/*.ui" "${CMAKE_SOURCE_DIR}/src/gui/Forms/*.ui")
-FILE(GLOB_RECURSE lmms_SOURCES "${CMAKE_SOURCE_DIR}/src/*.cpp")
+FILE(GLOB LMMS_INCLUDES "${CMAKE_SOURCE_DIR}/include/*.h")
+LIST(SORT LMMS_INCLUDES)
 
-SET(lmms_MOC ${lmms_INCLUDES})
-
-# Get list of all committers from git history, ordered by number of commits
+# Get list of all committers from git history, ordered by number of commits.
+# The CONTRIBUTORS file is used by AboutDialog. This information can be provided
+# with -DCONTRIBUTORS=/path/to/CONTRIBUTORS instead. For instance, to generate
+# this file for version 1.1.3, the command is:
+# 	git shortlog -sne v1.1.3 | cut -c8-
 FIND_PACKAGE(Git)
-IF(GIT_FOUND)
+IF(GIT_FOUND AND NOT CONTRIBUTORS)
 	SET(CONTRIBUTORS "${CMAKE_BINARY_DIR}/CONTRIBUTORS")
 	EXECUTE_PROCESS(
 		COMMAND "${GIT_EXECUTABLE}" shortlog -sne
@@ -367,177 +516,66 @@ IF(GIT_FOUND)
 		OUTPUT_FILE "${CONTRIBUTORS}"
 		WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
 		TIMEOUT 1)
-ENDIF(GIT_FOUND)
-
-SET(lmms_EMBEDDED_RESOURCES "${CMAKE_SOURCE_DIR}/AUTHORS" "${CMAKE_SOURCE_DIR}/COPYING" "${CONTRIBUTORS}")
-
-QT4_WRAP_CPP(lmms_MOC_out ${lmms_MOC} OPTIONS -nw)
-QT4_WRAP_UI(lmms_UI_out ${lmms_UI})
-
+ENDIF()
 
 # embedded resources stuff
 IF(WIN32 OR WIN64)
 	# compile buildtools native
 	SET(BIN2RES_CPP "${CMAKE_SOURCE_DIR}/buildtools/bin2res.cpp")
 	SET(BIN2RES "${CMAKE_BINARY_DIR}/bin2res")
-	ADD_CUSTOM_COMMAND(OUTPUT "${BIN2RES}" COMMAND g++ ARGS "\"${BIN2RES_CPP}\"" -o "\"${BIN2RES}\"" DEPENDS "${BIN2RES_CPP}")
+	ADD_CUSTOM_TARGET(bin2res COMMAND g++ "\"${BIN2RES_CPP}\"" -o "\"${BIN2RES}\"" DEPENDS "${BIN2RES_CPP}")
 ELSE(WIN32 OR WIN64)
 	ADD_EXECUTABLE(bin2res buildtools/bin2res.cpp)
 	GET_TARGET_PROPERTY(BIN2RES bin2res LOCATION)
 ENDIF(WIN32 OR WIN64)
 
-SET(LMMS_ER_H "${CMAKE_CURRENT_BINARY_DIR}/embedded_resources.h")
-
 # we somehow have to make LMMS-binary depend on MOC-files
-ADD_FILE_DEPENDENCIES("${CMAKE_BINARY_DIR}/lmmsconfig.h" ${lmms_MOC_out})
-
-ADD_CUSTOM_COMMAND(OUTPUT "${LMMS_ER_H}" COMMAND "${BIN2RES}" ARGS ${lmms_EMBEDDED_RESOURCES} > "\"${LMMS_ER_H}\"" DEPENDS "${BIN2RES}")
+ADD_FILE_DEPENDENCIES("${CMAKE_BINARY_DIR}/lmmsconfig.h")
 
 IF(WIN32)
-	SET(WINRC "${CMAKE_BINARY_DIR}/lmmsrc.obj")
-	ADD_CUSTOM_COMMAND(OUTPUT "${WINRC}"
-				COMMAND "${WINDRES}"
-					"-I\"${CMAKE_SOURCE_DIR}\""
-					"-o\"${CMAKE_BINARY_DIR}/lmmsrc.obj\""
-					"-i\"${CMAKE_BINARY_DIR}/lmms.rc\""
-				DEPENDS "${CMAKE_BINARY_DIR}/lmms.rc")
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes")
 ELSE(WIN32)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -DPIC")
 ENDIF(WIN32)
 
-# set up apple vars before traversing into data/scripts
-SET(MACOSX_BUNDLE_ICON_FILE "lmms.icns")
-SET(MACOSX_BUNDLE_GUI_IDENTIFIER "LMMS")
-SET(MACOSX_BUNDLE_LONG_VERSION_STRING "${VERSION}")
-SET(MACOSX_BUNDLE_BUNDLE_NAME "LMMS")
-SET(MACOSX_BUNDLE_SHORT_VERSION_STRING "${VERSION}")
-SET(MACOSX_BUNDLE_BUNDLE_VERSION "${VERSION}")
-SET(MACOSX_BUNDLE_COPYRIGHT "Tobias Doerffel, 2008-2010")
-SET(MACOSX_BUNDLE_MIMETYPE "application/x-lmms-project")
-SET(MACOSX_BUNDLE_MIMETYPE_ICON "project.icns")
-SET(MACOSX_BUNDLE_MIMETYPE_ID "net.sourceforge.lmms")
-SET(MACOSX_BUNDLE_PROJECT_URL "http://lmms.io")
-
+# use ccache
+OPTION(USE_CCACHE "Use ccache for compilation" OFF)
+IF(USE_CCACHE)
+    FIND_PROGRAM(CCACHE ccache)
+    IF (CCACHE)
+        MESSAGE(STATUS "Using ccache found in PATH")
+        SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE})
+        SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE})
+    ELSE()
+        MESSAGE(WARNING "USE_CCACHE enabled, but no ccache found")
+    ENDIF()
+ENDIF()
 
 # make sub-directories
+ADD_SUBDIRECTORY(cmake)
+ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(plugins)
+ADD_SUBDIRECTORY(tests)
 ADD_SUBDIRECTORY(data)
 ADD_SUBDIRECTORY(doc)
 
+# post-install tasks
+ADD_SUBDIRECTORY(cmake/postinstall)
 
-#
-# build LMMS-binary
-#
-IF(LMMS_BUILD_WIN32)
-	SET(EXTRA_LIBRARIES "-lwinmm")
-ENDIF()
+ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_BINARY_DIR}/lmms.1.gz"
+				COMMAND gzip -c ${CMAKE_SOURCE_DIR}/doc/lmms.1 > ${CMAKE_BINARY_DIR}/lmms.1.gz
+				DEPENDS "${CMAKE_SOURCE_DIR}/doc/lmms.1"
+				COMMENT "Generating lmms.1.gz"
+				VERBATIM)
 
-# Paths relative to lmms executable
-FILE(RELATIVE_PATH LIB_DIR_RELATIVE "/${BIN_DIR}" "/${LIB_DIR}")
-FILE(RELATIVE_PATH PLUGIN_DIR_RELATIVE "/${BIN_DIR}" "/${PLUGIN_DIR}")
-ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR_RELATIVE}/"' -D'PLUGIN_DIR="${PLUGIN_DIR_RELATIVE}/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
-INCLUDE_DIRECTORIES("${CMAKE_BINARY_DIR}"
-                    "${CMAKE_BINARY_DIR}/include"
-                    "${CMAKE_SOURCE_DIR}"
-                    "${CMAKE_SOURCE_DIR}/include"
-                    ${JACK_INCLUDE_DIRS}
-                    ${SAMPLERATE_INCLUDE_DIRS}
-                    ${SNDFILE_INCLUDE_DIRS})
-
-IF(NOT ("${SDL_INCLUDE_DIR}" STREQUAL ""))
-	INCLUDE_DIRECTORIES("${SDL_INCLUDE_DIR}")
-ENDIF()
-
-IF(NOT ("${PORTAUDIO_INCLUDE_DIR}" STREQUAL ""))
-	INCLUDE_DIRECTORIES("${PORTAUDIO_INCLUDE_DIR}")
-ENDIF()
-
-IF(NOT ("${PULSEAUDIO_INCLUDE_DIR}" STREQUAL ""))
-	INCLUDE_DIRECTORIES("${PULSEAUDIO_INCLUDE_DIR}")
-ENDIF()
-
-IF(NOT ("${OGGVORBIS_INCLUDE_DIR}" STREQUAL ""))
-	INCLUDE_DIRECTORIES("${OGGVORBIS_INCLUDE_DIR}")
-ENDIF()
-
-ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_BINARY_DIR}/lmms.1.gz" COMMAND gzip -c "\"${CMAKE_SOURCE_DIR}/lmms.1\"" > "\"${CMAKE_BINARY_DIR}/lmms.1.gz\"" DEPENDS "${CMAKE_SOURCE_DIR}/lmms.1" COMMENT "Generating lmms.1.gz")
-ADD_EXECUTABLE(lmms ${lmms_SOURCES} ${lmms_INCLUDES} "${LMMS_ER_H}" ${lmms_UI_out} lmmsconfig.h lmmsversion.h "${WINRC}" "${CMAKE_BINARY_DIR}/lmms.1.gz")
-
-TARGET_LINK_LIBRARIES(lmms ${CMAKE_THREAD_LIBS_INIT} ${QT_LIBRARIES} ${ASOUND_LIBRARY} ${SDL_LIBRARY} ${PORTAUDIO_LIBRARIES} ${PULSEAUDIO_LIBRARIES} ${JACK_LIBRARIES} ${OGGVORBIS_LIBRARIES} ${SAMPLERATE_LIBRARIES} ${SNDFILE_LIBRARIES} ${EXTRA_LIBRARIES})
-
-IF(LMMS_BUILD_WIN32)
-
-	SET_TARGET_PROPERTIES(lmms PROPERTIES LINK_FLAGS "${LINK_FLAGS} -mwindows")
-	ADD_CUSTOM_COMMAND(TARGET lmms POST_BUILD COMMAND "${STRIP}" "\"${CMAKE_BINARY_DIR}/lmms.exe\"")
-
-	INSTALL(TARGETS lmms RUNTIME DESTINATION "${BIN_DIR}")
-	INSTALL(FILES
-					"${MINGW_PREFIX}/bin/QtCore4.dll"
-					"${MINGW_PREFIX}/bin/QtGui4.dll"
-					"${MINGW_PREFIX}/bin/QtSvg4.dll"
-					"${MINGW_PREFIX}/bin/QtXml4.dll"
-					"${MINGW_PREFIX}/bin/libsamplerate-0.dll"
-					"${MINGW_PREFIX}/bin/libsndfile-1.dll"
-					"${MINGW_PREFIX}/bin/libvorbis-0.dll"
-					"${MINGW_PREFIX}/bin/libvorbisenc-2.dll"
-					"${MINGW_PREFIX}/bin/libvorbisfile-3.dll"
-					"${MINGW_PREFIX}/bin/libjpeg-9.dll"
-					"${MINGW_PREFIX}/bin/libogg-0.dll"
-					"${MINGW_PREFIX}/lib/libfltk.dll"
-					"${MINGW_PREFIX}/bin/libfluidsynth.dll"
-					"${MINGW_PREFIX}/bin/libfftw3f-3.dll"
-					"${MINGW_PREFIX}/bin/libFLAC-8.dll"
-					"${MINGW_PREFIX}/bin/libportaudio-2.dll"
-					"${MINGW_PREFIX}/bin/libpng16-16.dll"
-					"${MINGW_PREFIX}/bin/SDL.dll"
-					"${MINGW_PREFIX}/bin/libglib-2.0-0.dll"
-					"${MINGW_PREFIX}/bin/libgthread-2.0-0.dll"
-					"${MINGW_PREFIX}/bin/zlib1.dll"
-					"${MINGW_PREFIX}/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32/bin/libwinpthread-1.dll"
-				DESTINATION .)
-
-ELSE(LMMS_BUILD_WIN32)
-	IF(NOT LMMS_BUILD_APPLE)
-		SET_TARGET_PROPERTIES(lmms PROPERTIES LINK_FLAGS "${LINK_FLAGS} -Wl,-E")
-	ENDIF(NOT LMMS_BUILD_APPLE)
-
-	INSTALL(TARGETS lmms RUNTIME DESTINATION "${BIN_DIR}")
-	INSTALL(FILES "${CMAKE_BINARY_DIR}/lmms.1.gz" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1/" PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
-
-ENDIF(LMMS_BUILD_WIN32)
-
-#
-# rules for building localizations
-#
-FILE(GLOB lmms_LOCALES data/locale/*.ts)
-SET(ts_targets "")
-SET(qm_targets "")
-FOREACH(_ts_file ${lmms_LOCALES})
-	STRING(REPLACE "${CMAKE_SOURCE_DIR}/data/locale/" "" _ts_target "${_ts_file}")
-	STRING(REPLACE ".ts" ".qm" _qm_file "${_ts_file}")
-	STRING(REPLACE ".ts" ".qm" _qm_target "${_ts_target}")
-	ADD_CUSTOM_TARGET(${_ts_target} COMMAND "${QT_LUPDATE_EXECUTABLE}" -locations none -no-obsolete -I ${CMAKE_SOURCE_DIR}/include/ ${lmms_SOURCES} ${lmms_INCLUDES} ${lmms_UI} `find "\"${CMAKE_SOURCE_DIR}/plugins/\"" -type f -name '*.cpp' -or -name '*.h'` -ts "\"${_ts_file}\"")
-	ADD_CUSTOM_TARGET(${_qm_target} COMMAND "${QT_LRELEASE_EXECUTABLE}" "\"${_ts_file}\"" -qm "\"${_qm_file}\"")
-	LIST(APPEND ts_targets "${_ts_target}")
-	LIST(APPEND qm_targets "${_qm_target}")
-ENDFOREACH(_ts_file ${lmms_LOCALES})
-
-ADD_CUSTOM_TARGET(update-locales)
-FOREACH(_item ${ts_targets})
-	ADD_DEPENDENCIES(update-locales "${_item}")
-ENDFOREACH(_item ${ts_targets})
-
-ADD_CUSTOM_TARGET(finalize-locales)
-FOREACH(_item ${qm_targets})
-	ADD_DEPENDENCIES(finalize-locales "${_item}")
-ENDFOREACH(_item ${qm_targets})
 
+ADD_CUSTOM_TARGET(manpage ALL
+				DEPENDS "${CMAKE_BINARY_DIR}/lmms.1.gz")
 
 # install headers
 
 IF(LMMS_BUILD_LINUX)
-	INSTALL(FILES ${lmms_INCLUDES}
+	INSTALL(FILES ${LMMS_INCLUDES}
 		"${CMAKE_BINARY_DIR}/lmmsconfig.h"
 		"${CMAKE_BINARY_DIR}/lmmsversion.h"
 		"${CMAKE_SOURCE_DIR}/src/gui/embed.cpp"
@@ -551,6 +589,7 @@ IF(LMMS_BUILD_WIN32)
 		FILE(GLOB ZASF_BINARIES
 			"${CMAKE_SOURCE_DIR}/extras/plugins/zynaddsubfx/zynaddsubfx.dll"
 			"${CMAKE_SOURCE_DIR}/extras/plugins/zynaddsubfx/remote_zynaddsubfx.exe")
+		LIST(SORT ZASF_BINARIES)
 		INSTALL(FILES "${ZASF_BINARIES}" DESTINATION "${PLUGIN_DIR}")
 	ENDIF(EXISTS "${CMAKE_SOURCE_DIR}/extras")
 ENDIF(LMMS_BUILD_WIN32)
@@ -570,16 +609,12 @@ ADD_CUSTOM_TARGET(dist
 			COMMAND make clean
 			COMMAND rm -rf "${TMP}"
 			COMMAND mkdir -p "${TMP}"
-			COMMAND cp AUTHORS build_mingw32 build_mingw64 CMakeLists.txt configure COPYING INSTALL lmms.1 lmms.rc.in lmms.spec.in lmmsconfig.h.in lmmsversion.h.in README TODO "${TMP}"
+			COMMAND cp CMakeLists.txt LICENSE.txt INSTALL.txt README.md "${TMP}"
 			COMMAND cp -r buildtools cmake data doc include plugins src "${TMP}"
 			COMMAND rm -rf `find "${TMP}" -name cmake_install.cmake` `find "${TMP}" -name Makefile` `find "${TMP}" -type d -name CMakeFiles` "${TMP}/CMakeCache.txt"
 			COMMAND tar cjf lmms-${VERSION}-src.tar.bz2 "${TMP}"
 			COMMAND rm -rf "${TMP}")
 
-
-SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_ER_H} ${lmms_MOC_out} ${lmms_UI_out} lmmsconfig.h lmms.1.gz")
-
-
 #
 # display configuration information
 #
@@ -596,7 +631,9 @@ MESSAGE(
 "* ALSA                        : ${STATUS_ALSA}\n"
 "* JACK                        : ${STATUS_JACK}\n"
 "* OSS                         : ${STATUS_OSS}\n"
+"* Sndio                       : ${STATUS_SNDIO}\n"
 "* PortAudio                   : ${STATUS_PORTAUDIO}\n"
+"* libsoundio                  : ${STATUS_SOUNDIO}\n"
 "* PulseAudio                  : ${STATUS_PULSEAUDIO}\n"
 "* SDL                         : ${STATUS_SDL}\n"
 )
@@ -606,7 +643,10 @@ MESSAGE(
 "-------------------------\n"
 "* ALSA                        : ${STATUS_ALSA}\n"
 "* OSS                         : ${STATUS_OSS}\n"
+"* Sndio                       : ${STATUS_SNDIO}\n"
+"* JACK                        : ${STATUS_JACK}\n"
 "* WinMM                       : ${STATUS_WINMM}\n"
+"* AppleMidi                   : ${STATUS_APPLEMIDI}\n"
 )
 
 MESSAGE(
@@ -614,6 +654,7 @@ MESSAGE(
 "-----------------------------------------\n"
 "* WAVE                        : OK\n"
 "* OGG/VORBIS                  : ${STATUS_OGGVORBIS}\n"
+"* MP3/Lame                    : ${STATUS_MP3LAME}\n"
 )
 
 MESSAGE(
@@ -629,6 +670,7 @@ MESSAGE(
 "* CMT LADSPA plugins          : ${STATUS_CMT}\n"
 "* TAP LADSPA plugins          : ${STATUS_TAP}\n"
 "* SWH LADSPA plugins          : ${STATUS_SWH}\n"
+"* GIG player                  : ${STATUS_GIG}\n"
 )
 
 MESSAGE(
@@ -641,59 +683,3 @@ MESSAGE(
 "\n\n")
 
 INCLUDE(InstallRequiredSystemLibraries)
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "LMMS - easy music production for everyone!")
-SET(CPACK_PACKAGE_VENDOR "LMMS Developers")
-IF(LMMS_BUILD_APPLE)
-CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/README" "${CMAKE_BINARY_DIR}/README.txt" COPYONLY)
-CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/COPYING" "${CMAKE_BINARY_DIR}/COPYING.txt" COPYONLY)
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_BINARY_DIR}/README.txt")
-SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_BINARY_DIR}/COPYING.txt")
-ELSE(LMMS_BUILD_APPLE)
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README")
-SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
-ENDIF(LMMS_BUILD_APPLE)
-
-SET(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
-SET(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
-SET(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")
-IF(VERSION_SUFFIX)
-	SET(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}-${VERSION_SUFFIX}")
-ENDIF(VERSION_SUFFIX)
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "LMMS")
-IF(WIN32)
-SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/data/nsis_branding.bmp")
-SET(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/data/lmms.ico")
-SET(CPACK_NSIS_INSTALLED_ICON_NAME "lmms.exe")
-SET(CPACK_NSIS_DISPLAY_NAME "LMMS ${VERSION}")
-SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\lmms.io")
-SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\lmms.io")
-SET(CPACK_NSIS_CONTACT "lmms-devel@lists.sourceforge.net")
-SET(CPACK_PACKAGE_EXECUTABLES "lmms.exe;LMMS")
-SET(CPACK_NSIS_MENU_LINKS "lmms.exe;LMMS")
-SET(CPACK_NSIS_DEFINES "!include ${CMAKE_SOURCE_DIR}/cmake/nsis/FileAssociation.nsh")
-SET(CPACK_PACKAGE_FILE_NAME "lmms-${VERSION}-win32")
-SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
-  \\\${registerExtension} \\\"$INSTDIR\\\\lmms.exe\\\" \\\".mmp\\\" \\\"LMMS Project\\\"
-  \\\${registerExtension} \\\"$INSTDIR\\\\lmms.exe\\\" \\\".mmpz\\\" \\\"LMMS Project (compressed)\\\"
-  ")
-SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
-  \\\${unregisterExtension} \\\".mmp\\\" \\\"LMMS Project\\\"
-  \\\${unregisterExtension} \\\".mmpz\\\" \\\"LMMS Project (compressed)\\\"
-  DeleteRegKey HKCR \\\"LMMS Project\\\"
-  DeleteRegKey HKCR \\\"LMMS Project (compressed)\\\"
-  ")
-ELSE(WIN32)
-SET(CPACK_STRIP_FILES "bin/lmms;${PLUGIN_DIR}/*.so")
-SET(CPACK_PACKAGE_EXECUTABLES "lmms" "LMMS binary")
-ENDIF(WIN32)
-
-IF(WIN64)
-	SET(CPACK_PACKAGE_FILE_NAME "lmms-${VERSION}-win64")
-	SET(CPACK_NSIS_DEFINES "${CPACK_NSIS_DEFINES}
-		InstallDir \\\"\\\$PROGRAMFILES64\\\\${CPACK_PACKAGE_INSTALL_DIRECTORY}\\\"")
-ENDIF(WIN64)
-
-SET(CPACK_SOURCE_GENERATOR "TBZ2")
-SET(CPACK_SOURCE_PACKAGE_FILE_NAME "lmms-${VERSION}")
-INCLUDE(CPack)
-

INSTALL.txt

@@ -31,3 +31,18 @@ If you want to supply an install prefix to cmake, add the flag:
 
 Where <prefix> can be /usr, /usr/local, /opt, etc. The default is /usr/local.
 
+
+
+Building with QT5
+
+First of all please note that CMake >= 2.8.11 is required for building with
+Qt5 support. In order to build LMMS with Qt5, add the following flag when
+invoking cmake:
+
+-DWANT_QT5=ON
+
+If your Qt5 installation does not reside in standard installation paths,
+additionally pass e.g.
+
+-DCMAKE_PREFIX_PATH=/opt/qt53/
+

README

@@ -1,104 +0,0 @@
-LMMS 1.0.93
-===========
-
-Copyright (c) 2004-2014 by LMMS developers
-
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2 of the License, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-details.
-
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-
-
-What is LMMS?
---------------
-
-LMMS is a free cross-platform alternative to commercial programs like FL Studio (R), which allow you to produce music with your computer. This includes the creation of melodies and beats, the synthesis and mixing of sounds, and arranging of samples. You can have fun with your MIDI-keyboard and much more; all in a user-friendly and modern interface.
-
-
-Features
----------
-
-    * Song-Editor for composing songs
-    * A Beat+Bassline-Editor for creating beats and basslines
-    * An easy-to-use Piano-Roll for editing patterns and melodies
-    * An FX mixer with 64 FX channels and arbitrary number of effects allow unlimited mixing possibilities
-    * Many powerful instrument and effect-plugins out of the box
-    * Full user-defined track-based automation and computer-controlled automation sources
-    * Compatible with many standards such as SoundFont2, VST(i), LADSPA, GUS Patches, and full MIDI support
-    * Import of MIDI and FLP (Fruityloops(R) Project) files
-
-
-Requirements
-------------
-
-The most important requirement is for sure a fast computer, so don't try to get
-LMMS working on a pentium I with 60 MHz... ;-) Therefore you should have at
-least 500 MHz, but for really enjoying LMMS less than 1 GHz makes no sense...
-
-
-Required libraries:
-
-- Qt >= 4.3.0 with devel-files (4.4.x recommended)
-
-Optional, but strongly recommended:
-- JACK with devel-files
-- libvorbis & libogg with devel-files
-- libalsa with devel-files
-- SDL with devel-files
-- libsamplerate >= 0.1.7 with devel-files
-- libsndfile with devel-files
-- WINE + WINE-devel-files
-- stk, libstk + libstk-dev
-- libfluidsynth with devel files
-- fftw3 with devel-files
-- libfltk1.3 with devel-files (needed by ZynAddSubFx)
-
-For compiling you should have an up to date GCC with g++.
-
-If you have problems with compiling or running LMMS, find any bug or have
-suggestions and so on, please feel free to e-mail me (for mail-address see
-below)!
-
-
-
-Building
----------
-
-See INSTALL for information on how to build LMMS.
-
-
-
-
-Join LMMS-development
-----------------------
-
-If you are interested in LMMS, it's programming, artwork, testing, writing
-demo-songs, (and improving this README...) or something like that,
-you're welcome to participate on the development of LMMS!
-
-The project-homepage of LMMS, mailingslists and a list of things you can do
-can be found at
-
-http://lmms.io/
-
-
-Details on development can be found in the Wiki:
-
-https://github.com/LMMS/lmms/wiki
-
-Before coding a new big feature, please ALWAYS post your idea and suggestions
-about your feature and about the intended implementation to the
-LMMS-devel-mailinglist (lmms-devel@lists.sourceforge.net) and wait for replies!
-Maybe there're different ideas, improvements, hints or maybe your feature is
-not welcome/needed at the moment.

README.md

@@ -1,18 +1,26 @@
-![LMMS Logo](http://lmms.sourceforge.net/Lmms_logo.png) LMMS
-=======================
-[![Build Status](https://travis-ci.org/LMMS/lmms.png)](https://travis-ci.org/LMMS/lmms)
+# ![LMMS Logo](http://lmms.sourceforge.net/Lmms_logo.png) LMMS
+
+[![Build status](https://img.shields.io/travis/LMMS/lmms.svg?maxAge=3600)](https://travis-ci.org/LMMS/lmms)
+[![Latest stable release](https://img.shields.io/github/release/LMMS/lmms.svg?maxAge=3600)](https://lmms.io/download)
+[![Overall downloads on Github](https://img.shields.io/github/downloads/LMMS/lmms/total.svg?maxAge=3600)](https://github.com/LMMS/lmms/releases)
+[![Join the chat at Discord](https://img.shields.io/badge/chat-on%20discord-7289DA.svg)](https://discord.gg/3sc5su7)
+[![Localise on transifex](https://img.shields.io/badge/localise-on_transifex-green.svg)](https://www.transifex.com/lmms/lmms/)
 
 What is LMMS?
 --------------
 
-LMMS is a free cross-platform alternative to commercial programs like FL Studio®, which allow you to produce music with your computer. This includes the creation of melodies and beats, the synthesis and mixing of sounds, and arranging of samples. You can have fun with your MIDI-keyboard and much more; all in a user-friendly and modern interface.
+LMMS is a free cross-platform alternative to commercial programs like
+FL Studio®, which allow you to produce music with your computer. This includes
+the creation of melodies and beats, the synthesis and mixing of sounds, and
+arranging of samples. You can have fun with your MIDI-keyboard and much more;
+all in a user-friendly and modern interface.
 
-[Homepage](http://lmms.io)<br>
+[Homepage](https://lmms.io)<br>
 [Downloads/Releases](https://github.com/LMMS/lmms/releases)<br>
 [Developer Wiki](https://github.com/LMMS/lmms/wiki)<br>
-[Artist & User Wiki/Documentation](http://lmms.io/documentation)<br>
-[Sound Demos](http://lmms.io/showcase/)<br>
-[LMMS Sharing Platform](http://lmms.io/lsp/) Share your songs!
+[Artist & User Wiki/Documentation](https://lmms.io/documentation)<br>
+[Sound Demos](https://lmms.io/showcase/)<br>
+[LMMS Sharing Platform](https://lmms.io/lsp/) Share your songs!
 
 Features
 ---------
@@ -20,31 +28,32 @@ Features
 * Song-Editor for composing songs
 * A Beat+Bassline-Editor for creating beats and basslines
 * An easy-to-use Piano-Roll for editing patterns and melodies
-* An FX mixer with 64 FX channels and arbitrary number of effects allow unlimited mixing possibilities
+* An FX mixer with unlimited FX channels and arbitrary number of effects
 * Many powerful instrument and effect-plugins out of the box
 * Full user-defined track-based automation and computer-controlled automation sources
 * Compatible with many standards such as SoundFont2, VST(i), LADSPA, GUS Patches, and full MIDI support
-* Import of MIDI and FLP (FL Studio®/Fruityloops® Project) files
-
-[Latest Stable Release (1.0.3)](https://github.com/LMMS/lmms/releases/tag/v1.0.3)
----------------------
-* Fix zyn GUI crash on win32
-* Fix SF2 note volume
-* Localization updates
-* Updated LADSPA search paths
-* Bugfixes in plugins
+* MIDI file importing and exporting
 
 Building
 ---------
 
-See [Compiling LMMS](https://github.com/LMMS/lmms/wiki/Compiling-lmms) on our wiki for information on how to build LMMS.
+See [Compiling LMMS](https://github.com/LMMS/lmms/wiki/Compiling) on our
+wiki for information on how to build LMMS.
 
 
 Join LMMS-development
 ----------------------
 
-If you are interested in LMMS, it's programming, artwork, testing, writing demo-songs, (and improving this readme…) or something like that, you're welcome to participate on the development of LMMS!
+If you are interested in LMMS, its programming, artwork, testing, writing demo
+songs, (and improving this README...) or something like that, you're welcome
+to participate in the development of LMMS!
 
-Information about what you can do and how can be found in the [wiki](https://github.com/LMMS/lmms/wiki).
+Information about what you can do and how can be found in the
+[wiki](https://github.com/LMMS/lmms/wiki).
 
-Before coding a new big feature, please _always_ [file an issue](https://github.com/LMMS/lmms/issues/new) for your idea and suggestions about your feature and about the intended implementation on GitHub or post to the LMMS-devel-mailinglist (lmms-devel@lists.sourceforge.net) and wait for replies! Maybe there're different ideas, improvements, hints or maybe your feature is not welcome/needed at the moment.
+Before coding a new big feature, please _always_
+[file an issue](https://github.com/LMMS/lmms/issues/new) for your idea and
+suggestions about your feature and about the intended implementation on GitHub
+or post to the LMMS developers mailinglist (lmms-devel@lists.sourceforge.net)
+and wait for replies! Maybe there are different ideas, improvements, hints or
+maybe your feature is not welcome/needed at the moment.

TODO

@@ -1,32 +0,0 @@
-Version 0.4.x
-=============
-
-- save tco-settings in trackContentWidget::saveSettings() etc. instead of 
-  track::...
-- resample sample-track-tcos when exporting at different samplerate
-- message to user when importing unsupported MIDI-file (track-count = 0)
-- piano roll: mouse cursor isn't updated correctly in selection mode
-  (from resizing note edit area)
-- when you add vestige, have it automatically pop the find VST plugin dialog
-- try to make vestige-plugin-dlls relative
-- select all MIDI devices by default when you bring up the "connect to controller"
-  window and wait for first event - then uncheck all other MIDI devices that no
-  events were detected from
-- load asdlol.mmpz. if you render it without playing it, or if you play it
-  the first time, you hear unwanted artifacts. (solution: apply automation
-  before playing)
-- autosave every 30s (configurable!) and offer recovery at startup after crash
-- speed up painting of sampleTCO
-- do not process effects when playing frozen patterns
-- copy-pasted automation patterns have to be manually linked back to
-  their knob for some reason
-- improve TrackLabelButton: split 80%-20% (80%=name, 20%=button showing a popup
-  menu with track operations, make the midi input a top-level menu item)
-- when you click and drag a mixer bar, it doesn't click and drag, it sets
-  absolutely. this is annoying
-
-
-See TODO file in master branch and/or the TODO list in the Wiki for details
-regarding the development series.
-
-

build_mingw32

@@ -1,7 +0,0 @@
-MINGW=/opt/mingw32
-export PATH=$PATH:$MINGW/bin
-#export CFLAGS="-march=pentium3 -mtune=generic -mpreferred-stack-boundary=5 -fno-tree-vectorize"
-export CFLAGS="-march=pentium3 -mtune=generic -mpreferred-stack-boundary=5"
-export CXXFLAGS="$CFLAGS"
-cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/modules/Win32Toolchain.cmake -DCMAKE_MODULE_PATH=`pwd`/../cmake/modules/
-

build_mingw64

@@ -1,6 +0,0 @@
-MINGW=/opt/mingw64
-export PATH=$PATH:$MINGW/bin
-#export CFLAGS="-fno-tree-vectorize"
-export CXXFLAGS="$CFLAGS"
-cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/modules/Win64Toolchain.cmake -DCMAKE_MODULE_PATH=`pwd`/../cmake/modules/
-

buildtools/update_locales

@@ -0,0 +1,71 @@
+#!/bin/bash
+aberr(){ printf "[\e[31mERROR\e[0m]: \e[1m%s\e[0m\n" "$*" >&2; }
+abinfo(){ printf "[\e[96mINFO\e[0m]: \e[1m%s\e[0m\n" "$*" >&2; }
+
+function upload_to_tx() {
+  if ! which tx > /dev/null; then
+    aberr "You don't have Transifex client installed. \n Run \`pip install transifex-client\` to install it."
+    exit 1
+  fi
+  abinfo "Uploading to transifex..."
+  if ! tx push -s; then
+    aberr "Problems occurred when uploading strings to Transifex."
+    printf "\t Either there are syntax errors in source file or you don't have permission to update the source file."
+    exit 1
+  fi
+  exit 0
+}
+
+function validate() {
+  ERR_LANG=""
+  ERR_BUF=""
+  for i in data/locale/*.ts; do
+    if ! ERR_BUF=$(lconvert-qt5 -i "${i}" -o "/tmp/test.qm" -of qm 2>&1); then
+      ERR_LANG+="\e[96m$(basename "${i}")\e[0m: \e[93m${ERR_BUF}\e[0m "
+      printf "\e[31mx\e[0m"
+      continue
+    fi
+    printf "\e[32m.\e[0m"
+  done
+  echo ""
+  if [[ "x${ERR_LANG}" != "x" ]]; then
+    aberr "The following files failed the validation: "
+    echo -e "${ERR_LANG}"
+  fi
+}
+
+abinfo "Checking for your environment..."
+if ! which lupdate-qt5 > /dev/null; then
+  aberr "You don't seem to have Qt i18n tools installed."
+  printf "\tUsually this comes with your Qt installation, or you need to\n"
+  printf "\tinstall extra packages like \`qt5-tools\` or similar.\n"
+  exit 1;
+fi
+
+abinfo "Scanning directories..."
+
+if test -d src/3rdparty/qt5-x11embed/3rdparty/ECM/; then
+  # prevent from collecting strings in ECM
+  rm -rf src/3rdparty/qt5-x11embed/3rdparty/ECM/
+fi
+
+if ! lupdate-qt5 -I include/ src/ plugins/ -ts data/locale/en.ts; then
+  aberr "There are some problems when collecting the strings."
+  exit 1
+fi
+
+abinfo "Validating translations..."
+validate
+
+abinfo "Translations successfully updated."
+printf "Do you want to upload translations to Transifex? [y/N]: "
+read -n 1 -r TX
+echo ""
+
+if [[ "$TX" == "y" || "$TX" == "Y" ]]; then
+  upload_to_tx
+fi
+
+abinfo "No upload as required."
+
+exit 0

cmake/CMakeLists.txt

@@ -0,0 +1,30 @@
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY           "${PROJECT_DESCRIPTION}")
+SET(CPACK_PACKAGE_VENDOR                        "${PROJECT_AUTHOR}")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE              "${CMAKE_SOURCE_DIR}/README.md")
+SET(CPACK_RESOURCE_FILE_LICENSE                 "${CMAKE_SOURCE_DIR}/LICENSE.txt")
+SET(CPACK_PACKAGE_VERSION_MAJOR                 "${VERSION_MAJOR}")
+SET(CPACK_PACKAGE_VERSION_MINOR                 "${VERSION_MINOR}")
+SET(CPACK_PACKAGE_VERSION_PATCH                 "${VERSION_RELEASE}")
+IF(VERSION_STAGE)
+	SET(CPACK_PACKAGE_VERSION_PATCH         "${CPACK_PACKAGE_VERSION_PATCH}-${VERSION_STAGE}")
+ENDIF()
+IF(VERSION_BUILD)
+	SET(CPACK_PACKAGE_VERSION_PATCH         "${CPACK_PACKAGE_VERSION_PATCH}.${VERSION_BUILD}")
+ENDIF()
+SET(CPACK_PACKAGE_INSTALL_DIRECTORY             "${PROJECT_NAME_UCASE}")
+SET(CPACK_SOURCE_GENERATOR                      "TBZ2")
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME              "${CMAKE_PROJECT_NAME}-${VERSION}")
+IF(NOT DEFINED WIN32)
+	SET(CPACK_STRIP_FILES                   "bin/${CMAKE_PROJECT_NAME};${PLUGIN_DIR}/*.so")
+	SET(CPACK_PACKAGE_EXECUTABLES           "${CMAKE_PROJECT_NAME}" "${PROJECT_NAME_UCASE} binary")
+ENDIF()
+
+IF(LMMS_BUILD_WIN32)
+	ADD_SUBDIRECTORY(nsis)
+ELSEIF(LMMS_BUILD_APPLE)
+	ADD_SUBDIRECTORY(apple)
+ELSE()
+	ADD_SUBDIRECTORY(linux)
+ENDIF()
+
+INCLUDE(CPack)

cmake/apple/CMakeLists.txt

@@ -0,0 +1,30 @@
+SET(MACOSX_BUNDLE_ICON_FILE             "icon.icns")
+SET(MACOSX_BUNDLE_GUI_IDENTIFIER        "${PROJECT_NAME_UCASE}")
+SET(MACOSX_BUNDLE_LONG_VERSION_STRING   "${VERSION}")
+SET(MACOSX_BUNDLE_BUNDLE_NAME           "${PROJECT_NAME_UCASE}")
+SET(MACOSX_BUNDLE_SHORT_VERSION_STRING  "${VERSION}")
+SET(MACOSX_BUNDLE_BUNDLE_VERSION        "${VERSION}")
+SET(MACOSX_BUNDLE_COPYRIGHT             "${PROJECT_COPYRIGHT}")
+SET(MACOSX_BUNDLE_MIMETYPE              "application/x-lmms-project")
+SET(MACOSX_BUNDLE_MIMETYPE_ICON         "project.icns")
+SET(MACOSX_BUNDLE_MIMETYPE_ID           "io.lmms")
+SET(MACOSX_BUNDLE_PROJECT_URL           "${PROJECT_URL}")
+
+CONFIGURE_FILE("lmms.plist.in"          "${CMAKE_BINARY_DIR}/Info.plist")
+CONFIGURE_FILE("install_apple.sh.in"    "${CMAKE_BINARY_DIR}/install_apple.sh" @ONLY)
+CONFIGURE_FILE("package_apple.json.in"  "${CMAKE_BINARY_DIR}/package_apple.json" @ONLY)
+
+# DMG creation target
+SET(DMG_FILE "${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${VERSION}-mac${APPLE_OS_VER}.dmg")
+FILE(REMOVE "${DMG_FILE}")
+ADD_CUSTOM_TARGET(removedmg
+	COMMAND touch "\"${DMG_FILE}\"" && rm "\"${DMG_FILE}\""
+	COMMENT "Removing old DMG")
+ADD_CUSTOM_TARGET(dmg 
+	COMMAND appdmg "\"${CMAKE_BINARY_DIR}/package_apple.json\"" "\"${DMG_FILE}\""
+	DEPENDS "${CMAKE_BINARY_DIR}/package_apple.json"
+	COMMENT "Generating DMG")
+ADD_DEPENDENCIES(dmg removedmg)
+
+# see also ../postinstall/CMakeLists.txt
+

cmake/apple/install_apple.sh.in

@@ -0,0 +1,120 @@
+#!/bin/bash
+# Creates Apple ".app" bundle for @PROJECT_NAME_UCASE@
+# Note:
+#   Examine linkings using `otool -L somelib.so`
+#   Debug the loading of dynamic libraries using `export DYLD_PRINT_LIBRARIES=1`
+
+# STK rawwaves directory
+STK_RAWWAVE=$HOME/stk-*/rawwaves
+
+if [ ! -d "$STK_RAWWAVE" ]; then
+   STK_RAWWAVE=$(brew --prefix stk)/share/stk/rawwaves
+fi
+ 
+# Place to create ".app" bundle
+APP="@CMAKE_BINARY_DIR@/@PROJECT_NAME_UCASE@.app"
+
+MSG_COLOR='\x1B[1;36m'
+COLOR_RESET='\x1B[0m'
+echo -e "$MSG_COLOR\n\nCreating App Bundle \"$APP\"...$COLOR_RESET"
+
+# Locate macdeployqt, assume homebrew & Qt5
+which macdeployqt > /dev/null 2>&1
+if [ $? -ne 0 ]; then
+  export PATH=$PATH:$(brew --prefix qt)/bin
+fi
+ 
+# Remove any old .app bundles
+rm -Rf "$APP"
+
+# Copy/overwrite Info.plist
+\cp  "@CMAKE_BINARY_DIR@/Info.plist" "@CMAKE_INSTALL_PREFIX@/"
+ 
+# Create .app bundle containing contents from CMAKE_INSTALL_PREFIX
+mkdir -p "$APP/Contents/MacOS"
+mkdir -p "$APP/Contents/Frameworks"
+mkdir -p "$APP/Contents/Resources"
+mkdir -p "$APP/Contents/share/stk/rawwaves"
+cd "@CMAKE_INSTALL_PREFIX@"
+cp -R * "$APP/Contents"
+cp "@CMAKE_SOURCE_DIR@/cmake/apple/"*.icns "$APP/Contents/Resources/"
+cp $STK_RAWWAVE/*.raw "$APP/Contents/share/stk/rawwaves" > /dev/null 2>&1
+ 
+# Make all libraries writable for macdeployqt
+cd "$APP"
+find . -type f -print0 | xargs -0 chmod u+w
+
+lmmsbin="MacOS/@CMAKE_PROJECT_NAME@"
+zynlib="lib/lmms/libzynaddsubfx.so"
+zynfmk="Frameworks/libZynAddSubFxCore.dylib"
+zynbin="MacOS/RemoteZynAddSubFx"
+ 
+# Move lmms binary
+mv "$APP/Contents/bin/@CMAKE_PROJECT_NAME@" "$APP/Contents/$lmmsbin"
+ 
+# Fix zyn linking 
+mv "$APP/Contents/lib/lmms/RemoteZynAddSubFx" "$APP/Contents/$zynbin"
+mv "$APP/Contents/lib/lmms/libZynAddSubFxCore.dylib" "$APP/Contents/$zynfmk"
+
+install_name_tool -change @rpath/libZynAddSubFxCore.dylib \
+   @loader_path/../$zynfmk \
+  "$APP/Contents/$zynbin"
+
+install_name_tool -change @rpath/libZynAddSubFxCore.dylib \
+   @loader_path/../../$zynfmk \
+  "$APP/Contents/$zynlib"
+  
+# Replace @rpath with @loader_path for Carla
+# See also plugins/carlabase/CMakeLists.txt
+# This MUST be done BEFORE calling macdeployqt
+install_name_tool -change @rpath/libcarlabase.dylib \
+   @loader_path/libcarlabase.dylib \
+  "$APP/Contents/lib/lmms/libcarlapatchbay.so"
+
+install_name_tool -change @rpath/libcarlabase.dylib \
+  @loader_path/libcarlabase.dylib \
+  "$APP/Contents/lib/lmms/libcarlarack.so"
+
+# Link lmms binary
+_executables="${_executables} -executable=$APP/Contents/$zynbin"
+_executables="${_executables} -executable=$APP/Contents/$zynfmk"
+ 
+# Build a list of shared objects in target/lib/lmms
+for file in "$APP/Contents/lib/lmms/"*.so; do
+   _thisfile="$APP/Contents/lib/lmms/${file##*/}"
+   _executables="${_executables} -executable=$_thisfile"
+done
+ 
+# Build a list of shared objects in target/lib/lmms/ladspa
+for file in "$APP/Contents/lib/lmms/ladspa/"*.so; do
+   _thisfile="$APP/Contents/lib/lmms/ladspa/${file##*/}"
+   _executables="${_executables} -executable=$_thisfile"
+done
+
+# Finalize .app
+macdeployqt "$APP" $_executables
+
+# Carla is a standalone plugin.  Remove library, look for it side-by-side LMMS.app
+# This MUST be done AFTER calling macdeployqt
+#
+# For example:
+#    /Applications/LMMS.app
+#    /Applications/Carla.app
+carlalibs=$(echo "@CARLA_LIBRARIES@"|tr ";" "\n")
+
+# Loop over all libcarlas, fix linking
+for file in "$APP/Contents/lib/lmms/"libcarla*; do
+   _thisfile="$APP/Contents/lib/lmms/${file##*/}"
+   for lib in $carlalibs; do
+     _oldpath="../../Frameworks/lib${lib}.dylib"
+     _newpath="Carla.app/Contents/MacOS/lib${lib}.dylib"
+     install_name_tool -change @loader_path/$_oldpath \
+       @executable_path/../../../$_newpath \
+       "$_thisfile"
+     rm -f "$APP/Contents/Frameworks/lib${lib}.dylib"
+   done
+done
+
+# Cleanup
+rm -rf "$APP/Contents/bin"
+echo -e "\nFinished.\n\n"

cmake/apple/lmms.plist.in

@@ -143,5 +143,9 @@
                 </dict>
             </dict>
         </array>
+        <key>NSPrincipalClass</key>
+        <string>NSApplication</string>
+        <key>NSHighResolutionCapable</key>
+        <string>True</string>
   </dict>
 </plist>

cmake/apple/package_apple.json.in

@@ -0,0 +1,9 @@
+{
+ "title": "@MACOSX_BUNDLE_BUNDLE_NAME@ @MACOSX_BUNDLE_LONG_VERSION_STRING@",
+ "background": "@CMAKE_SOURCE_DIR@/cmake/apple/dmg_branding.png",
+ "icon-size": 72,
+ "contents": [
+   { "x": 460, "y": 260, "type": "link", "path": "/Applications" },
+   { "x": 220, "y": 260, "type": "file", "path": "@CMAKE_BINARY_DIR@/@MACOSX_BUNDLE_BUNDLE_NAME@.app" }
+ ]
+}

cmake/build_mingw32.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+# Accomodate both linux windows mingw locations
+MINGW=/mingw32
+if [ -z "$MSYSCON" ]; then
+	MINGW=/opt$MINGW
+else
+	CMAKE_OPTS="$CMAKE_OPTS -DLMMS_BUILD_MSYS=1"
+fi
+
+export PATH=$MINGW/bin:$PATH
+export CFLAGS="-march=pentium3 -mtune=generic -mpreferred-stack-boundary=5 -mfpmath=sse"
+export CXXFLAGS="$CFLAGS"
+
+if [ "$1" = "-qt5" ]; then
+	QT5=True
+fi
+
+if [ $QT5 ]; then
+	CMAKE_OPTS="-DWANT_QT5=$QT5 -DCMAKE_PREFIX_PATH=$MINGW $CMAKE_OPTS"
+fi
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cmake $DIR/.. -DCMAKE_TOOLCHAIN_FILE=$DIR/../cmake/modules/Win32Toolchain.cmake -DCMAKE_MODULE_PATH=$DIR/../cmake/modules/ $CMAKE_OPTS

cmake/build_mingw64.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# Accomodate both linux windows mingw locations
+MINGW=/mingw64
+if [ -z "$MSYSCON" ]; then
+	MINGW=/opt$MINGW
+else
+	CMAKE_OPTS="$CMAKE_OPTS -DLMMS_BUILD_MSYS=1"
+fi
+
+export PATH=$MINGW/bin:$PATH
+
+if [ "$1" = "-qt5" ]; then
+        QT5=True
+fi
+
+if [ $QT5 ]; then
+        CMAKE_OPTS="-DWANT_QT5=$QT5 -DCMAKE_PREFIX_PATH=$MINGW $CMAKE_OPTS"
+fi
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cmake $DIR/.. -DCMAKE_TOOLCHAIN_FILE=$DIR/../cmake/modules/Win64Toolchain.cmake -DCMAKE_MODULE_PATH=$DIR/../cmake/modules/ $CMAKE_OPTS

cmake/linux/CMakeLists.txt

@@ -0,0 +1,18 @@
+INSTALL(DIRECTORY icons/                DESTINATION "${DATA_DIR}/icons/hicolor")
+INSTALL(FILES lmms.desktop              DESTINATION "${DATA_DIR}/applications")
+INSTALL(FILES lmms.xml                  DESTINATION "${DATA_DIR}/mime/packages")
+
+# AppImage creation target
+SET(APPIMAGE_FILE "${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${VERSION}-linux-${CMAKE_SYSTEM_PROCESSOR}.AppImage")
+
+CONFIGURE_FILE("package_linux.sh.in"    "${CMAKE_BINARY_DIR}/package_linux.sh" @ONLY)
+
+FILE(REMOVE "${APPIMAGE_FILE}")
+ADD_CUSTOM_TARGET(removeappimage
+	COMMAND rm -f "${APPIMAGE_FILE}"
+	COMMENT "Removing old AppImage")
+ADD_CUSTOM_TARGET(appimage 
+	COMMAND chmod +x "${CMAKE_BINARY_DIR}/package_linux.sh"
+	COMMAND "${CMAKE_BINARY_DIR}/package_linux.sh"
+	COMMENT "Generating AppImage")
+ADD_DEPENDENCIES(appimage removeappimage)

cmake/linux/icons/scalable/apps/lmms.svg

@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   id="svg4034"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   inkscape:export-filename="64x64@2.png"
+   inkscape:export-xdpi="192"
+   inkscape:export-ydpi="192"
+   sodipodi:docname="lmms.svg">
+  <defs
+     id="defs4036">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter4173"
+       x="-0.011714286"
+       width="1.0234286"
+       y="-0.0123"
+       height="1.0246">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.205"
+         id="feGaussianBlur4175" />
+    </filter>
+    <linearGradient
+       gradientTransform="translate(0,32)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient4244-6"
+       id="linearGradient866"
+       x1="35"
+       y1="-14"
+       x2="35"
+       y2="27"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4244-6"
+       inkscape:collect="always">
+      <stop
+         id="stop4428"
+         offset="0"
+         style="stop-color:#27ab5f;stop-opacity:1" />
+      <stop
+         id="stop4430"
+         offset="1"
+         style="stop-color:#249a56;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4142135"
+     inkscape:cx="210.86487"
+     inkscape:cy="3.375495"
+     inkscape:current-layer="svg4034"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="253"
+     inkscape:window-y="1072"
+     inkscape:window-maximized="1"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:object-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4042" />
+    <sodipodi:guide
+       position="37,4"
+       orientation="0,1"
+       id="guide4951"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="38,60"
+       orientation="0,1"
+       id="guide4955"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="-19,32"
+       orientation="0,1"
+       id="guide4957"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4039">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <rect
+     rx="4"
+     y="4"
+     x="4"
+     height="56"
+     width="56"
+     id="rect5093"
+     style="display:inline;opacity:0.98999999;fill:#34d07b;fill-opacity:1;stroke:none;stroke-opacity:1" />
+  <rect
+     rx="3"
+     y="5"
+     x="5"
+     height="54"
+     width="54"
+     id="rect5095"
+     style="display:inline;opacity:1;fill:url(#linearGradient866);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     sodipodi:nodetypes="ccccccccccccccccc"
+     inkscape:connector-curvature="0"
+     id="path5085-3-6"
+     d="M 32,13 11,25 v 24 l 7,4 7,-4 v -8 l -7,-4 v -8 l 14,-8 14,8 v 8 l -7,4 v 8 l 7,4 7,-4 V 25 Z"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.15;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.97797471;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4173);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     sodipodi:nodetypes="ccccccccccccccccc"
+     inkscape:connector-curvature="0"
+     id="path5085-3"
+     d="M 32,11 11,23 v 24 l 7,4 7,-4 v -8 l -7,-4 v -8 l 14,-8 14,8 v 8 l -7,4 v 8 l 7,4 7,-4 V 23 Z"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.97797471;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5497);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+</svg>

cmake/linux/icons/scalable/mimetypes/application-x-lmms-project.svg

@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   id="svg4034"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   inkscape:export-filename="/home/umcaruje/d/Dropbox/lmms icons/project-256x256.png"
+   inkscape:export-xdpi="360"
+   inkscape:export-ydpi="360"
+   sodipodi:docname="application-x-lmms-project.svg"
+   enable-background="new">
+  <defs
+     id="defs4036">
+    <linearGradient
+       id="linearGradient4244-6"
+       inkscape:collect="always">
+      <stop
+         id="stop4428"
+         offset="0"
+         style="stop-color:#27ab5f;stop-opacity:1" />
+      <stop
+         id="stop4430"
+         offset="1"
+         style="stop-color:#249a56;stop-opacity:1" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter4400"
+       x="-0.024"
+       width="1.048"
+       y="-0.024"
+       height="1.048">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.14999999"
+         id="feGaussianBlur4402" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4244-6"
+       id="linearGradient4432"
+       gradientUnits="userSpaceOnUse"
+       x1="9.8838835"
+       y1="-9.8994951"
+       x2="10.275496"
+       y2="27.930717" />
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter4442"
+       x="-0.0116"
+       width="1.0232"
+       y="-0.012428571"
+       height="1.0248571">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.145"
+         id="feGaussianBlur4444" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="4.2102935"
+     inkscape:cy="18.651114"
+     inkscape:current-layer="g4263"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1366"
+     inkscape:window-height="740"
+     inkscape:window-x="339"
+     inkscape:window-y="1080"
+     inkscape:window-maximized="1"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:object-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4042" />
+    <sodipodi:guide
+       position="37,4"
+       orientation="0,1"
+       id="guide4951" />
+    <sodipodi:guide
+       position="38,60"
+       orientation="0,1"
+       id="guide4955" />
+    <sodipodi:guide
+       position="-19,32"
+       orientation="0,1"
+       id="guide4957" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4039">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="g4263"
+     inkscape:label="mimetype"
+     style="display:inline">
+    <g
+       id="g4189">
+      <path
+         sodipodi:nodetypes="ssssssccccs"
+         inkscape:connector-curvature="0"
+         id="path4273"
+         d="m 10,-30 c -1.108,0 -2,0.892 -2,2 l 0,56 c 0,1.108 0.892,2 2,2 l 44,0 c 1.108,0 2,-0.892 2,-2 l 0,-43 c 0,-1 -1,-2 -1,-2 L 43,-29 c 0,0 -1,-1 -2,-1 z"
+         style="display:inline;opacity:1;fill:#34d07b;fill-opacity:1;stroke:none;stroke-opacity:1"
+         transform="translate(0,32)" />
+      <path
+         sodipodi:nodetypes="sssssscccs"
+         inkscape:connector-curvature="0"
+         id="path4275"
+         d="m 10,-29 c -0.554,0 -1,0.446 -1,1 l 0,56 c 0,0.554 0.446,1 1,1 l 44,0 c 0.554,0 1,-0.446 1,-1 l 0,-43 -13,-1 -1,-13 z"
+         style="display:inline;opacity:1;fill:url(#linearGradient4432);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         transform="translate(0,32)" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path4339-5"
+         d="m 40,-29 0,11.999999 c 0,2 1,3 3,3 l 11.999999,0 0,-1 L 41,-29 Z"
+         style="display:inline;opacity:0.12999998;fill:#222222;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4400)"
+         transform="translate(0,32)" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path4339"
+         d="m 41,-29 0,12 c 0,1.03125 0.9375,2 2,2 l 12,0 0,-1 -13,-13 z"
+         style="display:inline;fill:#34d07b;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         transform="translate(0,32)" />
+      <path
+         sodipodi:nodetypes="ccccccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path4436"
+         d="m 32,22 -15,8 0,17.5 5,2.5 4.999999,-2.5 0,-6 L 22,39 l 0,-6 10,-5.5 10,5.5 0,6 -4.999999,2.5 0,6 L 42,50 47,47.5 47,30 Z"
+         style="display:inline;color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;overflow:visible;visibility:visible;opacity:0.15;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.97797471;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4442);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.97797471;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5497);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 32,20 -15,8 0,17.5 5,2.5 4.999999,-2.5 0,-6 L 22,37 l 0,-6 10,-5.5 10,5.5 0,6 -4.999999,2.5 0,6 L 42,48 47,45.5 47,28 Z"
+         id="path4265"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccccccccccc" />
+    </g>
+  </g>
+</svg>

cmake/linux/lmms

@@ -1,4 +1,4 @@
 ?package(lmms):needs="X11" section="Apps/Sound" \
   title="LMMS" hints="Audio" command="/usr/bin/lmms" \
   longtitle="LMMS" \
-  icon="/usr/share/pixmaps/lmms.png"
+  icon="/usr/share/icons/hicolor/scalable/apps/lmms.svg"

cmake/linux/lmms.desktop

@@ -1,12 +1,14 @@
 [Desktop Entry]
 Name=LMMS
-GenericName=music production suite
+GenericName=Music production suite
 GenericName[ca]=Programari de producció musical
 GenericName[de]=Software zur Musik-Produktion
-Comment=easy music production for everyone!
+GenericName[fr]=Ensemble pour la production musicale
+Comment=Music sequencer and synthesizer
 Comment[ca]=Producció fàcil de música per a tothom!
+Comment[fr]=Production facile de musique pour tout le monde !
 Icon=lmms
-Exec=env QT_X11_NO_NATIVE_MENUBAR=1 lmms
+Exec=lmms %f
 Terminal=false
 Type=Application
 Categories=Qt;AudioVideo;Audio;Midi;

cmake/linux/lmms.spec.in

@@ -1,6 +1,6 @@
 # Configuration variables
 %define name            lmms
-%define version         0.3.0
+%define version         ${LMMS_VERSION}
 %define rel             1
 %define release         %{rel}%{?disttag}%{?repotag}
 
@@ -26,7 +26,7 @@ Release:	%{release}
 Summary:	powerful sequencer-, synthesizer- and sample-studio for Linux
 Summary(de):	Leistungsfaehiges Sequenzer-, Synthesizer- und Sample-Studio fuer Linux
 License:	GPL
-URL:		http://lmms.io/
+URL:		https://lmms.io/
 Group:		Applications/Multimedia
 Provides:	lmms = %{version}-%{release}
 BuildRequires:	gcc gcc-c++ libstdc++-devel autoconf automake libtool make
@@ -194,23 +194,7 @@ desktop-file-install \
 %dir %{_datadir}/lmms
 %{_datadir}/lmms/*
 
-%changelog
-* Fri Apr 13 2007 Eric Lassauge <lassauge@users.fr.net> - 0.2.1-1
-- build for FC6
-- added dependencies and build configuration
-- added .desktop file
-
-* Tue Sep 20 2005 Tobias Doerffel
-- added JACK-dependencies
-
-* Fri Jul 22 2005 Tobias Doerffel
-- added more dependencies for builds under SuSE
-
-* Sat Jun 25 2005 Tobias Doerffel
-- splitted package into lmms and lmms-data
-- additional requirements
-- updated project-homepage and email-address of packager
-
-* Thu May 12 2005 Tobias Doerffel
-- created lmms.spec.in
-
+-%changelog
+-* Please see release notes (viewable online):
+-- https://github.com/LMMS/lmms/releases/tag/v${LMMS_VERSION}
+-

cmake/linux/lmms.xml

@@ -4,11 +4,7 @@
     <sub-class-of type="application/xml"/>
     <comment>LMMS project</comment>
     <comment xml:lang="ca">Projecte LMMS</comment>
-    <glob pattern="*.mmp"/>
     <glob pattern="*.mmpz"/>
-    <magic priority="80">
-      <match type="string" value="&lt;!DOCTYPE multimedia-project" offset="0:256"/>
-      <match type="string" value="&lt;multimedia-project" offset="0:64"/>
-    </magic>
+    <glob pattern="*.mmp"/>
   </mime-type>
 </mime-info>

cmake/linux/package_linux.sh.in

@@ -0,0 +1,200 @@
+#!/usr/bin/env bash
+# Creates Linux ".AppImage" for @PROJECT_NAME_UCASE@
+#
+# Depends:  linuxdeployqt
+#
+# Notes:    Will attempt to fetch linuxdeployqt automatically (x86_64 only)
+#           See Also: https://github.com/probonopd/linuxdeployqt/blob/master/BUILDING.md
+
+set -e
+
+LINUXDEPLOYQT="@CMAKE_BINARY_DIR@/linuxdeployqt"
+VERBOSITY=2 # 3=debug
+LOGFILE="@CMAKE_BINARY_DIR@/appimage.log"
+APPDIR="@CMAKE_BINARY_DIR@/@PROJECT_NAME_UCASE@.AppDir/"
+DESKTOPFILE="${APPDIR}usr/share/applications/lmms.desktop"
+STRIP=""
+
+# Don't strip for Debug|RelWithDebInfo builds
+if [[ "@CMAKE_BUILD_TYPE@" == *"Deb"* ]]; then
+	STRIP="-no-strip"
+fi
+
+# Console colors
+RED="\\x1B[1;31m"
+GREEN="\\x1B[1;32m"
+YELLOW="\\x1B[1;33m"
+PLAIN="\\x1B[0m"
+
+function error {
+	echo -e "   ${PLAIN}[${RED}error${PLAIN}] ${1}"
+	return 1
+}
+
+function success {
+	echo -e "   ${PLAIN}[${GREEN}success${PLAIN}] ${1}"
+}
+
+function skipped {
+	echo -e "   ${PLAIN}[${YELLOW}skipped${PLAIN}] ${1}"
+}
+
+# Blindly assume system arch is appimage arch
+ARCH=$(arch)
+export ARCH
+
+# Check for problematic install locations
+INSTALL=$(echo "@CMAKE_INSTALL_PREFIX@" | sed 's/\/*$//g')
+if [ "$INSTALL" == "/usr/local" ] || [ "$INSTALL" == "/usr" ] ; then
+	error "Incompatible CMAKE_INSTALL_PREFIX for creating AppImage: @CMAKE_INSTALL_PREFIX@"
+fi
+
+echo -e "\nWriting verbose output to \"${LOGFILE}\""
+
+# Ensure linuxdeployqt uses the same qmake version as cmake
+export PATH="$(pwd -P)/squashfs-root/usr/bin:$(dirname "@QT_QMAKE_EXECUTABLE@")":$PATH
+
+# Fetch portable linuxdeployqt if cache is older than $DAYSOLD
+APPIMAGETOOL="squashfs-root/usr/bin/appimagetool"
+echo -e "\nDownloading linuxdeployqt to ${LINUXDEPLOYQT}..."
+mkdir -p "$HOME/bin"
+DAYSOLD=2
+if env -i which linuxdeployqt > /dev/null 2>&1; then
+	skipped "System already provides this utility"
+elif ! find "$LINUXDEPLOYQT" -mtime -$DAYSOLD 2>/dev/null|grep -q "." > /dev/null 2>&1; then
+	url="https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-$(uname -p).AppImage"
+	echo "   [.......] Couldn't find linuxdeployqt newer than $DAYSOLD days old"
+	echo "   [.......] Downloading ($(uname -p)): ${url}"
+	wget "$url" -O "$LINUXDEPLOYQT" -q || (rm "$LINUXDEPLOYQT" && false)
+	chmod +x "$LINUXDEPLOYQT"
+	touch "$LINUXDEPLOYQT"
+	success "Downloaded $LINUXDEPLOYQT"
+	"$LINUXDEPLOYQT" --appimage-extract > /dev/null 2>&1
+	success "Extracted $APPIMAGETOOL"
+else
+	skipped "$LINUXDEPLOYQT is less than $DAYSOLD days old"
+fi
+
+# Make skeleton AppDir
+echo -e "\nCreating ${APPDIR}..."
+rm -rf "${APPDIR}"
+mkdir -p "${APPDIR}usr"
+success "Created ${APPDIR}"
+
+# Clone install to AppDir
+echo -e "\nCopying @CMAKE_INSTALL_PREFIX@ to ${APPDIR}..."
+cp -R "@CMAKE_INSTALL_PREFIX@/." "${APPDIR}usr"
+rm -rf "${APPDIR}usr/include"
+success "${APPDIR}"
+
+# Copy rawwaves directory for stk/mallets
+mkdir -p "${APPDIR}usr/share/stk/"
+cp -R /usr/share/stk/rawwaves/ "${APPDIR}usr/share/stk/"
+
+# Create a wrapper script which calls the lmms executable
+mv "${APPDIR}usr/bin/lmms" "${APPDIR}usr/bin/lmms.real"
+# shellcheck disable=SC1083
+cat >"${APPDIR}usr/bin/lmms" <<EOL
+#!/usr/bin/env bash
+DIR="\$( cd "\$( dirname "\${BASH_SOURCE[0]}" )" && pwd )"
+if which carla > /dev/null 2>&1; then
+   CARLAPATH="\$(which carla)"
+   CARLAPREFIX="\${CARLAPATH%/bin*}"
+   echo "Carla appears to be installed on this system at \$CARLAPREFIX/lib[64]/carla so we'll use it."
+   export LD_LIBRARY_PATH=\$CARLAPREFIX/lib/carla:\$CARLAPREFIX/lib64/carla:\$LD_LIBRARY_PATH
+else
+   echo "Carla does not appear to be installed.  That's OK, please ignore any related library errors."
+fi
+export LD_LIBRARY_PATH=\$DIR/usr/lib/:\$DIR/usr/lib/lmms:\$LD_LIBRARY_PATH
+# Prevent segfault on VirualBox
+if lsmod |grep vboxguest > /dev/null 2>&1; then
+   echo "VirtualBox detected.  Forcing libgl software rendering."
+   export LIBGL_ALWAYS_SOFTWARE=1;
+fi
+if ldconfig -p | grep libjack.so.0 > /dev/null 2>&1; then
+   echo "Jack appears to be installed on this system, so we'll use it."
+else
+   echo "Jack does not appear to be installed.  That's OK, we'll use a dummy version instead."
+   export LD_LIBRARY_PATH=\$DIR/usr/lib/lmms/optional:\$LD_LIBRARY_PATH
+fi
+QT_X11_NO_NATIVE_MENUBAR=1 \$DIR/usr/bin/lmms.real "\$@"
+EOL
+
+chmod +x "${APPDIR}usr/bin/lmms"
+
+# Per https://github.com/probonopd/linuxdeployqt/issues/129 
+unset LD_LIBRARY_PATH
+
+# Ensure linuxdeployqt can find shared objects
+export LD_LIBRARY_PATH="${APPDIR}usr/lib/lmms/":$LD_LIBRARY_PATH
+
+# Handle wine linking
+if [ -d "@WINE_LIBRARY_FIX@" ]; then
+   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@WINE_LIBRARY_FIX@:@WINE_LIBRARY_FIX@wine/
+fi
+
+# Move executables so linuxdeployqt can find them
+ZYNLIB="${APPDIR}usr/lib/lmms/RemoteZynAddSubFx"
+VSTLIB="${APPDIR}usr/lib/lmms/RemoteVstPlugin.exe.so"
+
+ZYNBIN="${APPDIR}usr/bin/RemoteZynAddSubFx"
+VSTBIN="${APPDIR}usr/bin/RemoteVstPlugin.exe.so"
+
+mv "$ZYNLIB" "$ZYNBIN"
+mv "$VSTLIB" "$VSTBIN"
+
+# Patch the desktop file
+sed -i 's/.*Exec=.*/Exec=lmms.real/' "$DESKTOPFILE"
+
+# Fix linking for soft-linked plugins
+for file in "${APPDIR}usr/lib/lmms/"*.so; do
+   thisfile="${APPDIR}usr/lib/lmms/${file##*/}"
+   executables="${executables} -executable=$thisfile"
+done
+executables="${executables} -executable=${ZYNBIN}"
+executables="${executables} -executable=${VSTBIN}"
+executables="${executables} -executable=${APPDIR}usr/lib/lmms/ladspa/imp_1199.so"
+executables="${executables} -executable=${APPDIR}usr/lib/lmms/ladspa/imbeq_1197.so"
+executables="${executables} -executable=${APPDIR}usr/lib/lmms/ladspa/pitch_scale_1193.so"
+executables="${executables} -executable=${APPDIR}usr/lib/lmms/ladspa/pitch_scale_1194.so"
+
+# Bundle both qt and non-qt dependencies into appimage format
+echo -e "\nBundling and relinking system dependencies..."
+echo -e ">>>>> linuxdeployqt" > "$LOGFILE"
+# shellcheck disable=SC2086
+"$LINUXDEPLOYQT" "$DESKTOPFILE" $executables -bundle-non-qt-libs -verbose=$VERBOSITY $STRIP >> "$LOGFILE" 2>&1
+success "Bundled and relinked dependencies"
+
+# Link to original location so lmms can find them
+ln -sr  "$ZYNBIN" "$ZYNLIB"
+ln -sr  "$VSTBIN" "$VSTLIB"
+
+# Remove wine library conflict
+rm -f "${APPDIR}/usr/lib/libwine.so.1"
+
+# Use system-provided carla
+rm -f "${APPDIR}usr/lib/"libcarla*.so
+
+# Remove bundled jack in LD_LIBRARY_PATH if exists
+if [ -e "${APPDIR}/usr/lib/libjack.so.0" ]; then
+   rm "${APPDIR}/usr/lib/libjack.so.0"
+fi
+
+# Bundle jack out of LD_LIBRARY_PATH
+JACK_LIB=$(ldd "${APPDIR}/usr/bin/lmms" | sed -n 's/\tlibjack\.so\.0 => \(.\+\) (0x[0-9a-f]\+)/\1/p')
+if [ -e "$JACK_LIB" ]; then
+   mkdir -p "${APPDIR}usr/lib/lmms/optional/"
+   cp "$JACK_LIB" "${APPDIR}usr/lib/lmms/optional/"
+fi
+
+# Point the AppRun to the shim launcher
+rm -f "${APPDIR}/AppRun"
+ln -sr "${APPDIR}/usr/bin/lmms" "${APPDIR}/AppRun"
+
+# Create AppImage
+echo -e "\nFinishing the AppImage..."
+echo -e "\n\n>>>>> appimagetool" >> "$LOGFILE"
+"$APPIMAGETOOL" "${APPDIR}" "@APPIMAGE_FILE@" >> "$LOGFILE" 2>&1
+success "Created @APPIMAGE_FILE@"
+
+echo -e "\nFinished"

cmake/modules/BashCompletion.cmake

@@ -0,0 +1,93 @@
+# A wrapper around pkg-config-provided and cmake-provided bash completion that
+# will have dynamic behavior at INSTALL() time to allow both root-level
+# INSTALL() as well as user-level INSTALL().
+#
+# See also https://github.com/scop/bash-completion
+#
+# Copyright (c) 2018, Tres Finocchiaro, <tres.finocchiaro@gmail.com>
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+# Usage:
+#    INCLUDE(BashCompletion)
+#    BASHCOMP_INSTALL(foo)
+#    ... where "foo" is a shell script adjacent to the CMakeLists.txt
+#
+# How it determines BASHCOMP_PKG_PATH, in order:
+#    1. Uses BASHCOMP_PKG_PATH if already set (e.g. -DBASHCOMP_PKG_PATH=...)
+#       a. If not, uses pkg-config's PKG_CHECK_MODULES to determine path
+#       b. Fallback to cmake's FIND_PACKAGE(bash-completion) path
+#       c. Fallback to hard-coded /usr/share/bash-completion/completions
+#    2. Final fallback to ${CMAKE_INSTALL_PREFIX}/share/bash-completion/completions if
+#       detected path is unwritable.
+
+# - Windows does not support bash completion
+# - macOS support should eventually be added for Homebrew (TODO)
+IF(WIN32)
+	MESSAGE(STATUS "Bash competion is not supported on this platform.")
+ELSEIF(APPLE)
+	MESSAGE(STATUS "Bash completion is not yet implemented for this platform.")
+ELSE()
+	INCLUDE(FindUnixCommands)
+	# Honor manual override if provided
+	IF(NOT BASHCOMP_PKG_PATH)
+		# First, use pkg-config, which is the most reliable
+		FIND_PACKAGE(PkgConfig QUIET)
+		IF(PKGCONFIG_FOUND)
+			PKG_CHECK_MODULES(BASH_COMPLETION bash-completion)
+			PKG_GET_VARIABLE(BASHCOMP_PKG_PATH bash-completion completionsdir)
+		ELSE()
+			# Second, use cmake (preferred but less common)
+			FIND_PACKAGE(bash-completion QUIET)
+			IF(BASH_COMPLETION_FOUND)
+				SET(BASHCOMP_PKG_PATH "${BASH_COMPLETION_COMPLETIONSDIR}")
+			ENDIF()
+		ENDIF()
+
+		# Third, use a hard-coded fallback value
+		IF("${BASHCOMP_PKG_PATH}" STREQUAL "")
+			SET(BASHCOMP_PKG_PATH "/usr/share/bash-completion/completions")
+		ENDIF()
+	ENDIF()
+
+	# Always provide a fallback for non-root INSTALL()
+	SET(BASHCOMP_USER_PATH "${CMAKE_INSTALL_PREFIX}/share/bash-completion/completions")
+
+	# Cmake doesn't allow easy use of conditional logic at INSTALL() time
+	# this is a problem because ${BASHCOMP_PKG_PATH} may not be writable and we
+	# need sane fallback behavior for bundled INSTALL() (e.g. .AppImage, etc).
+	#
+	# The reason this can't be detected by cmake is that it's fairly common to
+	# run "cmake" as a one user (i.e. non-root) and "make install" as another user
+	# (i.e. root).
+	#
+	# - Creates a script called "install_${SCRIPT_NAME}_completion.sh" into the
+	#   working binary directory and invokes this script at install.
+	# - Script handles INSTALL()-time conditional logic for sane ballback behavior
+	#   when ${BASHCOMP_PKG_PATH} is unwritable (i.e. non-root); Something cmake
+	#   can't handle on its own at INSTALL() time)
+	MACRO(BASHCOMP_INSTALL SCRIPT_NAME)
+		# A shell script for wrapping conditionl logic
+		SET(BASHCOMP_SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install_${SCRIPT_NAME}_completion.sh")
+
+		FILE(WRITE ${BASHCOMP_SCRIPT} "\
+#!${BASH}\n\
+set -e\n\
+if [ -w \"${BASHCOMP_PKG_PATH}\" ]; then\n\
+  BASHCOMP_PKG_PATH=\"${BASHCOMP_PKG_PATH}\"\n\
+else \n\
+  BASHCOMP_PKG_PATH=\"\$DESTDIR${BASHCOMP_USER_PATH}\"\n\
+fi\n\
+echo -e \"\\nInstalling bash completion...\\n\"\n\
+mkdir -p \"\$BASHCOMP_PKG_PATH\"\n\
+cp \"${CMAKE_CURRENT_SOURCE_DIR}/${SCRIPT_NAME}\" \"\$BASHCOMP_PKG_PATH\"\n\
+chmod a+r \"\$BASHCOMP_PKG_PATH/${SCRIPT_NAME}\"\n\
+echo -e \"Bash completion for ${SCRIPT_NAME} has been installed to \$BASHCOMP_PKG_PATH/${SCRIPT_NAME}\"\n\
+")
+		INSTALL(CODE "EXECUTE_PROCESS(COMMAND chmod u+x \"install_${SCRIPT_NAME}_completion.sh\" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )")
+		INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"./install_${SCRIPT_NAME}_completion.sh\" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )")
+
+		MESSAGE(STATUS "Bash completion script for ${SCRIPT_NAME} will be installed to ${BASHCOMP_PKG_PATH} or fallback to ${BASHCOMP_USER_PATH} if unwritable.")
+	ENDMACRO()
+ENDIF()
+

cmake/modules/BuildPlugin.cmake

@@ -1,96 +1,88 @@
 # BuildPlugin.cmake - Copyright (c) 2008 Tobias Doerffel
 #
 # description: build LMMS-plugin
-# usage: BUILD_PLUGIN(<PLUGIN_NAME> <PLUGIN_SOURCES> MOCFILES <HEADERS_FOR_MOC> EMBEDDED_RESOURCES <LIST_OF_FILES_TO_EMBED> UICFILES <UI_FILES_TO_COMPILE> )
+# usage: BUILD_PLUGIN(<PLUGIN_NAME> <PLUGIN_SOURCES> MOCFILES <HEADERS_FOR_MOC> EMBEDDED_RESOURCES <LIST_OF_FILES_TO_EMBED> UICFILES <UI_FILES_TO_COMPILE> LINK <SHARED|MODULE>)
 
-MACRO(CAR var)
-  SET(${var} ${ARGV1})
-ENDMACRO(CAR)
+MACRO(BUILD_PLUGIN PLUGIN_NAME)
+	CMAKE_PARSE_ARGUMENTS(PLUGIN "" "" "MOCFILES;EMBEDDED_RESOURCES;UICFILES;LINK" ${ARGN})
+	SET(PLUGIN_SOURCES ${PLUGIN_UNPARSED_ARGUMENTS})
 
-MACRO(CDR var junk)
-  SET(${var} ${ARGN})
-ENDMACRO(CDR)
-
-MACRO(LIST_CONTAINS var value)
-	SET(${var})
-		FOREACH (value2 ${ARGN})
-			IF (${value} STREQUAL ${value2})
-				SET(${var} TRUE)
-			ENDIF (${value} STREQUAL ${value2})
-	ENDFOREACH (value2)
-ENDMACRO(LIST_CONTAINS)
-
-MACRO(PARSE_ARGUMENTS prefix arg_names option_names)
-  SET(DEFAULT_ARGS)
-  FOREACH(arg_name ${arg_names})
-    SET(${prefix}_${arg_name})
-  ENDFOREACH(arg_name)
-  FOREACH(option ${option_names})
-    SET(${prefix}_${option} FALSE)
-  ENDFOREACH(option)
-
-  SET(current_arg_name DEFAULT_ARGS)
-  SET(current_arg_list)
-  FOREACH(arg ${ARGN})
-    LIST_CONTAINS(is_arg_name ${arg} ${arg_names})
-    IF (is_arg_name)
-      SET(${prefix}_${current_arg_name} ${current_arg_list})
-      SET(current_arg_name ${arg})
-      SET(current_arg_list)
-    ELSE (is_arg_name)
-      LIST_CONTAINS(is_option ${arg} ${option_names})
-      IF (is_option)
-	SET(${prefix}_${arg} TRUE)
-      ELSE (is_option)
-	SET(current_arg_list ${current_arg_list} ${arg})
-      ENDIF (is_option)
-    ENDIF (is_arg_name)
-  ENDFOREACH(arg)
-  SET(${prefix}_${current_arg_name} ${current_arg_list})
-ENDMACRO(PARSE_ARGUMENTS)
-
-MACRO(BUILD_PLUGIN)
-	PARSE_ARGUMENTS(PLUGIN "MOCFILES;EMBEDDED_RESOURCES;UICFILES" "" ${ARGN} )
-	CAR(PLUGIN_NAME ${PLUGIN_DEFAULT_ARGS})
-	CDR(PLUGIN_SOURCES ${PLUGIN_DEFAULT_ARGS})
-
-	INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/src/gui)
+	INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_SOURCE_DIR}/include" "${CMAKE_SOURCE_DIR}/src/gui")
 
 	ADD_DEFINITIONS(-DPLUGIN_NAME=${PLUGIN_NAME})
 
 	LIST(LENGTH PLUGIN_EMBEDDED_RESOURCES ER_LEN)
 	IF(ER_LEN)
-		SET(ER_H ${CMAKE_CURRENT_BINARY_DIR}/embedded_resources.h)
+		# Expand and sort arguments to avoid locale dependent sorting in
+		# shell
+		SET(NEW_ARGS)
+		FOREACH(ARG ${PLUGIN_EMBEDDED_RESOURCES})
+			FILE(GLOB EXPANDED "${ARG}")
+			LIST(SORT EXPANDED)
+			FOREACH(ITEM ${EXPANDED})
+				LIST(APPEND NEW_ARGS "${ITEM}")
+			ENDFOREACH()
+		ENDFOREACH()
+		SET(PLUGIN_EMBEDDED_RESOURCES ${NEW_ARGS})
+
+		SET(ER_H "${CMAKE_CURRENT_BINARY_DIR}/embedded_resources.h")
 		ADD_CUSTOM_COMMAND(OUTPUT ${ER_H}
 			COMMAND ${BIN2RES}
-			ARGS ${PLUGIN_EMBEDDED_RESOURCES} > ${ER_H}
-			DEPENDS ${BIN2RES})
+			ARGS ${PLUGIN_EMBEDDED_RESOURCES} > "${ER_H}"
+			DEPENDS bin2res)
 	ENDIF(ER_LEN)
 
-	QT4_WRAP_CPP(plugin_MOC_out ${PLUGIN_MOCFILES})
-	QT4_WRAP_UI(plugin_UIC_out ${PLUGIN_UICFILES})
+	IF(QT5)
+		QT5_WRAP_CPP(plugin_MOC_out ${PLUGIN_MOCFILES})
+		QT5_WRAP_UI(plugin_UIC_out ${PLUGIN_UICFILES})
+	ELSE()
+		QT4_WRAP_CPP(plugin_MOC_out ${PLUGIN_MOCFILES})
+		QT4_WRAP_UI(plugin_UIC_out ${PLUGIN_UICFILES})
+	ENDIF()
+
 	FOREACH(f ${PLUGIN_SOURCES})
-		ADD_FILE_DEPENDENCIES(${f} ${ER_H} ${plugin_MOC_out} ${plugin_UIC_out})
+		ADD_FILE_DEPENDENCIES(${f} ${ER_H} ${plugin_UIC_out})
 	ENDFOREACH(f)
 
 	IF(LMMS_BUILD_APPLE)
-	        LINK_DIRECTORIES(${CMAKE_BINARY_DIR})
-        	LINK_LIBRARIES(${QT_LIBRARIES})
+		LINK_DIRECTORIES("${CMAKE_BINARY_DIR}")
+		LINK_LIBRARIES(${QT_LIBRARIES})
 	ENDIF(LMMS_BUILD_APPLE)
 	IF(LMMS_BUILD_WIN32)
-	        LINK_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
-        	LINK_LIBRARIES(-llmms ${QT_LIBRARIES})
+		LINK_DIRECTORIES("${CMAKE_BINARY_DIR}" "${CMAKE_SOURCE_DIR}")
+		LINK_LIBRARIES(${QT_LIBRARIES})
+	ENDIF(LMMS_BUILD_WIN32)
+	IF(LMMS_BUILD_MSYS AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+		# Override Qt debug libraries with release versions
+		SET(QT_LIBRARIES "${QT_OVERRIDE_LIBRARIES}")
+	ENDIF()
+
+	IF ("${PLUGIN_LINK}" STREQUAL "SHARED")
+	  ADD_LIBRARY(${PLUGIN_NAME} SHARED ${PLUGIN_SOURCES} ${plugin_MOC_out})
+	ELSE ()
+	  ADD_LIBRARY(${PLUGIN_NAME} MODULE ${PLUGIN_SOURCES} ${plugin_MOC_out})
+	ENDIF ()
+	
+	IF(QT5)
+		TARGET_LINK_LIBRARIES(${PLUGIN_NAME} Qt5::Widgets Qt5::Xml)
+	ENDIF()
+	IF(LMMS_BUILD_WIN32)
+		TARGET_LINK_LIBRARIES(${PLUGIN_NAME} lmms)
 	ENDIF(LMMS_BUILD_WIN32)
 
-	ADD_LIBRARY(${PLUGIN_NAME} MODULE ${PLUGIN_SOURCES})
 	INSTALL(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION "${PLUGIN_DIR}")
 
 	IF(LMMS_BUILD_APPLE)
-		SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES LINK_FLAGS "-bundle_loader ${CMAKE_BINARY_DIR}/lmms")
+		IF ("${PLUGIN_LINK}" STREQUAL "SHARED")
+			SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+		ELSE()
+			SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES LINK_FLAGS "-bundle_loader \"${CMAKE_BINARY_DIR}/lmms\"")
+		ENDIF()
+		ADD_DEPENDENCIES(${PLUGIN_NAME} lmms)
 	ENDIF(LMMS_BUILD_APPLE)
 	IF(LMMS_BUILD_WIN32)
 		SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES PREFIX "")
-		ADD_CUSTOM_COMMAND(TARGET ${PLUGIN_NAME} POST_BUILD COMMAND ${STRIP} ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.dll)
+		ADD_CUSTOM_COMMAND(TARGET ${PLUGIN_NAME} POST_BUILD COMMAND ${STRIP} "$<TARGET_FILE:${PLUGIN_NAME}>")
 	ENDIF(LMMS_BUILD_WIN32)
 
 	SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${ER_H} ${plugin_MOC_out}")

cmake/modules/COPYING-CMAKE-SCRIPTS

@@ -0,0 +1,22 @@
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products 
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake/modules/DetectMachine.cmake

@@ -1,13 +1,17 @@
 IF(WIN32)
 	SET(LMMS_BUILD_WIN32 1)
-ELSE(WIN32)
-	IF(APPLE)
-		SET(LMMS_BUILD_APPLE 1)
-	ELSE(APPLE)
-		SET(LMMS_BUILD_LINUX 1)
-	ENDIF(APPLE)
+ELSEIF(APPLE)
+	SET(LMMS_BUILD_APPLE 1)
+ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+	SET(LMMS_BUILD_OPENBSD 1)
+ELSEIF(HAIKU)
+	SET(LMMS_BUILD_HAIKU 1)
+ELSE()
+	SET(LMMS_BUILD_LINUX 1)
 ENDIF(WIN32)
 
+# See build_mingwXX.sh for LMMS_BUILD_MSYS
+
 MESSAGE("PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}")
 SET(LMMS_HOST_X86 FALSE)
 SET(LMMS_HOST_X86_64 FALSE)
@@ -20,10 +24,10 @@ IF(WIN32)
 		SET(IS_X86 TRUE)
 	ENDIF(WIN64)
 ELSE(WIN32)
-	EXEC_PROGRAM( ${CMAKE_C_COMPILER} ARGS "-dumpmachine" OUTPUT_VARIABLE Machine )
+	EXEC_PROGRAM( ${CMAKE_C_COMPILER} ARGS "-dumpmachine ${CMAKE_C_FLAGS}" OUTPUT_VARIABLE Machine )
 	MESSAGE("Machine: ${Machine}")
 	STRING(REGEX MATCH "i.86" IS_X86 "${Machine}")
-	STRING(REGEX MATCH "86_64" IS_X86_64 "${Machine}")
+	STRING(REGEX MATCH "86_64|amd64" IS_X86_64 "${Machine}")
 ENDIF(WIN32)
 
 IF(IS_X86)
@@ -55,4 +59,23 @@ ELSE(LMMS_BUILD_WIN32)
 	SET(LMMS_DATA_DIR ${DATA_DIR}/lmms)
 ENDIF(LMMS_BUILD_WIN32)
 
+IF(LMMS_BUILD_APPLE)
+	# Detect Homebrew versus Macports environment
+	EXECUTE_PROCESS(COMMAND brew --prefix RESULT_VARIABLE DETECT_HOMEBREW OUTPUT_VARIABLE HOMEBREW_PREFIX ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+	EXECUTE_PROCESS(COMMAND which port RESULT_VARIABLE DETECT_MACPORTS OUTPUT_VARIABLE MACPORTS_PREFIX ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+	IF(${DETECT_HOMEBREW} EQUAL 0)
+       		SET(HOMEBREW 1)
+        	SET(APPLE_PREFIX "${HOMEBREW_PREFIX}")
+	ELSEIF(${DETECT_MACPORTS} EQUAL 0)
+        	SET(MACPORTS 1)
+        	GET_FILENAME_COMPONENT(MACPORTS_PREFIX ${MACPORTS_PREFIX} DIRECTORY)
+		GET_FILENAME_COMPONENT(MACPORTS_PREFIX ${MACPORTS_PREFIX} DIRECTORY)
+		SET(APPLE_PREFIX "${MACPORTS_PREFIX}")
+        	LINK_DIRECTORIES(${LINK_DIRECTORIES} ${APPLE_PREFIX}/lib)
+	ENDIF()
 
+	# Detect OS Version
+	EXECUTE_PROCESS(COMMAND sw_vers -productVersion OUTPUT_VARIABLE APPLE_OS_VER ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+	STRING(REGEX REPLACE "\\.[0-9]*$" "" APPLE_OS_VER "${APPLE_OS_VER}")
+	SET(CMAKE_MACOSX_RPATH 1)	
+ENDIF()

cmake/modules/FindLame.cmake

@@ -0,0 +1,16 @@
+# - Try to find LAME
+# Once done this will define
+#
+# LAME_FOUND - system has liblame
+# LAME_INCLUDE_DIRS - the liblame include directory
+# LAME_LIBRARIES - The liblame libraries
+
+find_path(LAME_INCLUDE_DIRS lame/lame.h)
+find_library(LAME_LIBRARIES mp3lame)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Lame DEFAULT_MSG LAME_INCLUDE_DIRS LAME_LIBRARIES)
+
+list(APPEND LAME_DEFINITIONS -DHAVE_LIBMP3LAME=1)
+
+mark_as_advanced(LAME_INCLUDE_DIRS LAME_LIBRARIES LAME_DEFINITIONS)

cmake/modules/FindSndio.cmake

@@ -0,0 +1,34 @@
+# sndio check, based on FindAlsa.cmake
+#
+
+# Copyright (c) 2006, David Faure, <faure@kde.org>
+# Copyright (c) 2007, Matthias Kretz <kretz@kde.org>
+# Copyright (c) 2009, Jacob Meuser <jakemsr@sdf.lonestar.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+include(CheckIncludeFiles)
+include(CheckIncludeFileCXX)
+include(CheckLibraryExists)
+
+# Already done by toplevel
+find_library(SNDIO_LIBRARY sndio)
+set(SNDIO_LIBRARY_DIR "")
+if(SNDIO_LIBRARY)
+   get_filename_component(SNDIO_LIBRARY_DIR ${SNDIO_LIBRARY} PATH)
+endif(SNDIO_LIBRARY)
+
+check_library_exists(sndio sio_open "${SNDIO_LIBRARY_DIR}" HAVE_SIO_OPEN)
+
+find_path(SNDIO_INCLUDE_DIR sndio.h)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SNDIO DEFAULT_MSG SNDIO_LIBRARY SNDIO_INCLUDE_DIR HAVE_SIO_OPEN)
+
+if(SNDIO_FOUND)
+    set(SNDIO_INCLUDE_DIRS "${SNDIO_INCLUDE_DIR}")
+    set(SNDIO_LIBRARIES "${SNDIO_LIBRARY}")
+endif(HAVE_SNDIO)
+
+mark_as_advanced(SNDIO_INCLUDE_DIR SNDIO_LIBRARY SNDIO_INCLUDE_DIRS SNDIO_LIBRARIES)

cmake/modules/FindSoundIo.cmake

@@ -0,0 +1,16 @@
+# Copyright (c) 2015 Andrew Kelley
+# This file is MIT licensed.
+# See http://opensource.org/licenses/MIT
+
+# SOUNDIO_FOUND
+# SOUNDIO_INCLUDE_DIR
+# SOUNDIO_LIBRARY
+
+find_path(SOUNDIO_INCLUDE_DIR NAMES soundio/soundio.h)
+
+find_library(SOUNDIO_LIBRARY NAMES soundio)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SOUNDIO DEFAULT_MSG SOUNDIO_LIBRARY SOUNDIO_INCLUDE_DIR)
+
+mark_as_advanced(SOUNDIO_INCLUDE_DIR SOUNDIO_LIBRARY)

cmake/modules/FindWine.cmake

@@ -7,13 +7,35 @@
 #  WINE_DEFINITIONS - Compiler switches required for using wine
 #
 
-FIND_PATH(WINE_INCLUDE_DIR windows/windows.h PATH_SUFFIXES wine)
-FIND_LIBRARY(WINE_LIBRARY NAMES wine PATH_SUFFIXES wine)
-FIND_PROGRAM(WINE_CXX NAMES wineg++)
+LIST(APPEND CMAKE_PREFIX_PATH /opt/wine-stable /opt/wine-devel /opt/wine-staging)
+
+FIND_PATH(WINE_INCLUDE_DIR windows/windows.h PATH_SUFFIXES wine wine/wine)
+FIND_LIBRARY(WINE_LIBRARY NAMES wine PATH_SUFFIXES wine i386-linux-gnu/wine)
+FIND_PROGRAM(WINE_CXX NAMES wineg++ winegcc winegcc64 winegcc32)
 
 set(WINE_INCLUDE_DIRS ${WINE_INCLUDE_DIR} )
 set(WINE_LIBRARIES ${WINE_LIBRARY} )
 
+# Handle wine linking problems
+EXEC_PROGRAM(${WINE_CXX} ARGS "-v -m32 /dev/zero" OUTPUT_VARIABLE WINEBUILD_OUTPUT)
+STRING(REPLACE " " ";" WINEBUILD_FLAGS "${WINEBUILD_OUTPUT}")
+
+FOREACH(FLAG ${WINEBUILD_FLAGS})
+	IF("${FLAG}" MATCHES "libwinecrt0.a.*")
+		# Debian systems
+		STRING(REPLACE "/lib/x86_64-" "/lib/i386-" FLAG "${FLAG}")
+		# Fedora systems
+		STRING(REPLACE "/lib/lib64" "/lib/i386" FLAG "${FLAG}")
+		# Gentoo systems
+		STRING(REPLACE "/lib/wine-" "/lib32/wine-" FLAG "${FLAG}")
+		# WineHQ (/opt/wine-stable, /opt/wine-devel, /opt/wine-staging)
+		STRING(REPLACE "/lib64/wine/" "/lib/wine/" FLAG "${FLAG}")
+
+		STRING(REGEX REPLACE "/wine/libwinecrt0.a.*" "" WINE_LIBRARY_FIX "${FLAG}")
+		SET(WINE_LIBRARY_FIX "${WINE_LIBRARY_FIX}/")
+	ENDIF()
+ENDFOREACH()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Wine DEFAULT_MSG WINE_LIBRARIES WINE_INCLUDE_DIRS)
 

cmake/modules/InstallHelpers.cmake

@@ -23,6 +23,7 @@ ENDMACRO(LIST_CONTAINS)
 MACRO(INSTALL_DATA_SUBDIRS _subdir _wildcards)
 	FOREACH(_wildcard ${_wildcards})
 		FILE(GLOB_RECURSE files ${_wildcard})
+		LIST(SORT files)
 		SET(SUBDIRS)
 
 		FOREACH(_item ${files})
@@ -36,6 +37,7 @@ MACRO(INSTALL_DATA_SUBDIRS _subdir _wildcards)
 
 		FOREACH(_item ${SUBDIRS})
 			FILE(GLOB files "${_item}/${_wildcard}")
+			LIST(SORT files)
 			FOREACH(_file ${files})
 				INSTALL(FILES "${_file}" DESTINATION "${LMMS_DATA_DIR}/${_subdir}/${_item}/")
 			ENDFOREACH(_file ${files})

cmake/modules/MinGWCrossCompile.cmake

@@ -1,41 +1,102 @@
-# this one is important
-SET(CMAKE_SYSTEM_NAME Windows)
-#this one not so much
-SET(CMAKE_SYSTEM_VERSION 1)
+# Required by cmake if `uname -s` is inadaquate
+SET(CMAKE_SYSTEM_NAME               Windows)
+SET(CMAKE_SYSTEM_VERSION            1)
 
-# where is the target environment 
-SET(CMAKE_FIND_ROOT_PATH	${MINGW_PREFIX})
-SET(CMAKE_INSTALL_PREFIX	${MINGW_PREFIX})
+# The target environment
+SET(CMAKE_FIND_ROOT_PATH            ${MINGW_PREFIX})
+SET(CMAKE_INSTALL_PREFIX            ${MINGW_PREFIX})
 
-SET(MINGW_TOOL_PREFIX		${MINGW_PREFIX}/bin/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-)
+# Windows msys mingw ships with a mostly-suitable preconfigured environment
+IF(LMMS_BUILD_MSYS)
+	SET(STRIP                       ${MINGW_PREFIX}/bin/strip)
+	SET(WINDRES                     ${MINGW_PREFIX}/bin/windres)
+	SET(CMAKE_RC_COMPILER           ${WINDRES})
+	SET(CMAKE_C_COMPILER            ${MINGW_PREFIX}/bin/gcc)
+	SET(CMAKE_CXX_COMPILER          ${MINGW_PREFIX}/bin/g++)
 
-# specify the cross compiler
-SET(CMAKE_C_COMPILER		${MINGW_TOOL_PREFIX}gcc)
-SET(CMAKE_CXX_COMPILER		${MINGW_TOOL_PREFIX}g++)
-SET(CMAKE_RC_COMPILER		${MINGW_TOOL_PREFIX}gcc)
+	# For 32-bit vst support
+	IF(WIN64)
+		# Specify the 32-bit cross compiler
+		SET(CMAKE_C_COMPILER32      ${MINGW_PREFIX32}/bin/gcc)
+		SET(CMAKE_CXX_COMPILER32    ${MINGW_PREFIX32}/bin/g++)
+	ENDIF()
+	
+	# Msys compiler does not support @CMakeFiles/Include syntax
+	SET(CMAKE_C_USE_RESPONSE_FILE_FOR_INCLUDES   OFF)
+	SET(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES OFF)
 
-IF(WIN64)
-# specify the cross compiler
-SET(MINGW_TOOL_PREFIX32		${MINGW_PREFIX32}/bin/${CMAKE_SYSTEM_PROCESSOR32}-w64-mingw32-)
-SET(CMAKE_C_COMPILER32		${MINGW_TOOL_PREFIX32}gcc)
-SET(CMAKE_CXX_COMPILER32	${MINGW_TOOL_PREFIX32}g++)
+	# Variable to assist override Qt debug libraries with release versions
+	SET(QT_OVERRIDE_LIBRARIES
+		optimized;${MINGW_PREFIX}/bin/QtGui4.dll;
+		optimized;${MINGW_PREFIX}/bin/QtCore4.dll;
+		optimized;${MINGW_PREFIX}/bin/QtXml4.dll;
+		debug;${MINGW_PREFIX}/bin/QtGui4.dll;
+		debug;${MINGW_PREFIX}/bin/QtCore4.dll;
+		debug;${MINGW_PREFIX}/bin/QtXml4.dll;
+	)
+	IF(LMMS_BUILD_MSYS AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+		# Override Qt debug libraries with release versions
+		SET(QT_LIBRARIES "${QT_OVERRIDE_LIBRARIES}")
+	ENDIF()
+# Linux mingw requires explicitly defined tools to prevent clash with native system tools
+ELSE()
+	SET(MINGW_TOOL_PREFIX           ${MINGW_PREFIX}/bin/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-)
+
+	# Specify the cross compiler
+	SET(CMAKE_C_COMPILER            ${MINGW_TOOL_PREFIX}gcc)
+	SET(CMAKE_CXX_COMPILER          ${MINGW_TOOL_PREFIX}g++)
+	SET(CMAKE_RC_COMPILER           ${MINGW_TOOL_PREFIX}gcc)
+
+	# Mingw tools
+	SET(STRIP                       ${MINGW_TOOL_PREFIX}strip)
+	SET(WINDRES                     ${MINGW_TOOL_PREFIX}windres)
+	SET(ENV{PKG_CONFIG}             ${MINGW_TOOL_PREFIX}pkg-config)
+	IF(CMAKE_VERSION LESS 3)
+		SET(PKG_CONFIG_EXECUTABLE       $ENV{PKG_CONFIG})
+		SET(PKG_CONFIG_FOUND            TRUE)
+	ENDIF()
+	
+	# Search for programs in the build host directories
+	SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+	# For libraries and headers in the target directories
+	SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+	SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+	# For 32-bit vst support	
+	IF(WIN64)
+		# Specify the 32-bit cross compiler
+		SET(MINGW_TOOL_PREFIX32     ${MINGW_PREFIX32}/bin/${CMAKE_SYSTEM_PROCESSOR32}-w64-mingw32-)
+		SET(CMAKE_C_COMPILER32      ${MINGW_TOOL_PREFIX32}gcc)
+		SET(CMAKE_CXX_COMPILER32    ${MINGW_TOOL_PREFIX32}g++)
+	ENDIF()
+	
+	INCLUDE_DIRECTORIES(${MINGW_PREFIX}/include)
 ENDIF()
 
-# specify location of some tools
-SET(STRIP					${MINGW_TOOL_PREFIX}strip)
-SET(WINDRES					${MINGW_TOOL_PREFIX}windres)
-SET(PKG_CONFIG_EXECUTABLE	${MINGW_TOOL_PREFIX}pkg-config)
-SET(PKG_CONFIG_FOUND		TRUE)
-
-SET(QT_BINARY_DIR			${MINGW_PREFIX}/bin)
-SET(QT_QMAKE_EXECUTABLE		${QT_BINARY_DIR}/qmake)
-
-# search for programs in the build host directories
-SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-# for libraries and headers in the target directories
-SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-INCLUDE_DIRECTORIES(${MINGW_PREFIX}/include)
 LINK_DIRECTORIES(${MINGW_PREFIX}/lib ${MINGW_PREFIX}/bin)
 
+# Qt tools
+SET(QT_BINARY_DIR				    ${MINGW_PREFIX}/bin)
+SET(QT_QMAKE_EXECUTABLE			    ${QT_BINARY_DIR}/qmake)
+
+# Echo modified cmake vars to screen for debugging purposes
+IF(NOT DEFINED ENV{MINGW_DEBUG_INFO})
+	MESSAGE("")
+	MESSAGE("Custom cmake vars: (blank = system default)")
+	MESSAGE("-----------------------------------------")
+	MESSAGE("* CMAKE_C_COMPILER                     : ${CMAKE_C_COMPILER}")
+	MESSAGE("* CMAKE_CXX_COMPILER                   : ${CMAKE_CXX_COMPILER}")
+	MESSAGE("* CMAKE_RC_COMPILER                    : ${CMAKE_RC_COMPILER}")
+	MESSAGE("* WINDRES                              : ${WINDRES}")
+	MESSAGE("* ENV{PKG_CONFIG}                      : $ENV{PKG_CONFIG}")
+	MESSAGE("* MINGW_TOOL_PREFIX32                  : ${MINGW_TOOL_PREFIX32}")
+	MESSAGE("* CMAKE_C_COMPILER32                   : ${CMAKE_C_COMPILER32}")
+	MESSAGE("* CMAKE_CXX_COMPILER32                 : ${CMAKE_CXX_COMPILER32}")
+	MESSAGE("* STRIP                                : ${STRIP}")
+	MESSAGE("* QT_BINARY_DIR                        : ${QT_BINARY_DIR}")
+	MESSAGE("* QT_QMAKE_EXECUTABLE                  : ${QT_QMAKE_EXECUTABLE}")
+	MESSAGE("")
+	# So that the debug info only appears once
+	SET(ENV{MINGW_DEBUG_INFO} SHOWN)
+ENDIF()
+

cmake/modules/VersionInfo.cmake

@@ -0,0 +1,77 @@
+FIND_PACKAGE(Git)
+IF(GIT_FOUND AND NOT FORCE_VERSION)
+	# Look for git tag information (e.g. Tagged: "v1.0.0", Non-tagged: "v1.0.0-123-a1b2c3d")
+	EXECUTE_PROCESS(
+		COMMAND "${GIT_EXECUTABLE}" describe --tags --match v[0-9].[0-9].[0-9]*
+		OUTPUT_VARIABLE GIT_TAG
+		WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+		TIMEOUT 10
+		OUTPUT_STRIP_TRAILING_WHITESPACE)
+	STRING(REPLACE "-" ";" TAG_LIST "${GIT_TAG}")
+	LIST(LENGTH TAG_LIST TAG_LIST_LENGTH)
+	IF(TAG_LIST_LENGTH GREATER 0)
+		LIST(GET TAG_LIST 0 FORCE_VERSION)
+		STRING(REPLACE "v" "" FORCE_VERSION "${FORCE_VERSION}")
+	ENDIF()
+	IF(TAG_LIST_LENGTH EQUAL 2)
+		LIST(GET TAG_LIST 1 VERSION_STAGE)
+		SET(FORCE_VERSION "${FORCE_VERSION}-${VERSION_STAGE}")
+	ELSEIF(TAG_LIST_LENGTH EQUAL 3)
+		LIST(GET TAG_LIST 1 EXTRA_COMMITS)
+		SET(FORCE_VERSION "${FORCE_VERSION}.${EXTRA_COMMITS}")
+	ELSEIF(TAG_LIST_LENGTH EQUAL 4)
+		LIST(GET TAG_LIST 1 VERSION_STAGE)
+		LIST(GET TAG_LIST 2 EXTRA_COMMITS)
+		SET(FORCE_VERSION
+			"${FORCE_VERSION}-${VERSION_STAGE}.${EXTRA_COMMITS}")
+	ENDIF()
+ENDIF()
+
+IF(FORCE_VERSION STREQUAL "internal")
+	# Use release info from /CMakeLists.txt
+ELSEIF(FORCE_VERSION)
+	STRING(REPLACE "." ";" VERSION_LIST "${FORCE_VERSION}")
+	LIST(LENGTH VERSION_LIST VERSION_LENGTH)
+	LIST(GET VERSION_LIST 0 VERSION_MAJOR)
+	LIST(GET VERSION_LIST 1 VERSION_MINOR)
+	LIST(GET VERSION_LIST 2 VERSION_RELEASE)
+	SET(VERSION_STAGE "")
+	SET(VERSION_BUILD 0)
+	IF(VERSION_LENGTH GREATER 3)
+		LIST(GET VERSION_LIST 3 VERSION_BUILD)
+	ENDIF()
+
+	STRING(REPLACE "-" ";" VERSION_LIST "${VERSION_RELEASE}")
+	LIST(LENGTH VERSION_LIST VERSION_LENGTH)
+	IF(VERSION_LENGTH GREATER 1)
+		LIST(GET VERSION_LIST 0 VERSION_RELEASE)
+		LIST(GET VERSION_LIST 1 VERSION_STAGE)
+	ENDIF()
+
+	SET(VERSION             "${FORCE_VERSION}")
+ELSEIF(GIT_FOUND)
+	MESSAGE(
+"Could not get project version.  Using release info from /CMakeLists.txt"
+	)
+ELSE()
+	MESSAGE("Git not found.  Using release info from /CMakeLists.txt")
+ENDIF()
+
+
+
+MESSAGE("\n"
+	"Configuring ${PROJECT_NAME_UCASE}\n"
+	"--------------------------\n"
+	"* Project version             : ${VERSION}\n"
+	"*   Major version             : ${VERSION_MAJOR}\n"
+	"*   Minor version             : ${VERSION_MINOR}\n"
+	"*   Release version           : ${VERSION_RELEASE}\n"
+	"*   Stage version             : ${VERSION_STAGE}\n"
+	"*   Build version             : ${VERSION_BUILD}\n"
+        "*\n\n"
+	"Optional Version Usage:\n"
+	"--------------------------\n"
+	"*   Override version:           -DFORCE_VERSION=x.x.x-x\n"
+	"*   Ignore Git information:     -DFORCE_VERSION=internal\n"
+)
+

cmake/modules/Win32Toolchain.cmake

@@ -1,6 +1,10 @@
-SET(MINGW_PREFIX /opt/mingw32)
+IF(LMMS_BUILD_MSYS)
+	SET(MINGW_PREFIX                /mingw32)
+ELSE()
+	SET(MINGW_PREFIX                /opt/mingw32)
+ENDIF()
 
-SET(CMAKE_SYSTEM_PROCESSOR i686)
+SET(CMAKE_SYSTEM_PROCESSOR          i686)
 
 INCLUDE(MinGWCrossCompile)
 

cmake/modules/Win64Toolchain.cmake

@@ -1,10 +1,15 @@
-SET(MINGW_PREFIX /opt/mingw64)
-SET(MINGW_PREFIX32 /opt/mingw32)
+IF(LMMS_BUILD_MSYS)
+	SET(MINGW_PREFIX                /mingw64)
+	SET(MINGW_PREFIX32              /mingw32)
+ELSE()
+	SET(MINGW_PREFIX                /opt/mingw64)
+	SET(MINGW_PREFIX32              /opt/mingw32)
+ENDIF()
 
-SET(CMAKE_SYSTEM_PROCESSOR x86_64)
-SET(CMAKE_SYSTEM_PROCESSOR32 i686)
+SET(CMAKE_SYSTEM_PROCESSOR          x86_64)
+SET(CMAKE_SYSTEM_PROCESSOR32        i686)
 
-SET(WIN64 TRUE)
+SET(WIN64                           TRUE)
 
 
 INCLUDE(MinGWCrossCompile)

cmake/msys/extract_debs.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+ppa_dir=./ppa/
+
+pushd $ppa_dir
+
+for f in *.deb; do
+	echo "Extracting $f..."
+	ar xv $f
+	rm debian-binary
+	rm control.tar.*
+	tar xf data.tar.*
+	rm data.tar.*
+done
+
+popd
+
+echo "Your extracted files should be located in $ppa_dir"

cmake/msys/fetch_ppa.sh

@@ -0,0 +1,58 @@
+#!/bin/bash
+
+# Trusty=14.04, Precise=12.04
+PPA_DISTRO=trusty
+
+# Architecture=i386, amd64
+PPA_ARCH=amd64
+
+# These shouldn't change
+PPA_HOST=http://ppa.launchpad.net
+PPA_USER=tobydox
+PPA_PROJECT=mingw-x-trusty 
+PPA_ROOT=$PPA_HOST/$PPA_USER/$PPA_PROJECT/ubuntu
+
+PPA_URL=$PPA_ROOT/dists/$PPA_DISTRO/main/binary-$PPA_ARCH/Packages
+
+ppa_dir=./ppa/
+
+temp_file=/tmp/ppa_listing_$$
+temp_temp_file=/tmp/ppa_listing_temp_$$
+
+skip_files="binutils openssl flac libgig libogg libvorbis x-bootstrap zlib"
+skip_files="$skip_files x-runtime gcc qt_4 qt5 x-stk pkgconfig" 
+skip_files="$skip_files glib2 libpng"
+
+echo "Connecting to $PPA_HOST to get list of packages..."
+wget -qO- $PPA_URL |grep "Filename:" > $temp_file
+
+for j in $skip_files ; do
+	grep -v $j $temp_file > $temp_temp_file
+	mv $temp_temp_file $temp_file
+done
+
+line_count=`wc -l $temp_file |awk '{print $1}'`
+
+echo "Found $line_count packages for download..."
+
+echo "Downloading packages.  They will be saved to $ppa_dir"
+
+mkdir $ppa_dir
+
+for j in `cat $temp_file` ; do
+	if [ "$j" = "Filename:" ] ; then 
+		continue 
+	fi
+	echo "Downloading $j..."
+	wget -O $ppa_dir$(basename $j) $PPA_ROOT/$j
+done
+
+
+echo "Cleaning up temporary files..."
+rm -rf $temp_file
+
+echo "Packages have been saved to $ppa_dir.  Please run extract_debs.sh"
+
+
+
+

cmake/msys/msys_helper.sh

@@ -0,0 +1,286 @@
+#!/bin/bash
+
+# Git repo information
+fork="lmms"	# i.e. "lmms" or "tobydox"
+branch="master"	# i.e. "master" or "stable-1.2"
+
+# Console colors
+red="\\x1B[1;31m"
+green="\\x1B[1;32m"
+yellow="\\x1B[1;33m"
+plain="\\x1B[0m"
+
+function info() { echo -e "\n${green}$1${plain}"; }
+function warn() { echo -e "\n${yellow}$1${plain}"; }
+function err() { echo -e "\n${red}$1${plain}"; exit 1;}
+
+info "Checking for mingw environment"
+env |grep MINGW
+if [ $? -ne 0 ]; then
+	err "  - Failed. Please relaunch using MinGW shell"
+fi
+
+info "Preparing the git directory..."
+mkdir $HOME/.git; touch $HOME/.git/config > /dev/null &2>1
+git config --global http.sslverify false
+
+info "Cloning the repository..."
+if [ -d ./lmms ]; then 
+	warn "  - Skipping, ./lmms already exists"
+else 
+	git clone -b $branch https://github.com/$fork/lmms.git
+fi
+
+
+info "Fetching ppa using cmake/msys/fetch_ppas.sh..."
+if [ -d $HOME/ppa ]; then
+        warn "  - Skipping, $HOME/ppa already exists"
+else
+	./lmms/cmake/msys/fetch_ppa.sh	
+fi
+
+
+info "Extracting debs to $HOME/ppa/opt/, etc..."
+if [ -d $HOME/ppa/opt ]; then
+        warn "  - Skipping, $HOME/ppa/opt already exists"
+else
+        ./lmms/cmake/msys/extract_debs.sh
+fi
+
+info "Preparing library merge, making all qt headers writable..."
+chmod u+w /mingw64/include/qt4 -R
+chmod u+w /mingw32/include/qt4 -R 
+
+info "Merging mingw headers and libraries from ppa over existing system libraries..."
+find /mingw64 |grep sndfile.h
+
+if [ $? -ne 0 ]; then 
+	\cp -r $HOME/ppa/opt/mingw* /
+else 
+	warn "  - Skipping, sndfile.h has already been merged" 
+fi
+
+fltkver="1.3.3"
+oggver="1.3.2"
+vorbisver="1.3.5"
+flacver="1.3.2"
+gigver="4.0.0"
+stkver="4.5.1"
+
+info "Downloading and building fltk $fltkver"
+
+mingw_root="/$(echo $MSYSTEM|tr '[:upper:]' '[:lower:]')"
+which fluid
+if [ $? -ne 0 ]; then 
+	wget http://fltk.org/pub/fltk/$fltkver/fltk-$fltkver-source.tar.gz -O $HOME/fltk-source.tar.gz
+	if [ $? -ne 0 ]; then
+		err "ERROR: Could not download fltk.  Exiting."	
+	fi
+	tar zxf $HOME/fltk-source.tar.gz -C $HOME/
+	pushd $HOME/fltk-$fltkver
+
+	info "  - Compiling fltk $fltkver..."
+	./configure --prefix=$mingw_root --enable-shared
+
+	make
+
+	info "  - Installing fltk..."
+	make install
+
+	if [ $? -ne 0 ]; then
+        	err "ERROR: Could not build/install fltk -- Zyn needs this.  Exiting."
+	fi
+	
+#	ln -s $mingw_root/usr/local/bin/fluid.exe $mingw_root/bin/fluid.exe 	
+	popd
+else
+	warn "  - Skipping, fluid binary already exists" 
+fi
+
+info "Downloading and building libogg $oggver"
+
+if [ ! -e $mingw_root/lib/libogg.dll.a ]; then 
+	wget http://downloads.xiph.org/releases/ogg/libogg-$oggver.tar.xz -O $HOME/libogg-source.tar.xz
+	if [ $? -ne 0 ]; then
+		err "ERROR: Could not download libogg.  Exiting."	
+	fi
+	tar xf $HOME/libogg-source.tar.xz -C $HOME/
+	pushd $HOME/libogg-$oggver
+
+	info "  - Compiling libogg $oggver..."
+	./configure --prefix=$mingw_root
+
+	make
+
+	info "  - Installing libogg..."
+	make install
+
+	# for some reason libgig needs this
+	./configure --prefix=/opt$mingw_root
+
+	make
+
+	info "  - Installing libogg..."
+	make install
+
+	if [ $? -ne 0 ]; then
+        	err "ERROR: Could not build/install fltk -- lmms needs this.  Exiting."
+	fi
+	
+	popd
+else
+	warn "  - Skipping, libogg binary already exists" 
+fi
+
+
+info "Downloading and building libvorbis $vorbisver"
+
+if [ ! -e $mingw_root/lib/libvorbis.dll.a ]; then 
+	wget http://downloads.xiph.org/releases/vorbis/libvorbis-$vorbisver.tar.xz -O $HOME/libvorbis-source.tar.xz
+	if [ $? -ne 0 ]; then
+		err "ERROR: Could not download libogg.  Exiting."	
+	fi
+	tar xf $HOME/libvorbis-source.tar.xz -C $HOME/
+	pushd $HOME/libvorbis-$vorbisver
+
+	info "  - Compiling libvorbis $vorbisver..."
+	./configure --prefix=$mingw_root
+
+	make
+
+	info "  - Installing libvorbis..."
+	make install
+
+	# for some reason libgig needs this
+	./configure --prefix=/opt$mingw_root
+
+	make
+
+	info "  - Installing libvorbis..."
+	make install
+
+	if [ $? -ne 0 ]; then
+        	err "ERROR: Could not build/install libvorbis -- lmms needs this.  Exiting."
+	fi
+	
+	popd
+else
+	warn "  - Skipping, libvorbis binary already exists" 
+fi
+
+info "Downloading and building flac $flacver"
+
+if [ ! -e $mingw_root/lib/libFLAC.dll.a ]; then 
+	wget http://downloads.xiph.org/releases/flac/flac-$flacver.tar.xz -O $HOME/flac-source.tar.xz
+	if [ $? -ne 0 ]; then
+		err "ERROR: Could not download flac.  Exiting."	
+	fi
+	tar xf $HOME/flac-source.tar.xz -C $HOME/
+	pushd $HOME/flac-$flacver
+
+	info "  - Compiling flac $flacver..."
+	./configure --prefix=$mingw_root
+
+	make
+
+	info "  - Installing flac..."
+	make install
+
+	# for some reason libgig needs this
+	./configure --prefix=/opt$mingw_root
+
+	make
+
+	info "  - Installing flac..."
+	make install
+
+	if [ $? -ne 0 ]; then
+        	err "ERROR: Could not build/install flac -- lmms needs this.  Exiting."
+	fi
+	
+	popd
+else
+	warn "  - Skipping, libvorbis flac already exists" 
+fi
+
+info "Downloading and building libgig $gigver"
+
+if [ ! -e $mingw_root/lib/libgig/libgig.dll.a ]; then 
+	wget http://download.linuxsampler.org/packages/libgig-$gigver.tar.bz2 -O $HOME/gig-source.tar.xz
+	if [ $? -ne 0 ]; then
+		err "ERROR: Could not download libgig.  Exiting."	
+	fi
+	tar xf $HOME/gig-source.tar.xz -C $HOME/
+	pushd $HOME/libgig-$gigver
+
+	info "  - Compiling libgig $gigver..."
+	./configure --prefix=$mingw_root
+
+	make
+
+	info "  - Installing libgig..."
+	make install
+
+	mv $mingw_root/lib/bin/libakai-0.dll $mingw_root/bin
+	mv $mingw_root/lib/bin/libgig-7.dll $mingw_root/bin
+
+	if [ $? -ne 0 ]; then
+        	err "ERROR: Could not build/install libgig -- gigplayer needs this.  Exiting."
+	fi
+	
+	popd
+else
+	warn "  - Skipping, libgig binary already exists" 
+fi
+
+info "Downloading and building stk $stkver"
+
+if [ ! -e $mingw_root/lib/libstk.dll ]; then 
+	wget http://ccrma.stanford.edu/software/stk/release/stk-$stkver.tar.gz -O $HOME/stk-source.tar.xz
+	if [ $? -ne 0 ]; then
+		err "ERROR: Could not download stk.  Exiting."
+	fi
+	tar xf $HOME/stk-source.tar.xz -C $HOME/
+	pushd $HOME/stk-$stkver
+
+	info "  - Compiling stk $stkver..."
+	./configure --prefix=$mingw_root
+
+	make
+
+	info "  - Installing stk..."
+	make install
+
+	if [ $? -ne 0 ]; then
+        	err "ERROR: Could not build/install stk -- mallotstk needs this.  Exiting."
+	fi
+
+	mv $mingw_root/lib/libstk.so $mingw_root/lib/libstk.dll
+	mv $mingw_root/lib/libstk-$stkver.so $mingw_root/lib/libstk-$stkver.dll
+
+	popd
+else
+	warn "  - Skipping, stk binary already exists" 
+fi
+
+# make a symlink to make cmake happy
+if [ $mingw_root = "/mingw64" ]; then
+	if [ ! -e /opt/mingw64/bin/x86_64-w64-mingw32-pkg-config ]; then 
+		ln -s /usr/bin/pkg-config /opt/mingw64/bin/x86_64-w64-mingw32-pkg-config
+	fi
+fi
+if [ $mingw_root = "/mingw32" ]; then
+
+	if [ ! -e /opt/mingw32/bin/i686-w64-mingw32-pkg-config ]; then 
+		ln -s /usr/bin/pkg-config /opt/mingw32/bin/i686-w64-mingw32-pkg-config
+	fi
+fi
+
+info "Cleaning up..."
+rm -rf $HOME/fltk-$fltkver
+rm -rf $HOME/libogg-$oggver
+rm -rf $HOME/libvorbis-$vorbisver
+rm -rf $HOME/flac-$flacver
+rm -rf $HOME/libgig-$gigver
+rm -rf $HOME/stk-$stkver
+info "Done."

cmake/nsis/CMakeLists.txt

@@ -0,0 +1,75 @@
+SET(CPACK_PACKAGE_ICON                  "${CMAKE_SOURCE_DIR}/cmake/nsis/nsis_branding.bmp")
+SET(CPACK_NSIS_MUI_ICON                 "${CMAKE_SOURCE_DIR}/cmake/nsis/icon.ico")
+SET(CPACK_NSIS_INSTALLED_ICON_NAME      "${CMAKE_PROJECT_NAME}.exe" PARENT_SCOPE)
+SET(CPACK_NSIS_DISPLAY_NAME             "${PROJECT_NAME_UCASE} ${VERSION}" PARENT_SCOPE)
+SET(CPACK_NSIS_HELP_LINK                "${PROJECT_URL}" PARENT_SCOPE)
+SET(CPACK_NSIS_URL_INFO_ABOUT           "${PROJECT_URL}" PARENT_SCOPE)
+SET(CPACK_NSIS_CONTACT                  "${PROJECT_EMAIL}" PARENT_SCOPE)
+SET(CPACK_PACKAGE_EXECUTABLES           "${CMAKE_PROJECT_NAME}.exe;${PROJECT_NAME_UCASE}" PARENT_SCOPE)
+SET(CPACK_NSIS_MENU_LINKS               "${CMAKE_PROJECT_NAME}.exe;${PROJECT_NAME_UCASE}" PARENT_SCOPE)
+SET(CPACK_NSIS_DEFINES                  "
+  !include ${CMAKE_SOURCE_DIR}/cmake/nsis/FileAssociation.nsh
+  !include LogicLib.nsh
+  !include WinVer.nsh")
+SET(CPACK_PACKAGE_FILE_NAME             "${CMAKE_PROJECT_NAME}-${VERSION}-win32")
+SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS   "
+  \\\${registerExtension} \\\"$INSTDIR\\\\${CMAKE_PROJECT_NAME}.exe\\\" \\\".mmp\\\" \\\"${PROJECT_NAME_UCASE} Project\\\"
+  \\\${registerExtension} \\\"$INSTDIR\\\\${CMAKE_PROJECT_NAME}.exe\\\" \\\".mmpz\\\" \\\"${PROJECT_NAME_UCASE} Project (compressed)\\\"
+  \\\${IfNot} \\\${AtMostWin7}
+    WriteRegDWORD HKLM \\\"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\SideBySide\\\" \\\"PreferExternalManifest\\\" \\\"1\\\"
+  \\\${EndIf}
+  " PARENT_SCOPE)
+SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
+  \\\${unregisterExtension} \\\".mmp\\\" \\\"${PROJECT_NAME_UCASE} Project\\\"
+  \\\${unregisterExtension} \\\".mmpz\\\" \\\"${PROJECT_NAME_UCASE} Project (compressed)\\\"
+  DeleteRegKey HKCR \\\"${PROJECT_NAME_UCASE} Project\\\"
+  DeleteRegKey HKCR \\\"${PROJECT_NAME_UCASE} Project (compressed)\\\"
+  " PARENT_SCOPE)
+
+IF(WIN64)
+	SET(CPACK_PACKAGE_FILE_NAME      "${CMAKE_PROJECT_NAME}-${VERSION}-win64")
+	SET(CPACK_INSTALL_FIX "$PROGRAMFILES64\\\\${CPACK_PACKAGE_INSTALL_DIRECTORY}\\\\")
+	SET(CPACK_NSIS_DEFINES "
+		${CPACK_NSIS_DEFINES} 
+		InstallDir ${CPACK_INSTALL_FIX}
+		")
+ENDIF()
+
+# Fix windows paths for msys
+IF(LMMS_BUILD_MSYS)
+	STRING(REGEX REPLACE "/" "\\\\\\\\" CPACK_PACKAGE_ICON "${CPACK_PACKAGE_ICON}")
+	STRING(REGEX REPLACE "/" "\\\\\\\\" CPACK_NSIS_MUI_ICON "${CPACK_NSIS_MUI_ICON}")
+	STRING(REGEX REPLACE "/" "\\\\\\\\" CPACK_NSIS_DEFINES "${CPACK_NSIS_DEFINES}")
+	STRING(REGEX REPLACE "/" "\\\\\\\\" CMAKE_BINARY_DIR_FIX "${CMAKE_BINARY_DIR}")
+	
+	# FIXME: there's no easy way to fix $INST_DIR, so we'll redefine it manually
+	IF(WIN64)
+		SET(NSIS_ARCH "win64")
+	ELSE()
+		SET(NSIS_ARCH "win32")
+	ENDIF()
+	SET(CPACK_NSIS_DEFINES "
+		${CPACK_NSIS_DEFINES} 
+		!define /redef INST_DIR ${CMAKE_BINARY_DIR_FIX}\\\\_CPack_Packages\\\\${NSIS_ARCH}\\\\NSIS\\\\${CPACK_PACKAGE_FILE_NAME}
+	")
+ENDIF()
+
+# Setup missing parent scopes
+SET(CPACK_PACKAGE_FILE_NAME             "${CPACK_PACKAGE_FILE_NAME}" PARENT_SCOPE)
+SET(CPACK_NSIS_DEFINES                  "${CPACK_NSIS_DEFINES}" PARENT_SCOPE)
+SET(CPACK_PACKAGE_ICON                  "${CPACK_PACKAGE_ICON}" PARENT_SCOPE)
+SET(CPACK_NSIS_MUI_ICON                 "${CPACK_NSIS_MUI_ICON}" PARENT_SCOPE)
+
+# Windows resource compilers
+CONFIGURE_FILE("lmms.rc.in"             "${CMAKE_BINARY_DIR}/lmms.rc")
+CONFIGURE_FILE("zynaddsubfx.rc.in"      "${CMAKE_BINARY_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc")
+
+IF(LMMS_HAVE_STK)
+	FILE(GLOB RAWWAVES "${MINGW_PREFIX}/share/stk/rawwaves/*.raw")
+	LIST(SORT RAWWAVES)
+	INSTALL(FILES ${RAWWAVES} DESTINATION "${DATA_DIR}/stk/rawwaves")
+ENDIF()
+
+INSTALL(FILES "lmms.exe.manifest" DESTINATION .)
+INSTALL(FILES "lmms.VisualElementsManifest.xml" DESTINATION .)
+INSTALL(DIRECTORY "assets" DESTINATION .)

cmake/nsis/FileAssociation.nsh

@@ -129,6 +129,7 @@ NoBackup:
     WriteRegStr HKCR "$R0" "" "$R0"
     WriteRegStr HKCR "$R0\shell" "" "open"
 Skip:
+  WriteRegStr HKCR "$R0\DefaultIcon" "" "$R2,1"
   WriteRegStr HKCR "$R0\shell\open\command" "" '"$R2" "%1"'
   WriteRegStr HKCR "$R0\shell\edit" "" "Edit $R0"
   WriteRegStr HKCR "$R0\shell\edit\command" "" '"$R2" "%1"'

cmake/nsis/lmms.VisualElementsManifest.xml

@@ -0,0 +1,9 @@
+<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+  <VisualElements
+      ShowNameOnSquare150x150Logo='on'
+      Square150x150Logo='assets\Logo.png'
+      Square70x70Logo='assets\SmallLogo.png'
+      Square44x44Logo='assets\SmallLogo.png'
+      ForegroundText='light'
+      BackgroundColor='#249A57'/>
+</Application>