versioninfo.h: fix recognizing archs and compiler (#6794)

Fixes: https://github.com/LMMS/lmms/issues/6785

.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"

.clang-format

@@ -1,84 +0,0 @@
----
-# Language
-Language:        Cpp
-Standard:        Cpp11  # Cpp14 and Cpp17 are not supported by clang 11
-
-# Indentation
-TabWidth:        4
-UseTab:          Always
-IndentWidth:     4
-ColumnLimit:     120
-
-# Indentation detail
-AlignAfterOpenBracket: DontAlign
-ContinuationIndentWidth: 4
-BreakConstructorInitializers: BeforeComma
-ConstructorInitializerIndentWidth: 4
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-BinPackParameters: true
-BinPackArguments: true
-AlignOperands: false
-
-# Alignment
-AlignEscapedNewlines: DontAlign
-AccessModifierOffset: -4
-AllowShortBlocksOnASingleLine: Always
-AllowShortIfStatementsOnASingleLine: Always
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: InlineOnly
-BreakBeforeBinaryOperators: All
-
-# Includes
-IncludeBlocks:   Regroup
-IncludeCategories:
-  # windows.h must go before everything else
-  # otherwise, you will get errors
-  - Regex:           '^<windows.h>$'
-    Priority:        -99
-  # the "main header" implicitly gets priority 0
-  # system headers
-  - Regex:           '^<[^>]+>$'
-    Priority:        1
-  # non-system headers
-  - Regex:           '.*'
-    Priority:        2
-SortIncludes:    true
-
-# Spaces
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeParens: ControlStatements
-SpacesInAngles:  false
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-
-# Brace wrapping
-# Not directly mentioned in the coding conventions,
-# but required to avoid tons of auto reformatting
-BreakBeforeBraces: Custom
-BraceWrapping:
-  AfterClass: true
-  AfterControlStatement: Always
-  AfterEnum: true
-  AfterFunction: true
-  AfterNamespace: false
-  AfterStruct: true
-  AfterUnion: true
-  AfterExternBlock: false
-  BeforeCatch: true
-  BeforeElse: true
-  IndentBraces: false
-  SplitEmptyFunction: true
-  SplitEmptyRecord: true
-  SplitEmptyNamespace: true
-  BeforeWhile: false
-  BeforeLambdaBody: false
-
-# Do not break doxygen comments
-CommentPragmas:  '^[[:space:]]*\\.+'
-
-# Pointers
-# Use pointer close to type: `const char* const* function()`
-PointerAlignment: Left
-
-...
-

.clang-tidy

@@ -1,51 +0,0 @@
----
-Checks: >
-  bugprone-macro-parentheses,
-  bugprone-macro-repeated-side-effects,
-  modernize-avoid-c-arrays,
-  modernize-loop-convert,
-  modernize-redundant-void-arg,
-  modernize-use-auto,
-  modernize-use-bool-literals,
-  modernize-use-emplace,
-  modernize-use-equals-default,
-  modernize-use-equals-delete,
-  modernize-use-override,
-  modernize-use-using,
-  performance-trivially-destructible,
-  readability-braces-around-statements,
-  readability-const-return-type,
-  readability-identifier-naming,
-  readability-misleading-indentation,
-  readability-simplify-boolean-expr
-WarningsAsErrors: ''
-HeaderFilterRegex: '' # don't show errors from headers
-AnalyzeTemporaryDtors: false
-FormatStyle:     none
-User:            user
-CheckOptions:    
-  - key:             readability-identifier-naming.ClassCase
-    value:           CamelCase
-  - key:             readability-identifier-naming.EnumCase
-    value:           CamelCase
-  - key:             readability-identifier-naming.TypedefCase
-    value:           CamelCase
-  - key:             readability-identifier-naming.UnionCase
-    value:           CamelCase
-  - key:             readability-identifier-naming.StructCase
-    value:           CamelCase
-  - key:             readability-identifier-naming.UnionCase
-    value:           CamelCase
-# not yet working, as it currently applies both for static and object members
-# - key:             readability-identifier-naming.MemberPrefix
-#   value:           'm_'
-  # currently only working for local static variables:
-  - key:             readability-identifier-naming.StaticVariablePrefix
-    value:           's_'
-# not yet working
-# - key:             readability-identifier-naming.VariableCase
-#   value:           camelBack
-  - key:             readability-identifier-naming.FunctionCase
-    value:           camelBack
-...
-

.editorconfig

@@ -1,5 +0,0 @@
-root = true
-
-[*]
-indent_style = tab
-tab_width = 4

.gitattributes

@@ -1,5 +1,3 @@
 .gitattributes export-ignore
 .gitignore export-ignore
 data/locale/* linguist-documentation
-* text=auto eol=lf
-*.{bin,bmp,flac,icns,ico,mmpz,ogg,png,xiz,xmz,wav} binary

.github/FUNDING.yml

@@ -1 +0,0 @@
-custom: https://lmms.io/get-involved/#donate

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,90 +0,0 @@
-# yamllint disable-file rule:line-length
-name: Bug Report
-description: File a bug report to help us improve
-labels:
-  - bug
-body:
-  - type: input
-    id: system-information
-    attributes:
-      label: System Information
-      description: |
-        - The operating system you use to run LMMS.
-        - When relevant, also include your hardware information.
-      placeholder: ex. Fedora Linux 39, KDE Plasma 5.27.10 - 13th Gen Intel® Core™ i9-13950HX, 32GB RAM
-    validations:
-      required: true
-  - type: input
-    id: affected-version
-    attributes:
-      label: LMMS Version(s)
-      description: |
-        - The version of LMMS affected by the bug.
-        - Can be an official version number, nightly release identifier, or commit hash.
-        - The version number can be found under the Help > About menu.
-      placeholder: ex. 1.2.2, 1.3.0-alpha.1.518+gdd53bec31, 2d185df
-    validations:
-      required: true
-  - type: input
-    id: working-version
-    attributes:
-      label: Most Recent Working Version
-      description: |
-        - If there is a previous version of LMMS that did not exhibit the bug, include it here.
-      placeholder: ex. 1.2.2, 1.3.0-alpha.1.518+gdd53bec31, 2d185df
-    validations:
-      required: false
-  - type: textarea
-    id: bug-summary
-    attributes:
-      label: Bug Summary
-      description: Briefly describe the bug.
-    validations:
-      required: true
-  - type: textarea
-    id: expected-behaviour
-    attributes:
-      label: Expected Behaviour
-      description: Describe what should have happened.
-    validations:
-      required: true
-  - type: textarea
-    id: steps-to-reproduce
-    attributes:
-      label: Steps To Reproduce
-      description: |
-        - Describe the minimum set of steps required to reproduce this bug.
-        - If you included a minimum reproducible project below, you can describe here how it should be used.
-    validations:
-      required: true
-  - type: textarea
-    id: logs
-    attributes:
-      label: Logs
-      description: |
-        - Copy and paste any relevant log output here.
-      value: |
-        <details>
-        <summary>Click to expand</summary>
-        <pre>
-          <!-- paste logs here -->
-        </pre>
-        </details>
-    validations:
-      required: false
-  - type: textarea
-    id: supporting-files
-    attributes:
-      label: Screenshots / Minimum Reproducible Project
-      description: |
-        - Upload any screenshots showing the bug in action.
-        - If possible, also include a .mmp/.mmpz project containing the simplest possible setup needed to reproduce the bug.
-
-        ***Note:** To upload a project file to GitHub, it will need to be placed in a .zip archive.*
-  - type: checkboxes
-    id: search-for-existing
-    attributes:
-      label: Please search the issue tracker for existing bug reports before submitting your own.
-      options:
-        - label: I have searched all existing issues and confirmed that this is not a duplicate.
-          required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +0,0 @@
-contact_links:
-- name: Get help on Discord
-  url: https://lmms.io/chat/
-  about: Need help? Have a question? Reach out to other LMMS users on our Discord server!

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,31 +0,0 @@
-# yamllint disable-file rule:line-length
-name: Feature Request
-description: Suggest an idea for the project
-labels:
-  - "enhancement"
-body:
-  - type: textarea
-    id: enhancement-summary
-    attributes:
-      label: Enhancement Summary
-      description: |
-        - Briefly describe the enhancement.
-        - Explain why you believe the proposed enhancement to be a good idea, and (if applicable) how it helps overcome a limitation of LMMS you are currently facing.
-    validations:
-      required: true
-  - type: textarea
-    id: mockup
-    attributes:
-      label: Implementation Details / Mockup
-      description: |
-        - Explain how you believe this enhancement should be implemented.
-        - If your proposal encompasses changes to the user interface, include diagrams displaying your intent.
-    validations:
-      required: true
-  - type: checkboxes
-    id: search-for-existing
-    attributes:
-      label: Please search the issue tracker for existing feature requests before submitting your own.
-      options:
-        - label: I have searched all existing issues and confirmed that this is not a duplicate.
-          required: true

.github/workflows/build.yml

@@ -1,306 +0,0 @@
----
-name: build
-'on': [push, pull_request]
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-jobs:
-  linux:
-    name: linux
-    runs-on: ubuntu-latest
-    container: lmmsci/linux.gcc:18.04
-    env:
-      CMAKE_OPTS: >-
-        -DUSE_WERROR=ON
-        -DCMAKE_BUILD_TYPE=RelWithDebInfo
-        -DUSE_COMPILE_CACHE=ON
-      CCACHE_MAXSIZE: 0
-      CCACHE_NOCOMPRESS: 1
-      MAKEFLAGS: -j2
-    steps:
-      - name: Update and configure Git
-        run: |
-          add-apt-repository ppa:git-core/ppa
-          apt-get update
-          apt-get --yes install git
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
-      - name: Check out
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          submodules: recursive
-      - name: Cache ccache data
-        uses: actions/cache@v3
-        with:
-          key: ccache-${{ github.job }}-${{ github.ref }}-${{ github.run_id }}
-          restore-keys: |
-            ccache-${{ github.job }}-${{ github.ref }}-
-            ccache-${{ github.job }}-
-          path: ~/.ccache
-      - name: Configure
-        run: |
-          ccache --zero-stats
-          source /opt/qt5*/bin/qt5*-env.sh || true
-          mkdir build && cd build
-          cmake .. $CMAKE_OPTS -DCMAKE_INSTALL_PREFIX=./install
-      - name: Build
-        run: cmake --build build
-      - name: Run tests
-        run: |
-          cd build/tests
-          ctest --output-on-failure -j2
-      - name: Package
-        run: |
-          cmake --build build --target install
-          cmake --build build --target appimage
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: linux
-          path: build/lmms-*.AppImage
-      - name: Trim ccache and print statistics
-        run: |
-          ccache --cleanup
-          echo "[ccache config]"
-          ccache --print-config
-          echo "[ccache stats]"
-          ccache --show-stats
-        env:
-          CCACHE_MAXSIZE: 500M
-  macos:
-    name: macos
-    runs-on: macos-12
-    env:
-      CMAKE_OPTS: >-
-        -DUSE_WERROR=ON
-        -DCMAKE_BUILD_TYPE=RelWithDebInfo
-        -DUSE_COMPILE_CACHE=ON
-      CCACHE_MAXSIZE: 0
-      CCACHE_NOCOMPRESS: 1
-      MAKEFLAGS: -j3
-      DEVELOPER_DIR: /Applications/Xcode_13.1.app/Contents/Developer
-    steps:
-      - name: Check out
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          submodules: recursive
-      - name: Clean up Homebrew download cache
-        run: rm -rf ~/Library/Caches/Homebrew/downloads
-      - name: Restore Homebrew download cache
-        uses: actions/cache/restore@v3
-        with:
-          key: n/a - only restore from restore-keys
-          restore-keys: |
-            homebrew-
-          path: ~/Library/Caches/Homebrew/downloads
-      - name: Cache ccache data
-        uses: actions/cache@v3
-        with:
-          key: ccache-${{ github.job }}-${{ github.ref }}-${{ github.run_id }}
-          restore-keys: |
-            ccache-${{ github.job }}-${{ github.ref }}-
-            ccache-${{ github.job }}-
-          path: ~/Library/Caches/ccache
-      - name: Install dependencies
-        run: |
-          brew bundle install --verbose
-          npm update -g npm
-          npm install --location=global appdmg
-        env:
-          HOMEBREW_NO_AUTO_UPDATE: 1
-          HOMEBREW_NO_INSTALL_UPGRADE: 1
-          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
-      - name: Configure
-        run: |
-          ccache --zero-stats
-          mkdir build
-          cmake -S . \
-                -B build \
-                -DCMAKE_INSTALL_PREFIX="../target" \
-                -DCMAKE_PREFIX_PATH="$(brew --prefix qt5)" \
-                $CMAKE_OPTS \
-                -DUSE_WERROR=OFF
-      - name: Build
-        run: cmake --build build
-      - name: Run tests
-        run: |
-          cd build/tests
-          ctest --output-on-failure -j3
-      - name: Package
-        run: |
-          cmake --build build --target install
-          cmake --build build --target dmg
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: macos
-          path: build/lmms-*.dmg
-      - name: Trim ccache and print statistics
-        run: |
-          ccache --cleanup
-          echo "[ccache config]"
-          ccache --show-config
-          echo "[ccache stats]"
-          ccache --show-stats --verbose
-        env:
-          CCACHE_MAXSIZE: 500MB
-      - name: Save Homebrew download cache
-        uses: actions/cache/save@v3
-        with:
-          key: homebrew-${{ hashFiles('Brewfile.lock.json') }}
-          path: ~/Library/Caches/Homebrew/downloads
-  mingw:
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: ['32', '64']
-    name: mingw${{ matrix.arch }}
-    runs-on: ubuntu-latest
-    container: lmmsci/linux.mingw${{ matrix.arch }}:18.04
-    env:
-      CMAKE_OPTS: >-
-        -DUSE_WERROR=ON
-        -DCMAKE_BUILD_TYPE=RelWithDebInfo
-        -DUSE_COMPILE_CACHE=ON
-      CCACHE_MAXSIZE: 0
-      CCACHE_NOCOMPRESS: 1
-      MAKEFLAGS: -j2
-    steps:
-      - name: Update and configure Git
-        run: |
-          add-apt-repository ppa:git-core/ppa
-          apt-get update
-          apt-get --yes install git
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
-      - name: Check out
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          submodules: recursive
-      - name: Cache ccache data
-        uses: actions/cache@v3
-        with:
-          key: "ccache-${{ github.job }}-${{ matrix.arch }}-${{ github.ref }}\
-            -${{ github.run_id }}"
-          restore-keys: |
-            ccache-${{ github.job }}-${{ matrix.arch }}-${{ github.ref }}-
-            ccache-${{ github.job }}-${{ matrix.arch }}-
-          path: ~/.ccache
-      - name: Configure
-        run: |
-          ccache --zero-stats
-          mkdir build && cd build
-          ../cmake/build_win${{ matrix.arch }}.sh
-      - name: Build
-        run: cmake --build build
-      - name: Package
-        run: cmake --build build --target package
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: mingw${{ matrix.arch }}
-          path: build/lmms-*.exe
-      - name: Trim ccache and print statistics
-        run: |
-          ccache --cleanup
-          echo "[ccache config]"
-          ccache --print-config
-          echo "[ccache stats]"
-          ccache --show-stats
-        env:
-          CCACHE_MAXSIZE: 500M
-  msvc:
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: ['x86', 'x64']
-    name: msvc-${{ matrix.arch }}
-    runs-on: windows-2019
-    env:
-      qt-version: '5.15.2'
-      CCACHE_MAXSIZE: 0
-      CCACHE_NOCOMPRESS: 1
-    steps:
-      - name: Check out
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          submodules: recursive
-      - name: Cache vcpkg dependencies
-        id: cache-deps
-        uses: actions/cache@v3
-        with:
-          key: vcpkg-${{ matrix.arch }}-${{ hashFiles('vcpkg.json') }}
-          restore-keys: |
-            vcpkg-${{ matrix.arch }}-
-          path: build\vcpkg_installed
-      - name: Cache ccache data
-        uses: actions/cache@v3
-        with:
-          key: "ccache-${{ github.job }}-${{ matrix.arch }}-${{ github.ref }}\
-            -${{ github.run_id }}"
-          restore-keys: |
-            ccache-${{ github.job }}-${{ matrix.arch }}-${{ github.ref }}-
-            ccache-${{ github.job }}-${{ matrix.arch }}-
-          path: ~\AppData\Local\ccache
-      - name: Install tools
-        run: choco install ccache
-      - name: Install 64-bit Qt
-        if: matrix.arch == 'x64'
-        uses: jurplel/install-qt-action@b3ea5275e37b734d027040e2c7fe7a10ea2ef946
-        with:
-          version: ${{ env.qt-version }}
-          arch: win64_msvc2019_64
-          archives: qtbase qtsvg qttools
-          cache: true
-      - name: Install 32-bit Qt
-        uses: jurplel/install-qt-action@b3ea5275e37b734d027040e2c7fe7a10ea2ef946
-        with:
-          version: ${{ env.qt-version }}
-          arch: win32_msvc2019
-          archives: qtbase qtsvg qttools
-          cache: true
-          set-env: ${{ matrix.arch == 'x86' }}
-      - name: Set up build environment
-        uses: ilammy/msvc-dev-cmd@cec98b9d092141f74527d0afa6feb2af698cfe89
-        with:
-          arch: ${{ matrix.arch }}
-      - name: Configure
-        run: |
-          ccache --zero-stats
-          mkdir build -Force
-          cmake -S . `
-            -B build `
-            -G Ninja `
-            --toolchain C:/vcpkg/scripts/buildsystems/vcpkg.cmake `
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo `
-            -DUSE_COMPILE_CACHE=ON `
-            -DVCPKG_TARGET_TRIPLET="${{ matrix.arch }}-windows" `
-            -DVCPKG_HOST_TRIPLET="${{ matrix.arch }}-windows" `
-            -DVCPKG_MANIFEST_INSTALL="${{ env.should_install_manifest }}"
-        env:
-          should_install_manifest:
-            ${{ steps.cache-deps.outputs.cache-hit == 'true' && 'NO' || 'YES' }}
-      - name: Build
-        run: cmake --build build
-      - name: Run tests
-        run: |
-          cd build/tests
-          ctest --output-on-failure -j2
-      - name: Package
-        run: cmake --build build --target package
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: msvc-${{ matrix.arch }}
-          path: build\lmms-*.exe
-      - name: Trim ccache and print statistics
-        run: |
-          ccache --cleanup
-          echo "[ccache config]"
-          ccache --show-config
-          echo "[ccache stats]"
-          ccache --show-stats --verbose
-        env:
-          CCACHE_MAXSIZE: 500MB

.github/workflows/checks.yml

@@ -1,33 +0,0 @@
----
-name: checks
-'on': [push, pull_request]
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-jobs:
-  scripted-checks:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install python-tinycss2
-        run: sudo apt-get install -y python3-tinycss2
-      - name: Update submodules
-        run: git submodule update --init --recursive
-      - name: Verify scripted tests
-        run: tests/scripted/verify
-      - name: Run check-strings
-        run: tests/scripted/check-strings
-      - name: Run check-namespace
-        run: tests/scripted/check-namespace
-  shellcheck:
-    runs-on: ubuntu-latest
-    container: koalaman/shellcheck-alpine:v0.9.0
-    steps:
-      - name: Check out
-        uses: actions/checkout@v3
-      - name: Run shellcheck
-        run: |
-          shellcheck \
-            $(find "./cmake/" -type f -name '*.sh' -o -name "*.sh.in") \
-            doc/bash-completion/lmms \
-            buildtools/update_locales

.gitignore

@@ -1,12 +1,11 @@
-/build/
-/target/
+/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
+/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
-Brewfile.lock.json

.gitmodules

@@ -1,51 +1,9 @@
 [submodule "src/3rdparty/qt5-x11embed"]
 	path = src/3rdparty/qt5-x11embed
 	url = https://github.com/Lukas-W/qt5-x11embed.git
-[submodule "plugins/ZynAddSubFx/zynaddsubfx"]
-	path = plugins/ZynAddSubFx/zynaddsubfx
-	url = https://github.com/lmms/zynaddsubfx.git
-[submodule "plugins/FreeBoy/game-music-emu"]
-	path = plugins/FreeBoy/game-music-emu
-	url = https://github.com/libgme/game-music-emu.git
-[submodule "plugins/OpulenZ/adplug"]
-	path = plugins/OpulenZ/adplug
-	url = https://github.com/adplug/adplug.git
-[submodule "plugins/LadspaEffect/calf/veal"]
-	path = plugins/LadspaEffect/calf/veal
-	url = https://github.com/lmms/veal
-[submodule "plugins/Xpressive/exprtk"]
-	path = plugins/Xpressive/exprtk
-	url = https://github.com/ArashPartow/exprtk
-[submodule "plugins/LadspaEffect/swh/ladspa"]
-	path = plugins/LadspaEffect/swh/ladspa
-	url = https://github.com/swh/ladspa
-[submodule "plugins/LadspaEffect/tap/tap-plugins"]
-	path = plugins/LadspaEffect/tap/tap-plugins
-	url = https://github.com/lmms/tap-plugins
-[submodule "src/3rdparty/weakjack/weakjack"]
-	path = src/3rdparty/weakjack/weakjack
-	url = https://github.com/x42/weakjack.git
-[submodule "src/3rdparty/mingw-std-threads"]
-	path = src/3rdparty/mingw-std-threads
-	url = https://github.com/meganz/mingw-std-threads.git
-[submodule "doc/wiki"]
-	path = doc/wiki
-	url = https://github.com/lmms/lmms.wiki.git
-[submodule "src/3rdparty/ringbuffer"]
-	path = src/3rdparty/ringbuffer
-	url = https://github.com/JohannesLorenz/ringbuffer.git
-[submodule "plugins/CarlaBase/carla"]
-	path = plugins/CarlaBase/carla
+[submodule "src/3rdparty/rpmalloc/rpmalloc"]
+	path = src/3rdparty/rpmalloc/rpmalloc
+	url = https://github.com/rampantpixels/rpmalloc.git
+[submodule "plugins/carlabase/carla"]
+	path = plugins/carlabase/carla
 	url = https://github.com/falktx/carla
-[submodule "plugins/Sid/resid/resid"]
-	path = plugins/Sid/resid/resid
-	url = https://github.com/libsidplayfp/resid
-[submodule "src/3rdparty/jack2"]
-	path = src/3rdparty/jack2
-	url = https://github.com/jackaudio/jack2
-[submodule "plugins/LadspaEffect/cmt/cmt"]
-	path = plugins/LadspaEffect/cmt/cmt
-	url = https://github.com/lmms/cmt
-[submodule "src/3rdparty/hiir/hiir"]
-	path = src/3rdparty/hiir/hiir
-	url = https://github.com/LostRobotMusic/hiir

.mailmap

@@ -1,4 +1,4 @@
-Alexandre Almeida <wilsalx@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>
@@ -30,4 +30,3 @@ 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>
 Olivier Humbert <trebmuh@tuxfamily.org> <trebmuh@users.noreply.github.com>
-Hussam al-Homsi <sawuare@gmail.com> Hussam Eddin Alhomsi <hussameddin.alhomsi@gmail.com>

.travis.yml

@@ -0,0 +1,54 @@
+language: cpp
+compiler: gcc
+dist: xenial
+sudo: required
+cache:
+    directories:
+        - $HOME/apt_mingw_cache
+        - $HOME/.ccache
+        - $HOME/pbuilder-bases
+matrix:
+    include:
+        - env: TARGET_OS=win32
+          dist: trusty
+        - env: TARGET_OS=win64
+          dist: trusty
+        - os: osx
+          osx_image: xcode8.2
+        - env: QT5=
+        - env: QT5=True
+        - env: QT5=True TARGET_OS=win32 TARGET_DEPLOY=True
+          dist: trusty
+        - env: QT5=True TARGET_OS=win64 TARGET_DEPLOY=True
+          dist: trusty
+        - os: osx
+          osx_image: xcode8.2
+          env: QT5=True
+        - env: TARGET_OS=debian-sid TARGET_DEPLOY=True
+          git:
+              depth: false
+        - env: TARGET_OS=debian-sid TARGET_ARCH=i386
+          git:
+              depth: false
+        - compiler: clang
+          env: TARGET_OS=debian-sid
+          git:
+              depth: false
+before_install:
+   - . ${TRAVIS_BUILD_DIR}/.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.before_install.sh
+install:
+    - . ${TRAVIS_BUILD_DIR}/.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.install.sh
+before_script:
+    - export CMAKE_FLAGS="-DWANT_QT5=$QT5 -DUSE_WERROR=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUNDLE_QT_TRANSLATIONS=ON"
+    - if [ -z "$TRAVIS_TAG" ]; then export CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_CCACHE=ON"; fi
+script:
+    - . ${TRAVIS_BUILD_DIR}/.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.script.sh
+after_script:
+    - ccache -s
+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,3 @@
+314ef4af137903dfb13e8c3ef1e6ea56cfdb23808d52ec4f5f50e288c73610c5  pbuilder_0.229.1_all.deb
+fa82aa8ed3055c6f6330104deedf080b26778295e589426d4c4dd0f2c2a5defa  debootstrap_1.0.95_all.deb
+2ef4c09f7841b72f93412803ddd142f72658536dbfabe00e449eb548f432f3f8  debian-archive-keyring_2017.7ubuntu1_all.deb

.travis/linux..before_install.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+sudo dpkg --add-architecture i386
+sudo apt-get update -qq || true

.travis/linux..install.sh

@@ -0,0 +1,19 @@
+#!/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 fluid
+	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 qttools5-dev-tools"
+else
+	PACKAGES="$PACKAGES libqt4-dev"
+fi
+
+sudo apt-get install -y $PACKAGES

.travis/linux..script.sh

@@ -0,0 +1,17 @@
+#!/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 -DCMAKE_INSTALL_PREFIX=../target/ -DUSE_WERROR=ON $CMAKE_FLAGS ..
+
+make -j4
+make tests
+./tests/tests
+
+make install
+make appimage

.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,17 @@
+#!/bin/sh
+set -e
+
+sudo apt-get install -y \
+	dpkg \
+	pbuilder
+
+# work around a pbuilder bug which breaks ccache
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666525
+# and also missing signing keys in Trusty's debian-archive-keyring
+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
+wget http://archive.ubuntu.com/ubuntu/pool/universe/d/debian-archive-keyring/debian-archive-keyring_2017.7ubuntu1_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 debian-archive-keyring_2017.7ubuntu1_all.deb
+cd "$OLDPWD"

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

@@ -0,0 +1,72 @@
+#!/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
+
+sync_version() {
+	local VERSION
+	local MMR
+	local STAGE
+	local EXTRA
+
+	VERSION=$(git describe --tags --match v[0-9].[0-9].[0-9]*)
+	VERSION=${VERSION#v}
+	MMR=${VERSION%%-*}
+	case $VERSION in
+	*-*-*-*)
+		VERSION=${VERSION%-*}
+		STAGE=${VERSION#*-}
+		STAGE=${STAGE%-*}
+		EXTRA=${VERSION##*-}
+		VERSION=$MMR~$STAGE.$EXTRA
+		;;
+	*-*-*)
+		VERSION=${VERSION%-*}
+		EXTRA=${VERSION##*-}
+		VERSION=$MMR.$EXTRA
+		;;
+	*-*)
+		STAGE=${VERSION#*-}
+		VERSION=$MMR~$STAGE
+		;;
+	esac
+
+	sed "1 s/@VERSION@/$VERSION/" -i debian/changelog
+	echo Set Debian version to $VERSION
+}
+
+sync_version
+
+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=$HOME/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,10 @@
+#!/usr/bin/env bash
+mkdir build
+cd build
+
+export CMAKE_OPTS="$CMAKE_FLAGS -DUSE_WERROR=ON"
+../cmake/build_mingw32.sh
+
+make -j4
+
+make package

.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,10 @@
+#!/usr/bin/env bash
+mkdir build
+cd build
+
+export CMAKE_OPTS="$CMAKE_FLAGS -DUSE_WERROR=ON"
+../cmake/build_mingw64.sh
+
+make -j4
+
+make package

.travis/osx..before_install.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+brew update
+
+# appdmg doesn't work with old versions of Node.js
+nvm install --lts

.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
+
+npm install -g appdmg

.travis/osx..script.sh

@@ -0,0 +1,17 @@
+#!/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 -DCMAKE_INSTALL_PREFIX=../target/ $CMAKE_FLAGS -DUSE_WERROR=OFF ..
+
+make -j4
+make tests
+./tests/tests
+
+make install
+make dmg

Brewfile

@@ -1,20 +0,0 @@
-brew "carla"
-brew "ccache"
-brew "fftw"
-brew "fltk"
-brew "fluid-synth"
-brew "jack"
-brew "lame"
-brew "libgig"
-brew "libogg"
-brew "libsamplerate"
-brew "libsndfile"
-brew "libsoundio"
-brew "libvorbis"
-brew "lilv"
-brew "lv2"
-brew "pkg-config"
-brew "portaudio"
-brew "qt@5"
-brew "sdl2"
-brew "stk"

CMakeLists.txt

@@ -1,52 +1,26 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.9)
-
-# Set the given policy to NEW. If it does not exist, it will not be set. If it
-# is already set to NEW (most likely due to predating the minimum required CMake
-# version), a developer warning is emitted indicating that the policy need no
-# longer be explicitly set.
-function(enable_policy_if_exists id)
-	if(POLICY "${id}")
-		cmake_policy(GET "${id}" current_value)
-		if(current_value STREQUAL "NEW")
-			message(AUTHOR_WARNING "${id} is now set to NEW by default, and no longer needs to be explicitly set.")
-		else()
-			cmake_policy(SET "${id}" NEW)
-		endif()
-	endif()
-endfunction()
-
-# Needed for the SWH Ladspa plugins. See below.
-enable_policy_if_exists(CMP0074) # find_package() uses <PackageName>_ROOT variables.
-# Needed for ccache support with MSVC
-enable_policy_if_exists(CMP0141) # MSVC debug information format flags are selected by an abstraction.
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)
 
 PROJECT(lmms)
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
-SET(LMMS_BINARY_DIR ${CMAKE_BINARY_DIR})
-SET(LMMS_SOURCE_DIR ${CMAKE_SOURCE_DIR})
 
-# Import of windows.h breaks min()/max()
-ADD_DEFINITIONS(-DNOMINMAX)
+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)
 
-# CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES is not set correctly for MinGW until
-# CMake 3.14.1, so avoid specifying system include directories on affected
-# versions. Normal include directories are safe, since GCC ignores them if they
-# are already in the built-in search path.
-if(MINGW AND CMAKE_VERSION VERSION_LESS "3.14.1")
-	set(CMAKE_NO_SYSTEM_FROM_IMPORTED TRUE)
-endif()
-
-INCLUDE(PluginList)
-INCLUDE(CheckSubmodules)
 INCLUDE(AddFileDependencies)
 INCLUDE(CheckIncludeFiles)
 INCLUDE(FindPkgConfig)
-INCLUDE(GenerateExportHeader)
 
 STRING(TOUPPER          "${CMAKE_PROJECT_NAME}" PROJECT_NAME_UCASE)
 
-SET(PROJECT_YEAR 2024)
+SET(PROJECT_YEAR 2020)
 
 SET(PROJECT_AUTHOR      "LMMS Developers")
 SET(PROJECT_URL         "https://lmms.io")
@@ -54,32 +28,30 @@ 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       "3")
-SET(VERSION_RELEASE     "0")
-SET(VERSION_STAGE       "alpha")
-SET(VERSION_BUILD       "")
+SET(VERSION_MINOR       "2")
+SET(VERSION_RELEASE     "2")
+SET(VERSION_STAGE       "")
+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}")
+	SET(VERSION     "${VERSION}.${VERSION_BUILD}")
 ENDIF()
 
 # Override version information for non-base builds
 INCLUDE(VersionInfo)
 INCLUDE(DetectMachine)
 
+
 OPTION(WANT_ALSA	"Include ALSA (Advanced Linux Sound Architecture) support" ON)
-OPTION(WANT_OSS 	"Include Open Sound System support" ON)
 OPTION(WANT_CALF	"Include CALF LADSPA plugins" ON)
 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_LV2		"Include Lv2 plugins" ON)
-OPTION(WANT_SUIL	"Include SUIL for LV2 plugin UIs" ON)
 OPTION(WANT_MP3LAME	"Include MP3/Lame support" ON)
 OPTION(WANT_OGGVORBIS	"Include OGG/Vorbis support" ON)
 OPTION(WANT_PULSEAUDIO	"Include PulseAudio support" ON)
@@ -89,32 +61,24 @@ 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_SID		"Include Sid instrument" 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_32	"Include 32-bit Windows VST support" ON)
-OPTION(WANT_VST_64	"Include 64-bit Windows VST support" ON)
+OPTION(WANT_VST_NOWINE	"Include partial VST support (without wine)" OFF)
 OPTION(WANT_WINMM	"Include WinMM MIDI support" OFF)
-OPTION(WANT_DEBUG_FPE	"Debug floating point exceptions" OFF)
-option(WANT_DEBUG_ASAN	"Enable AddressSanitizer" OFF)
-option(WANT_DEBUG_TSAN	"Enable ThreadSanitizer" OFF)
-option(WANT_DEBUG_MSAN	"Enable MemorySanitizer" OFF)
-option(WANT_DEBUG_UBSAN	"Enable UndefinedBehaviorSanitizer" OFF)
+OPTION(WANT_QT5		"Build with Qt5" OFF)
 OPTION(BUNDLE_QT_TRANSLATIONS	"Install Qt translation files for LMMS" OFF)
 
 
 IF(LMMS_BUILD_APPLE)
 	# Fix linking on 10.14+. See issue #4762 on github
-	LINK_DIRECTORIES("${APPLE_PREFIX}/lib")
+	LINK_DIRECTORIES(/usr/local/lib)
 	SET(WANT_SOUNDIO OFF)
 	SET(WANT_ALSA OFF)
-	SET(WANT_OSS OFF)
 	SET(WANT_PULSEAUDIO OFF)
 	SET(WANT_VST OFF)
 	SET(STATUS_ALSA "<not supported on this platform>")
-	SET(STATUS_OSS "<not supported on this platform>")
 	SET(STATUS_PULSEAUDIO "<not supported on this platform>")
 	SET(STATUS_APPLEMIDI "OK")
 ELSE(LMMS_BUILD_APPLE)
@@ -124,21 +88,17 @@ ENDIF(LMMS_BUILD_APPLE)
 
 IF(LMMS_BUILD_WIN32)
 	SET(WANT_ALSA OFF)
-	SET(WANT_OSS OFF)
+	SET(WANT_JACK OFF)
 	SET(WANT_PULSEAUDIO OFF)
 	SET(WANT_SNDIO OFF)
 	SET(WANT_SOUNDIO OFF)
 	SET(WANT_WINMM ON)
 	SET(BUNDLE_QT_TRANSLATIONS ON)
 	SET(LMMS_HAVE_WINMM TRUE)
-	if(NOT LMMS_BUILD_WIN64)
-		set(WANT_VST_64 OFF)
-	endif()
 	SET(STATUS_ALSA "<not supported on this platform>")
-	SET(STATUS_OSS "<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_SNDIO "<not supported on this platform>")
 	SET(STATUS_WINMM "OK")
 	SET(STATUS_APPLEMIDI "<not supported on this platform>")
 ELSE(LMMS_BUILD_WIN32)
@@ -155,15 +115,16 @@ IF(LMMS_BUILD_MSYS AND CMAKE_BUILD_TYPE STREQUAL "Debug")
 	SET(STATUS_STK "not built as requested")
 ENDIF()
 
-SET(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+CHECK_INCLUDE_FILES(stdint.h LMMS_HAVE_STDINT_H)
+CHECK_INCLUDE_FILES(stdlib.h LMMS_HAVE_STDLIB_H)
 CHECK_INCLUDE_FILES(pthread.h LMMS_HAVE_PTHREAD_H)
 CHECK_INCLUDE_FILES(semaphore.h LMMS_HAVE_SEMAPHORE_H)
 CHECK_INCLUDE_FILES(unistd.h LMMS_HAVE_UNISTD_H)
 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/times.h LMMS_HAVE_SYS_TIMES_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)
@@ -174,116 +135,75 @@ CHECK_INCLUDE_FILES(string.h LMMS_HAVE_STRING_H)
 CHECK_INCLUDE_FILES(process.h LMMS_HAVE_PROCESS_H)
 CHECK_INCLUDE_FILES(locale.h LMMS_HAVE_LOCALE_H)
 
-include(CheckLibraryExists)
-check_library_exists(rt shm_open "" LMMS_HAVE_LIBRT)
-
 LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}")
 
-FIND_PACKAGE(Qt5 5.6.0 COMPONENTS Core Gui Widgets Xml REQUIRED)
-FIND_PACKAGE(Qt5 COMPONENTS LinguistTools QUIET)
+IF(WANT_QT5)
+	SET(QT5 TRUE)
 
-INCLUDE_DIRECTORIES(
-	${Qt5Core_INCLUDE_DIRS}
-	${Qt5Gui_INCLUDE_DIRS}
-	${Qt5Widgets_INCLUDE_DIRS}
-	${Qt5Xml_INCLUDE_DIRS}
-)
+	FIND_PACKAGE(Qt5Core REQUIRED)
+	FIND_PACKAGE(Qt5Gui REQUIRED)
+	FIND_PACKAGE(Qt5LinguistTools)
+	FIND_PACKAGE(Qt5Widgets REQUIRED)
+	FIND_PACKAGE(Qt5Xml REQUIRED)
 
-SET(QT_LIBRARIES
-	Qt5::Core
-	Qt5::Gui
-	Qt5::Widgets
-	Qt5::Xml
-)
+	INCLUDE_DIRECTORIES(
+		${Qt5Core_INCLUDE_DIRS}
+		${Qt5Gui_INCLUDE_DIRS}
+		${Qt5Widgets_INCLUDE_DIRS}
+		${Qt5Xml_INCLUDE_DIRS}
+	)
 
-IF(LMMS_BUILD_LINUX AND WANT_VST)
-    FIND_PACKAGE(Qt5 COMPONENTS X11Extras REQUIRED)
-    LIST(APPEND QT_LIBRARIES Qt5::X11Extras)
+	SET(QT_LIBRARIES
+		Qt5::Core
+		Qt5::Gui
+		Qt5::Widgets
+		Qt5::Xml
+	)
+
+	IF(LMMS_BUILD_LINUX AND WANT_VST)
+		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)
+	execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_TRANSLATIONS
+		OUTPUT_VARIABLE QT_TRANSLATIONS_DIR
+		OUTPUT_STRIP_TRAILING_WHITESPACE
+		ERROR_QUIET
+	)
+	IF(EXISTS "${QT_TRANSLATIONS_DIR}")
+		MESSAGE("-- Found Qt translations in ${QT_TRANSLATIONS_DIR}")
+		ADD_DEFINITIONS(-D'QT_TRANSLATIONS_DIR="${QT_TRANSLATIONS_DIR}"')
+	ENDIF()
+
+	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()
 
-# Resolve Qt5::qmake to full path for use in packaging scripts
-GET_TARGET_PROPERTY(QT_QMAKE_EXECUTABLE "${Qt5Core_QMAKE_EXECUTABLE}" IMPORTED_LOCATION)
-
-# Find the location of Qt translation files
-execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_TRANSLATIONS
-	OUTPUT_VARIABLE QT_TRANSLATIONS_DIR
-	OUTPUT_STRIP_TRAILING_WHITESPACE
-	ERROR_QUIET
-)
-IF(EXISTS "${QT_TRANSLATIONS_DIR}")
-	MESSAGE("-- Found Qt translations in ${QT_TRANSLATIONS_DIR}")
-	ADD_DEFINITIONS("-DQT_TRANSLATIONS_DIR=\"${QT_TRANSLATIONS_DIR}\"")
-ENDIF()
-
-FIND_PACKAGE(Qt5Test)
-SET(QT_QTTEST_LIBRARY Qt5::Test)
-
 # check for libsndfile
-FIND_PACKAGE(SndFile REQUIRED)
-IF(SNDFILE_FOUND)
-	IF(SndFile_VERSION VERSION_GREATER_EQUAL "1.1.0")
-		SET(LMMS_HAVE_SNDFILE_MP3 TRUE)
-	ELSE()
-		MESSAGE("libsndfile version is < 1.1.0; MP3 import disabled")
-		SET(LMMS_HAVE_SNDFILE_MP3 FALSE)
-	ENDIF()
-ELSE()
-	MESSAGE(FATAL_ERROR "LMMS requires libsndfile1 and libsndfile1-dev >= 1.0.18 - please install, remove CMakeCache.txt and try again!")
-ENDIF()
-# check if we can use SFC_SET_COMPRESSION_LEVEL
-INCLUDE(CheckCXXSourceCompiles)
-CHECK_CXX_SOURCE_COMPILES(
-	"#include <sndfile.h>
-		int main() {SFC_SET_COMPRESSION_LEVEL;}"
-	LMMS_HAVE_SF_COMPLEVEL
-)
-
-# check for perl
-if(LMMS_BUILD_APPLE)
-	# Prefer system perl over Homebrew, MacPorts, etc
-	set(Perl_ROOT "/usr/bin")
-endif()
-find_package(Perl)
-
-IF(WANT_LV2)
-	IF(PKG_CONFIG_FOUND)
-		PKG_CHECK_MODULES(LV2 lv2)
-		PKG_CHECK_MODULES(LILV lilv-0)
-	ENDIF()
-	IF(NOT LV2_FOUND AND NOT LILV_FOUND)
-		UNSET(LV2_FOUND CACHE)
-		UNSET(LILV_FOUND CACHE)
-		FIND_PACKAGE(LV2 CONFIG)
-		FIND_PACKAGE(LILV CONFIG)
-		IF(LILV_FOUND)
-			SET(LILV_LIBRARIES "lilv::lilv")
-		ENDIF()
-	ENDIF()
-	IF(LV2_FOUND AND LILV_FOUND)
-		SET(LMMS_HAVE_LV2 TRUE)
-		SET(STATUS_LV2 "OK")
-	ELSE()
-		SET(STATUS_LV2 "not found, install it or set PKG_CONFIG_PATH appropriately")
-	ENDIF()
-ELSE(WANT_LV2)
-	SET(STATUS_LV2 "not built as requested")
-ENDIF(WANT_LV2)
-
-IF(WANT_SUIL)
-	IF(PKG_CONFIG_FOUND)
-		PKG_CHECK_MODULES(SUIL suil-0)
-		IF(SUIL_FOUND)
-			SET(LMMS_HAVE_SUIL TRUE)
-			SET(STATUS_SUIL "OK")
-		ELSE()
-			SET(STATUS_SUIL "not found, install it or set PKG_CONFIG_PATH appropriately")
-		ENDIF()
-	ELSE()
-		SET(STATUS_SUIL "not found, requires pkg-config")
-	ENDIF()
-ELSE(WANT_SUIL)
-	SET(STATUS_SUIL "not built as requested")
-ENDIF(WANT_SUIL)
+PKG_CHECK_MODULES(SNDFILE REQUIRED sndfile>=1.0.11)
+IF(NOT SNDFILE_FOUND)
+	MESSAGE(FATAL_ERROR "LMMS requires libsndfile1 and libsndfile1-dev >= 1.0.11 - please install, remove CMakeCache.txt and try again!")
+ENDIF(NOT SNDFILE_FOUND)
 
 IF(WANT_CALF)
 	SET(LMMS_HAVE_CALF TRUE)
@@ -307,12 +227,8 @@ ELSE(WANT_CMT)
 ENDIF(WANT_CMT)
 
 IF(WANT_SWH)
-	IF(PERL_FOUND)
-		SET(LMMS_HAVE_SWH TRUE)
-		SET(STATUS_SWH "OK")
-	ELSE()
-		SET(STATUS_SWH "Skipping, perl is missing")
-	ENDIF()
+	SET(LMMS_HAVE_SWH TRUE)
+	SET(STATUS_SWH "OK")
 ELSE(WANT_SWH)
 	SET(STATUS_SWH "not built as requested")
 ENDIF(WANT_SWH)
@@ -342,51 +258,26 @@ IF(WANT_CARLA)
 ENDIF(WANT_CARLA)
 
 
-# check for SDL2
+# check for SDL
 IF(WANT_SDL)
-	FIND_PACKAGE(SDL2)
-	IF(SDL2_FOUND)
-		SET(LMMS_HAVE_SDL TRUE)
-		SET(LMMS_HAVE_SDL2 TRUE)
-		SET(STATUS_SDL "OK, using SDL2")
-		SET(SDL2_LIBRARY "SDL2::SDL2")
-		SET(SDL_INCLUDE_DIR "")
-		SET(SDL_LIBRARY "")
-	ELSE()
-		SET(SDL2_LIBRARY "")
-	ENDIF()
-ENDIF()
-
-# fallback to SDL1
-IF(WANT_SDL AND NOT LMMS_HAVE_SDL2)
-	# Fallback to SDL1.2
 	SET(SDL_BUILDING_LIBRARY TRUE)
 	FIND_PACKAGE(SDL)
 	IF(SDL_FOUND)
 		SET(LMMS_HAVE_SDL TRUE)
-		SET(STATUS_SDL "OK, using SDL1.2")
-		# fix mingw since 53abd65
-		IF(NOT SDL_INCLUDE_DIR)
-			SET(SDL_INCLUDE_DIR "${CMAKE_FIND_ROOT_PATH}/include")
-		ENDIF()
-
-	ELSE()
-		SET(STATUS_SDL "not found, please install libsdl2-dev (or similar) "
+		SET(STATUS_SDL "OK")
+	ELSE(SDL_FOUND)
+		SET(STATUS_SDL "not found, please install libsdl1.2-dev (or similar) "
 			"if you require SDL support")
-		SET(SDL_INCLUDE_DIR "")
-		SET(SDL_LIBRARY "")
-	ENDIF()
-ENDIF()
+	ENDIF(SDL_FOUND)
+ENDIF(WANT_SDL)
+IF(NOT LMMS_HAVE_SDL)
+	SET(SDL_INCLUDE_DIR "")
+ELSE(NOT LMMS_HAVE_SDL)
+	IF(NOT SDL_INCLUDE_DIR)
+		SET(SDL_INCLUDE_DIR "${CMAKE_FIND_ROOT_PATH}/include")
+	ENDIF(NOT SDL_INCLUDE_DIR)
+ENDIF(NOT LMMS_HAVE_SDL)
 
-# check for Sid
-if(WANT_SID)
-	if(PERL_FOUND)
-		set(LMMS_HAVE_SID TRUE)
-		set(STATUS_SID "OK")
-	else()
-		set(STATUS_SID "not found, please install perl if you require the Sid instrument")
-	endif()
-endif()
 
 # check for Stk
 IF(WANT_STK)
@@ -405,26 +296,26 @@ ENDIF(WANT_STK)
 # check for PortAudio
 IF(WANT_PORTAUDIO)
 	FIND_PACKAGE(Portaudio)
-	IF(Portaudio_FOUND)
+	IF(PORTAUDIO_FOUND)
 		SET(LMMS_HAVE_PORTAUDIO TRUE)
 		SET(STATUS_PORTAUDIO "OK")
-	ELSE()
+	ELSE(PORTAUDIO_FOUND)
 		SET(STATUS_PORTAUDIO "not found, please install portaudio19-dev (or similar, version >= 1.9) "
 			"if you require PortAudio support")
-	ENDIF()
+	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}")
+    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 "")
+    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)
 
@@ -454,6 +345,8 @@ IF(WANT_MP3LAME)
 		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")
@@ -472,13 +365,13 @@ IF(WANT_OGGVORBIS)
 ENDIF(WANT_OGGVORBIS)
 
 
-# check for OSS
-IF(WANT_OSS AND (LMMS_HAVE_SOUNDCARD_H OR LMMS_HAVE_SYS_SOUNDCARD_H))
+# check whether to enable OSS-support
+IF(LMMS_HAVE_SOUNDCARD_H OR LMMS_HAVE_SYS_SOUNDCARD_H)
 	SET(LMMS_HAVE_OSS TRUE)
 	SET(STATUS_OSS "OK")
-ELSEIF(WANT_OSS)
+ELSE(LMMS_HAVE_SOUNDCARD_H OR LMMS_HAVE_SYS_SOUNDCARD_H)
 	SET(STATUS_OSS "<not found or not supported on this platform>")
-ENDIF()
+ENDIF(LMMS_HAVE_SOUNDCARD_H OR LMMS_HAVE_SYS_SOUNDCARD_H)
 
 
 # check for ALSA
@@ -499,67 +392,43 @@ ENDIF(NOT LMMS_HAVE_ALSA)
 
 # check for JACK
 IF(WANT_JACK)
-	IF(WANT_WEAKJACK)
-		SET(LMMS_HAVE_WEAKJACK TRUE)
-		SET(WEAKJACK_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/src/3rdparty/weakjack/weakjack)
-		SET(JACK_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/src/3rdparty/jack2/common)
-		SET(STATUS_JACK "OK (weak linking enabled)")
-		# use dlsym instead
-		SET(JACK_LIBRARIES ${CMAKE_DL_LIBS})
-		SET(LMMS_HAVE_JACK TRUE)
-		SET(LMMS_HAVE_JACK_PRENAME TRUE)
-		SET(JACK_FOUND TRUE)
-	ELSE()
-		PKG_CHECK_MODULES(JACK jack>=0.77)
-		IF(JACK_FOUND)
-			SET(LMMS_HAVE_JACK TRUE)
+	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")
-			SET(CMAKE_REQUIRED_LIBRARIES_BACKUP "${CMAKE_REQUIRED_LIBRARIES}")
-			SET(CMAKE_REQUIRED_LIBRARIES "${JACK_LIBRARIES}")
-			CHECK_LIBRARY_EXISTS(jack jack_port_rename "" LMMS_HAVE_JACK_PRENAME)
-			SET(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES_BACKUP}")
-			UNSET(CMAKE_REQUIRED_LIBRARIES_BACKUP)
 		ENDIF()
-	ENDIF()
-
-	IF(NOT JACK_FOUND)
-		SET(JACK_INCLUDE_DIRS "")
-		SET(STATUS_JACK "not found")
-	ENDIF()
+		SET(LMMS_HAVE_JACK TRUE)
+	ELSE(JACK_FOUND)
+		SET(STATUS_JACK "not found, please install libjack0.100.0-dev (or similar) "
+			"if you require JACK support")
+	ENDIF(JACK_FOUND)
 ENDIF(WANT_JACK)
 
+
 # check for FFTW3F-library
-FIND_PACKAGE(FFTW COMPONENTS fftw3f REQUIRED)
+PKG_CHECK_MODULES(FFTW3F REQUIRED fftw3f>=3.0.0)
+
 
 # check for FLTK
-set(FLTK_SKIP_OPENGL TRUE)
-set(FLTK_SKIP_FORMS TRUE)
-set(FLTK_SKIP_IMAGES TRUE)
-set(FLTK_SKIP_MATH TRUE)
-if(MINGW_PREFIX)
-	set(FLTK_SKIP_FLUID TRUE)
-endif()
 FIND_PACKAGE(FLTK)
-IF(FLTK_FOUND)
-	SET(STATUS_ZYN "OK")
-ELSE()
-	SET(STATUS_ZYN "not found, please install fltk")
-ENDIF()
+
 
 # check for Fluidsynth
 IF(WANT_SF2)
-	find_package(FluidSynth 1.1.7)
-	if(FluidSynth_FOUND)
+	PKG_CHECK_MODULES(FLUIDSYNTH fluidsynth>=1.0.7)
+	IF(FLUIDSYNTH_FOUND)
 		SET(LMMS_HAVE_FLUIDSYNTH TRUE)
-		if(FluidSynth_VERSION_STRING VERSION_GREATER_EQUAL 2)
-			set(STATUS_FLUIDSYNTH "OK")
-		else()
-			set(STATUS_FLUIDSYNTH "OK (FluidSynth version < 2: per-note panning unsupported)")
-		endif()
-	else()
+		SET(STATUS_FLUIDSYNTH "OK")
+	ELSE(FLUIDSYNTH_FOUND)
 		SET(STATUS_FLUIDSYNTH "not found, libfluidsynth-dev (or similar)"
 			"is highly recommended")
-	endif()
+	ENDIF(FLUIDSYNTH_FOUND)
 ENDIF(WANT_SF2)
 
 # check for libgig
@@ -574,11 +443,10 @@ If(WANT_GIG)
 ENDIF(WANT_GIG)
 
 # check for pthreads
-IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD OR LMMS_BUILD_FREEBSD OR LMMS_BUILD_HAIKU)
+IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD OR LMMS_BUILD_FREEBSD)
 	FIND_PACKAGE(Threads)
-ENDIF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD OR LMMS_BUILD_FREEBSD OR LMMS_BUILD_HAIKU)
+ENDIF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD OR LMMS_BUILD_FREEBSD)
 
-# check for sndio (roaraudio won't work yet)
 IF(WANT_SNDIO)
 	FIND_PACKAGE(Sndio)
 	IF(SNDIO_FOUND)
@@ -590,104 +458,56 @@ IF(WANT_SNDIO)
 ENDIF(WANT_SNDIO)
 
 # check for WINE
-if(WANT_VST)
-	if((WANT_VST_32 OR WANT_VST_64) AND NOT LMMS_BUILD_WIN32)
-		find_package(Wine)
-		include(CheckWineGcc)
-	endif()
-	macro(check_vst bits)
-		if(NOT WANT_VST_${bits})
-			set(STATUS_VST_${bits} "Not built, as requested")
-		elseif(LMMS_BUILD_WIN32)
-			set(STATUS_VST_${bits} "OK")
-			set(LMMS_HAVE_VST_${bits} TRUE)
-		elseif(NOT WINE_FOUND)
-			set(STATUS_VST_${bits} "not found, please install (lib)wine-dev (or similar) - 64 bit systems additionally need gcc-multilib and g++-multilib")
-		else()
-			CheckWineGcc("${bits}" "${WINEGCC}" WINEGCC_WORKING)
-			if(WINEGCC_WORKING)
-				set(LMMS_HAVE_VST_${bits} TRUE)
-				if(WINE_LIBRARY_FIX)
-					set(STATUS_VST_${bits} "OK, with workaround linking ${WINE_LIBRARY_FIX}")
-				else()
-					set(STATUS_VST_${bits} "OK")
-				endif()
-			else()
-				set(STATUS_VST_${bits} "winegcc fails to compile ${bits}-bit binaries, please make sure you have ${bits}-bit GCC libraries")
-			endif()
-		endif()
-	endmacro()
-	check_vst(32)
-	check_vst(64)
-	if(LMMS_HAVE_VST_32 OR LMMS_HAVE_VST_64 OR LMMS_BUILD_LINUX)
-		set(LMMS_HAVE_VST TRUE)
-		set(STATUS_VST "OK")
-	else()
-		set(STATUS_VST "No hosts selected and available")
-	endif()
-endif()
+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 similar) - 64 bit systems additionally need gcc-multilib and g++-multilib")
+	ENDIF(WINE_FOUND)
+ENDIF(WANT_VST)
+IF(LMMS_BUILD_WIN32)
+	SET(LMMS_SUPPORT_VST TRUE)
+	SET(STATUS_VST "OK")
+ENDIF(LMMS_BUILD_WIN32)
 
-IF(WANT_DEBUG_FPE)
-	IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE)
-		SET(LMMS_DEBUG_FPE TRUE)
-		SET (STATUS_DEBUG_FPE "Enabled")
-	ELSE()
-		SET (STATUS_DEBUG_FPE "Wanted but disabled due to unsupported platform")
-	ENDIF()
-ELSE()
-	SET (STATUS_DEBUG_FPE "Disabled")
-ENDIF(WANT_DEBUG_FPE)
 
 # check for libsamplerate
-FIND_PACKAGE(Samplerate 0.1.8 MODULE REQUIRED)
+PKG_CHECK_MODULES(SAMPLERATE REQUIRED samplerate>=0.1.8)
 
 # set compiler flags
-IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-	SET(WERROR_FLAGS "-Wall -Werror=unused-function -Wno-sign-compare -Wno-strict-overflow")
-	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") OR LMMS_BUILD_WIN32))
-		SET(WERROR_FLAGS "${WERROR_FLAGS} -Wno-array-bounds -Wno-attributes")
-	ENDIF()
-ELSEIF(MSVC)
-	# Remove any existing /W flags
-	STRING(REGEX REPLACE "/W[0-4]" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-	SET(WERROR_FLAGS "/W2")
-	IF(${USE_WERROR})
-		SET(WERROR_FLAGS "${WERROR_FLAGS} /WX")
-	ENDIF()
+SET(WERROR_FLAGS "-Wall -Werror=unused-function -Wno-sign-compare -Wno-strict-overflow")
+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") OR LMMS_BUILD_WIN32))
+   SET(WERROR_FLAGS "${WERROR_FLAGS} -Wno-array-bounds -Wno-attributes")
+ENDIF()
 
 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")
+  		"MinSizeRel" "RelWithDebInfo")
 ENDIF()
 
 SET(CMAKE_C_FLAGS "${WERROR_FLAGS} ${CMAKE_C_FLAGS}")
-SET(CMAKE_CXX_FLAGS "${WERROR_FLAGS} ${CMAKE_CXX_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")
 
-if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.16")
-	set(NOOP_COMMAND "${CMAKE_COMMAND}" "-E" "true")
-else()
-	set(NOOP_COMMAND "${CMAKE_COMMAND}" "-E" "echo")
-endif()
-if(STRIP)
-	# TODO CMake 3.19: Now that CONFIG generator expressions support testing for
-	# multiple configurations, combine the OR into a single CONFIG expression.
-	set(STRIP_COMMAND "$<IF:$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>,${NOOP_COMMAND},${STRIP}>")
-else()
-	set(STRIP_COMMAND "${NOOP_COMMAND}")
-endif()
 
 # people simply updating git will still have this and mess up build with it
 FILE(REMOVE include/lmmsconfig.h)
@@ -711,47 +531,38 @@ IF(GIT_FOUND AND NOT CONTRIBUTORS)
 		TIMEOUT 1)
 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_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)
+
 # we somehow have to make LMMS-binary depend on MOC-files
 ADD_FILE_DEPENDENCIES("${CMAKE_BINARY_DIR}/lmmsconfig.h")
 
-IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-	IF(WIN32)
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes")
-	ELSE(WIN32)
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -DPIC")
-	ENDIF(WIN32)
-elseif(MSVC)
-	# Use UTF-8 as the source and execution character set
-	add_compile_options("/utf-8")
-ENDIF()
-
-# add enabled sanitizers
-function(add_sanitizer sanitizer supported_compilers want_flag status_flag)
-	if(${want_flag})
-		if(CMAKE_CXX_COMPILER_ID MATCHES "${supported_compilers}")
-			set("${status_flag}" "Enabled" PARENT_SCOPE)
-			string(REPLACE ";" " " additional_flags "${ARGN}")
-			# todo CMake 3.13: use add_compile_options/add_link_options instead
-			set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fsanitize=${sanitizer} ${additional_flags}" PARENT_SCOPE)
-			set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=${sanitizer} ${additional_flags}" PARENT_SCOPE)
-		else()
-			set("${status_flag}" "Wanted but disabled due to unsupported compiler" PARENT_SCOPE)
-		endif()
-	else()
-		set("${status_flag}" "Disabled" PARENT_SCOPE)
-	endif()
-endfunction()
-
-add_sanitizer(address "GNU|Clang|MSVC" WANT_DEBUG_ASAN STATUS_DEBUG_ASAN)
-add_sanitizer(thread "GNU|Clang" WANT_DEBUG_TSAN STATUS_DEBUG_TSAN)
-add_sanitizer(memory "Clang" WANT_DEBUG_MSAN STATUS_DEBUG_MSAN -fno-omit-frame-pointer)
-# UBSan does not link with vptr enabled due to a problem with references from PeakControllerEffect
-# not being found by PeakController
-add_sanitizer(undefined "GNU|Clang" WANT_DEBUG_UBSAN STATUS_DEBUG_UBSAN -fno-sanitize=vptr)
-
+IF(WIN32)
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes")
+ELSE(WIN32)
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -DPIC")
+ENDIF(WIN32)
 
 # use ccache
-include(CompileCache)
+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)
@@ -761,23 +572,18 @@ ADD_SUBDIRECTORY(tests)
 ADD_SUBDIRECTORY(data)
 ADD_SUBDIRECTORY(doc)
 
-# install tasks
-ADD_SUBDIRECTORY(cmake/install)
+# post-install tasks
+ADD_SUBDIRECTORY(cmake/postinstall)
 
-FIND_PACKAGE(UnixCommands)
-IF(GZIP)
-	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)
+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)
 
 
-	ADD_CUSTOM_TARGET(manpage ALL
-					DEPENDS "${CMAKE_BINARY_DIR}/lmms.1.gz")
-ELSEIF(UNIX)
-	MESSAGE(FATAL_ERROR "Can't find gzip required for generating lmms.1.gz")
-ENDIF()
+ADD_CUSTOM_TARGET(manpage ALL
+				DEPENDS "${CMAKE_BINARY_DIR}/lmms.1.gz")
 
 # install headers
 
@@ -789,6 +595,18 @@ IF(LMMS_BUILD_LINUX)
 		DESTINATION "${CMAKE_INSTALL_PREFIX}/include/lmms/")
 ENDIF(LMMS_BUILD_LINUX)
 
+# package ZynAddSubFX into win32 build
+IF(LMMS_BUILD_WIN32)
+	IF(EXISTS "${CMAKE_SOURCE_DIR}/extras")
+		ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/extras/data/presets")
+		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)
+
 #
 # add distclean-target
 #
@@ -810,14 +628,6 @@ ADD_CUSTOM_TARGET(dist
 			COMMAND tar cjf lmms-${VERSION}-src.tar.bz2 "${TMP}"
 			COMMAND rm -rf "${TMP}")
 
-
-#
-# add uninstall-target
-#
-ADD_CUSTOM_TARGET(uninstall
-	COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}" -P "${CMAKE_CURRENT_SOURCE_DIR}/cmake/uninstall.cmake"
-)
-
 #
 # display configuration information
 #
@@ -856,7 +666,6 @@ MESSAGE(
 "Supported file formats for project export\n"
 "-----------------------------------------\n"
 "* WAVE                        : OK\n"
-"* FLAC                        : OK\n"
 "* OGG/VORBIS                  : ${STATUS_OGGVORBIS}\n"
 "* MP3/Lame                    : ${STATUS_MP3LAME}\n"
 )
@@ -864,16 +673,11 @@ MESSAGE(
 MESSAGE(
 "Optional plugins\n"
 "----------------\n"
-"* Lv2 plugins                 : ${STATUS_LV2}\n"
-"* SUIL for plugin UIs         : ${STATUS_SUIL}\n"
-"* ZynAddSubFX instrument      : ${STATUS_ZYN}\n"
 "* Carla Patchbay & Rack       : ${STATUS_CARLA}\n"
 "* SoundFont2 player           : ${STATUS_FLUIDSYNTH}\n"
-"* Sid instrument              : ${STATUS_SID}\n"
 "* Stk Mallets                 : ${STATUS_STK}\n"
-"* VST plugin host             : ${STATUS_VST}\n"
-"  * 32-bit Windows host       : ${STATUS_VST_32}\n"
-"  * 64-bit Windows host       : ${STATUS_VST_64}\n"
+"* VST-instrument hoster       : ${STATUS_VST}\n"
+"* VST-effect hoster           : ${STATUS_VST}\n"
 "* CALF LADSPA plugins         : ${STATUS_CALF}\n"
 "* CAPS LADSPA plugins         : ${STATUS_CAPS}\n"
 "* CMT LADSPA plugins          : ${STATUS_CMT}\n"
@@ -882,16 +686,6 @@ MESSAGE(
 "* GIG player                  : ${STATUS_GIG}\n"
 )
 
-MESSAGE(
-"Developer options\n"
-"-----------------------------------------\n"
-"* Debug FP exceptions               : ${STATUS_DEBUG_FPE}\n"
-"* Debug using AddressSanitizer      : ${STATUS_DEBUG_ASAN}\n"
-"* Debug using ThreadSanitizer       : ${STATUS_DEBUG_TSAN}\n"
-"* Debug using MemorySanitizer       : ${STATUS_DEBUG_MSAN}\n"
-"* Debug using UBSanitizer           : ${STATUS_DEBUG_UBSAN}\n"
-)
-
 MESSAGE(
 "\n"
 "-----------------------------------------------------------------\n"
@@ -901,10 +695,4 @@ MESSAGE(
 "-----------------------------------------------------------------\n"
 "\n\n")
 
-SET(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION "${BIN_DIR}")
-if(MSVC)
-	# We can't set this on the install time according to the configuration
-	SET(CMAKE_INSTALL_DEBUG_LIBRARIES TRUE)
-	SET(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)
-endif()
 INCLUDE(InstallRequiredSystemLibraries)

INSTALL.txt

@@ -1,28 +1,16 @@
-This project uses git submodules and several are required for a successful
-build.  If this tarball was NOT provided with submodules (default), some source
-dependencies will need to be manually added to src/3rdparty.
+Building LMMS got quite simple since 0.4.0 as everything is managed
+by cmake now. Therefore make sure you have CMake (>= 2.6.0 recommended) and
+then run
 
-If this project WAS provided with submodules, there are detailed dependencies
-(e.g. supported compilers, cmake requirements, cross-compilation) at
-doc/wiki/Compiling.md including platform-specific build instructions (e.g.
-apt-get, dnf, pacman, etc).
 
-Online documentation:
+mkdir build
+cd build
+cmake ../
+make
+sudo make install
 
-   https://github.com/LMMS/lmms/wiki/
-
-Live online chat via Discord (similar to IRC):
-
-   https://lmms.io/chat, Channel #programming
-
-Basic build steps:
-
-   mkdir build
-   cd build
-   cmake ../
-   make
-   sudo make install
-   # or alternately: su -c 'make install'
+If your system does not have "sudo", become root with your preferred mechanism
+and run the "make install" command.
 
 With the above commands an out-of-tree build is performed. You can also run
 "cmake ." directly in the root of source tree although this is not recommended.
@@ -37,31 +25,24 @@ that are going to be built into LMMS or built as plugins. Install the
 according libraries and development files if a certain feature is not enabled.
 Then remove CMakeCache.txt and run cmake again.
 
-For non-root installs, or to install to a non-standard location, provide an
-install prefix to cmake, using the flag:
+If you want to supply an install prefix to cmake, add the flag:
 
-   -DCMAKE_INSTALL_PREFIX=<prefix>
+-DCMAKE_INSTALL_PREFIX=<prefix>
 
-The Compilation tutorial (see docs/wiki/Compilation.md)
-specifically uses <prefix> as "../target" for all non-root installations.  This
-is strongly recommended if developing a patch or a feature.  For root
-installations, <prefix> can be /usr, /usr/local, /opt, etc. For most systems,
-the default is /usr/local.
+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:
+additionally pass e.g.
 
-   -DCMAKE_PREFIX_PATH=<prefix>
+-DCMAKE_PREFIX_PATH=/opt/qt53/
 
-Where <prefix> is the location to Qt5 installation, usually /opt/qt5/, etc.
-
-Important wiki sections:
-
-doc/wiki/Compiling.md:
-   Dependencies Detailed
-      - Build Toolchain (cmake)
-      - Compiler (gcc, clang)
-      - Libraries (required and optional dependencies)
-
-doc/wiki/Dependencies-<platform>.md
-   Platform-specific dependencies (Windows, Ubuntu, Fedora, macOS, etc.)

README.md

@@ -1,6 +1,6 @@
-# ![LMMS Logo](https://raw.githubusercontent.com/LMMS/artwork/master/Icon%20%26%20Mimetypes/lmms-64x64.svg) LMMS
+# ![LMMS Logo](http://lmms.sourceforge.net/Lmms_logo.png) LMMS
 
-[![Build status](https://github.com/LMMS/lmms/actions/workflows/build.yml/badge.svg)](https://github.com/LMMS/lmms/actions/workflows/build.yml)
+[![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)
@@ -26,9 +26,9 @@ Features
 ---------
 
 * Song-Editor for composing songs
-* Pattern-Editor for creating beats and patterns
+* A Beat+Bassline-Editor for creating beats and basslines
 * An easy-to-use Piano-Roll for editing patterns and melodies
-* A Mixer with unlimited mixer channels and arbitrary number of effects
+* 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
@@ -53,6 +53,7 @@ Information about what you can do and how can be found in the
 
 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 ask in one of the tech channels on Discord and wait for replies! Maybe there are different ideas, improvements, or hints, or
+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.

buildtools/bin2res.cpp

@@ -0,0 +1,212 @@
+/*
+ * bin2res.cpp - generate embedded resources from binary data (based on qembed)
+ *
+ * Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ *
+ * 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 (see COPYING); if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ */
+
+
+#include <string>
+#include <vector>
+#include <iostream>
+#include <fstream>
+
+static void embedData( const char * _input, int _size, std::ostream & _output );
+static std::string convertFileNameToCIdentifier( const std::string & _s );
+
+
+struct embed
+{
+	unsigned int size;
+	std::string name;
+	std::string cname;
+} ;
+
+typedef std::vector<std::string> stringlist;
+
+const int MAX_FILE_SIZE = 256*256*256;		// = 16 MB
+
+
+int main( int argc, char * * argv )
+{
+	if( argc < 2 )
+	{
+		std::cerr << "Usage:"  << std::endl << "\t" << argv[0] <<
+							" files" << std::endl;
+		return( 1 );
+	}
+
+	std::cout << "// Generated by bin2res" << std::endl;
+
+	std::vector<embed *> embedded_data;
+
+	std::cout << "#ifndef _EMBEDDED_RESOURCES_H" << std::endl;
+	std::cout << "#define _EMBEDDED_RESOURCES_H" << std::endl;
+
+	stringlist files;
+	for( int i = 1; i < argc; ++i )
+	{
+		files.push_back( std::string( argv[i] ) );
+	}
+	for( stringlist::iterator it = files.begin(); it != files.end(); ++it )
+	{
+		std::ifstream f( it->c_str(), std::ios::binary );
+		if( f.fail() )
+		{
+			std::cerr << "Cannot open file " << *it <<
+						", ignoring it" << std::endl;
+			continue;
+		}
+		f.seekg( 0, std::ios::end );
+		int fsize = f.tellg();
+		f.seekg( 0 );
+		if( fsize == 0 || fsize > MAX_FILE_SIZE )
+		{
+			std::cerr << "File " << *it << " has zero size or is "
+				"too large to be processed with bin2res." <<
+								std::endl;
+		}
+		char * data = new char[fsize];
+		f.read( data, fsize );
+		embed * e = new embed;
+		e->size = fsize;
+		if( it->rfind( '/' ) != std::string::npos )
+		{
+			e->name = std::string( it->c_str() +
+							it->rfind( '/' ) + 1 );
+		}
+		else
+		{
+			e->name = *it;
+		}
+		e->cname = convertFileNameToCIdentifier( e->name );
+		embedded_data.push_back( e );
+		std::string s;
+		std::cout << "static const unsigned char " << e->cname <<
+								"_data[] = {";
+		embedData( data, fsize, std::cout );
+		std::cout << std::endl << "};" << std::endl << std::endl;
+		delete[] data;
+	}
+
+	if( embedded_data.size() > 0 )
+	{
+		std::cout << "static const unsigned char dummy_data[] ="
+					"{ 0x00 };" << std::endl << std::endl;
+		embed * dummy = new embed;
+		dummy->size = 1;
+		dummy->name = "dummy";
+		dummy->cname = convertFileNameToCIdentifier(
+						std::string( "dummy" ) );
+		embedded_data.push_back( dummy );
+
+		std::cout << "#include <string.h>" << std::endl << std::endl;
+		std::cout << "#include \"embed.h\"" << std::endl << std::endl;
+		std::cout << "static embed::descriptor embed_vec[] = {" << std::endl;
+/*				<< "{" << std::endl
+				<< "	int size;" << std::endl
+				<< "	const unsigned char * data;" <<
+								std::endl
+				<< "	const char * name;" << std::endl
+				<< "} embed_vec[] = {" << std::endl;*/
+		while( embedded_data.size() > 0 )
+		{
+			embed * e = embedded_data[0];
+			std::cout << "	{ " << e->size << ", " << e->cname <<
+						"_data, " << "\"" << e->name <<
+							"\" }," << std::endl;
+			delete e;
+			embedded_data.erase( embedded_data.begin() );
+		}
+		std::cout << "	{ 0, 0, 0 }" << std::endl << "};" << std::endl
+								<< std::endl
+				<< "static const embed::descriptor & "
+				   "findEmbeddedData( const char * _name )"
+				<< std::endl << "{" << std::endl
+				<< "	for( int i = 0; embed_vec[i].data; "
+							"i++ )" << std::endl
+				<< "	{" << std::endl
+				<< "		if( strcmp( embed_vec[i].name, "
+						"_name ) == 0 )" << std::endl
+				<< "		{" << std::endl
+				<< "			return( "
+						"embed_vec[i] );" << std::endl
+				<< "		}" << std::endl
+				<< "	}" << std::endl
+/*				<< "	printf( \"warning: embedded resource "
+						"%s not found!\\n\", _name );"
+								<< std::endl*/
+				<< "	return( findEmbeddedData( "
+						"\"dummy\" ) );" << std::endl
+				<< "}" << std::endl << std::endl;
+	}
+	std::cout << "#endif" << std::endl;
+	return( 0 );
+}
+
+
+
+
+std::string convertFileNameToCIdentifier( const std::string & _s )
+{
+	std::string r = _s;
+	int len = r.length();
+	if ( len > 0 && !isalpha( (char)r[0] ) )
+	{
+		r[0] = '_';
+	}
+	for ( int i = 1; i < len; i++ )
+	{
+		if ( !isalnum( (char)r[i] ) )
+		{
+			r[i] = '_';
+		}
+	}
+	return( r );
+}
+
+
+
+
+void embedData( const char * _input, int _nbytes, std::ostream & _output )
+{
+	static const char hexdigits[] = "0123456789abcdef";
+	std::string s;
+	for( int i = 0; i < _nbytes; i++ )
+	{
+		if( ( i%14 ) == 0 )
+		{
+			s += "\n    ";
+			_output << s;
+			s = "";
+		}
+		unsigned int v = _input[i];
+		s += "0x";
+		s += hexdigits[(v >> 4) & 15];
+		s += hexdigits[v & 15];
+		if( i < _nbytes-1 )
+		{
+			s += ',';
+		}
+	}
+	if ( s.length() )
+	{
+		_output << s;
+	}
+}
+

cmake/CMakeLists.txt

@@ -9,7 +9,7 @@ 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}")
+	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")

cmake/apple/CMakeLists.txt

@@ -9,11 +9,6 @@ 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}")
-SET(MACOSX_BUNDLE_DMG_TITLE             "${MACOSX_BUNDLE_BUNDLE_NAME} ${MACOSX_BUNDLE_LONG_VERSION_STRING}")
-
-# FIXME: appdmg won't allow volume names > 27 char
-# See also https://github.com/LinusU/node-appdmg/issues/48
-STRING(SUBSTRING "${MACOSX_BUNDLE_DMG_TITLE}" 0 27 MACOSX_BUNDLE_DMG_TITLE)
 
 CONFIGURE_FILE("lmms.plist.in"          "${CMAKE_BINARY_DIR}/Info.plist")
 CONFIGURE_FILE("install_apple.sh.in"    "${CMAKE_BINARY_DIR}/install_apple.sh" @ONLY)

cmake/apple/install_apple.sh.in

@@ -4,8 +4,13 @@
 #   Examine linkings using `otool -L somelib.so`
 #   Debug the loading of dynamic libraries using `export DYLD_PRINT_LIBRARIES=1`
 
-set -e
+# 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"
 
@@ -13,38 +18,54 @@ MSG_COLOR='\x1B[1;36m'
 COLOR_RESET='\x1B[0m'
 echo -e "$MSG_COLOR\n\nCreating App Bundle \"$APP\"...$COLOR_RESET"
 
-qtpath="$(dirname "@QT_QMAKE_EXECUTABLE@")"
-export PATH="$PATH:$qtpath"
-
+# 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
-command cp  "@CMAKE_BINARY_DIR@/Info.plist" "@CMAKE_INSTALL_PREFIX@/"
-
+\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 -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
+ 
+# 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
+# See also plugins/carlabase/CMakeLists.txt
 # This MUST be done BEFORE calling macdeployqt
 install_name_tool -change @rpath/libcarlabase.dylib \
    @loader_path/libcarlabase.dylib \
@@ -56,13 +77,14 @@ install_name_tool -change @rpath/libcarlabase.dylib \
 
 # 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##*/}"
@@ -70,7 +92,6 @@ for file in "$APP/Contents/lib/lmms/ladspa/"*.so; do
 done
 
 # Finalize .app
-# shellcheck disable=SC2086
 macdeployqt "$APP" $_executables
 
 # Carla is a standalone plugin.  Remove library, look for it side-by-side LMMS.app
@@ -87,7 +108,6 @@ for file in "$APP/Contents/lib/lmms/"libcarla*; do
    for lib in $carlalibs; do
      _oldpath="../../Frameworks/lib${lib}.dylib"
      _newpath="Carla.app/Contents/MacOS/lib${lib}.dylib"
-     # shellcheck disable=SC2086
      install_name_tool -change @loader_path/$_oldpath \
        @executable_path/../../../$_newpath \
        "$_thisfile"
@@ -97,8 +117,4 @@ done
 
 # Cleanup
 rm -rf "$APP/Contents/bin"
-
-# Codesign
-codesign --force --deep --sign - "$APP"
-
 echo -e "\nFinished.\n\n"

cmake/apple/package_apple.json.in

@@ -1,5 +1,5 @@
 {
- "title": "@MACOSX_BUNDLE_DMG_TITLE@",
+ "title": "@MACOSX_BUNDLE_BUNDLE_NAME@ @MACOSX_BUNDLE_LONG_VERSION_STRING@",
  "background": "@CMAKE_SOURCE_DIR@/cmake/apple/dmg_branding.png",
  "icon-size": 128,
  "contents": [

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/build_win32.sh

@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-# Accomodate both linux windows mingw locations
-if [ -z "$ARCH" ]; then
-	ARCH=32
-fi
-
-MINGW=/mingw$ARCH
-
-if [ -z "$MSYSCON" ]; then
-	MINGW=/opt$MINGW
-
-	DISTRO=$(lsb_release -si)
-	DISTRO_VERSION=$(lsb_release -sr)
-
-	if [ "$DISTRO" != "Ubuntu" ]; then
-		echo "This script only supports Ubuntu"
-		exit 1
-	fi
-
-	if [ "$DISTRO_VERSION" == "14.04" ]; then
-		TOOLCHAIN="$DIR/toolchains/Ubuntu-MinGW-X-Trusty-$ARCH.cmake"
-	else
-		TOOLCHAIN="$DIR/toolchains/Ubuntu-MinGW-W64-$ARCH.cmake"
-	fi
-else
-	TOOLCHAIN="$DIR/toolchains/MSYS-$ARCH.cmake"
-fi
-
-export PATH=$MINGW/bin:$PATH
-export CXXFLAGS="$CFLAGS"
-if [ "$ARCH" == "32" ]; then
-	export CFLAGS="-march=pentium3 -mtune=generic -mpreferred-stack-boundary=5 -mfpmath=sse"
-fi
-
-CMAKE_OPTS="-DCMAKE_PREFIX_PATH=$MINGW $CMAKE_OPTS"
-
-# shellcheck disable=SC2086
-cmake "$DIR/.." -DCMAKE_TOOLCHAIN_FILE="$TOOLCHAIN" $CMAKE_OPTS

cmake/build_win64.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-ARCH=64 "$DIR/build_win32.sh"

cmake/install/CMakeLists.txt

@@ -1,56 +0,0 @@
-SET(PLUGIN_FILES "")
-IF(LMMS_BUILD_WIN32)
-	INSTALL(FILES $<TARGET_FILE:Qt5::QWindowsIntegrationPlugin> DESTINATION platforms)
-ENDIF()
-
-IF(LMMS_BUILD_WIN32 OR LMMS_INSTALL_DEPENDENCIES)
-	include(InstallTargetDependencies)
-
-	# Collect directories to search for DLLs
-	GET_FILENAME_COMPONENT(QTBIN_DIR "${QT_QMAKE_EXECUTABLE}" PATH)
-	set(LIB_DIRS "${QTBIN_DIR}")
-
-	GET_PROPERTY(PLUGINS_BUILT GLOBAL PROPERTY PLUGINS_BUILT)
-
-	IF(LMMS_BUILD_WIN32)
-		SET(LMMS_DEP_DESTINATION ${BIN_DIR})
-		SET(PLUGIN_DEP_DESTINATION ${BIN_DIR})
-	ELSE()
-		SET(LMMS_DEP_DESTINATION ${LIB_DIR})
-		SET(PLUGIN_DEP_DESTINATION ${LIB_DIR})
-	ENDIF()
-
-	INSTALL_TARGET_DEPENDENCIES(
-			NAME "main_binary"
-			TARGETS lmms
-			DESTINATION "${LMMS_DEP_DESTINATION}"
-			LIB_DIRS  ${LIB_DIRS}
-	)
-
-	INSTALL_TARGET_DEPENDENCIES(
-			NAME "plugins"
-			TARGETS ${PLUGINS_BUILT}
-			DESTINATION ${PLUGIN_DEP_DESTINATION}
-			LIB_DIRS ${LIB_DIRS} "${PLUGIN_DIR}" "${PLUGIN_DIR}/optional"
-			SEARCH_PATHS "${PLUGIN_DIR}" "${PLUGIN_DIR}/optional"
-	)
-ENDIF()
-
-# Install STK rawwaves
-if(LMMS_HAVE_STK AND (LMMS_BUILD_WIN32 OR LMMS_BUILD_APPLE))
-	if(STK_RAWWAVE_ROOT)
-		file(GLOB RAWWAVES "${STK_RAWWAVE_ROOT}/*.raw")
-		install(FILES ${RAWWAVES} DESTINATION "${DATA_DIR}/stk/rawwaves")
-	else()
-		message(WARNING "Can't find STK rawwave root!")
-	endif()
-endif()
-
-IF(LMMS_BUILD_APPLE)
-	INSTALL(CODE "EXECUTE_PROCESS(COMMAND chmod u+x ${CMAKE_BINARY_DIR}/install_apple.sh)")
-	INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_BINARY_DIR}/install_apple.sh RESULT_VARIABLE EXIT_CODE)
-		IF(NOT EXIT_CODE EQUAL 0)
-			MESSAGE(FATAL_ERROR \"Execution of install_apple.sh failed\")
-		ENDIF()
-	")
-ENDIF()

cmake/install/excludelist-win

@@ -1,23 +0,0 @@
-# List of DLLs considered to be system libraries.
-# This is needed when cross-compiling for Windows.
-ADVAPI32.dll
-COMCTL32.dll
-comdlg32.dll
-dwmapi.dll
-GDI32.dll
-IMM32.dll
-KERNEL32.dll
-MPR.DLL
-msvcrt.dll
-ole32.dll
-OLEAUT32.dll
-OPENGL32.DLL
-SHELL32.dll
-USER32.dll
-UxTheme.dll
-VERSION.dll
-WINMM.DLL
-WS2_32.dll
-RPCRT4.dll
-dsound.dll
-SETUPAPI.dll

cmake/linux/CMakeLists.txt

@@ -14,6 +14,5 @@ ADD_CUSTOM_TARGET(removeappimage
 ADD_CUSTOM_TARGET(appimage 
 	COMMAND chmod +x "${CMAKE_BINARY_DIR}/package_linux.sh"
 	COMMAND "${CMAKE_BINARY_DIR}/package_linux.sh"
-	COMMENT "Generating AppImage"
-	WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
+	COMMENT "Generating AppImage")
 ADD_DEPENDENCIES(appimage removeappimage)

cmake/linux/launch_lmms.sh

@@ -4,21 +4,21 @@ export PATH="$PATH:/sbin"
 if command -v carla > /dev/null 2>&1; then
    CARLAPATH="$(command -v carla)"
    CARLAPREFIX="${CARLAPATH%/bin*}"
-   echo "Carla appears to be installed on this system at $CARLAPREFIX/lib[64]/carla so we'll use it." >&2
+   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." >&2
+   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." >&2
+   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." >&2
+   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." >&2
+   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 "$@"

cmake/linux/lmms.desktop

@@ -4,11 +4,9 @@ GenericName=Music production suite
 GenericName[ca]=Programari de producció musical
 GenericName[de]=Software zur Musik-Produktion
 GenericName[fr]=Suite de production musicale
-GenericName[pl]=Narzędzia do produkcji muzyki
 Comment=Music sequencer and synthesizer
 Comment[ca]=Producció fàcil de música per a tothom!
 Comment[fr]=Séquenceur et synthétiseur de musique
-Comment[pl]=Prosta produkcja muzyki dla każdego!
 Icon=lmms
 Exec=lmms %f
 Terminal=false

cmake/linux/package_linux.sh.in

@@ -6,6 +6,9 @@
 # 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/"
@@ -13,7 +16,6 @@ DESKTOPFILE="${APPDIR}usr/share/applications/lmms.desktop"
 STRIP=""
 
 # Don't strip for Debug|RelWithDebInfo builds
-# shellcheck disable=SC2193
 if [[ "@CMAKE_BUILD_TYPE@" == *"Deb"* ]]; then
 	STRIP="-no-strip"
 fi
@@ -37,21 +39,8 @@ function skipped {
 	echo -e "   ${PLAIN}[${YELLOW}skipped${PLAIN}] ${1}"
 }
 
-# Exit with error message if any command fails
-trap "error 'Failed to generate AppImage'; exit 1" ERR
-
-# Run a command silently, but print output if it fails
-function run_and_log {
-	echo -e "\n\n>>>>> $1" >> "$LOGFILE"
-	output="$("$@" 2>&1)"
-	status=$?
-	echo "$output" >> "$LOGFILE"
-	[[ $status != 0 ]] && echo "$output"
-	return $status
-}
-
 # Blindly assume system arch is appimage arch
-ARCH=$(uname -m)
+ARCH=$(arch)
 export ARCH
 
 # Check for problematic install locations
@@ -60,39 +49,33 @@ 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
-PATH="$(dirname "@QT_QMAKE_EXECUTABLE@"):$PATH"
-export PATH
+export PATH="$(pwd -P)/squashfs-root/usr/bin:$(dirname "@QT_QMAKE_EXECUTABLE@")":$PATH
 
-# Use linuxdeployqt from env or in PATH
-[[ $LINUXDEPLOYQT ]] || LINUXDEPLOYQT="$(which linuxdeployqt 2>/dev/null)" || true
-[[ $APPIMAGETOOL ]] || APPIMAGETOOL="$(which appimagetool 2>/dev/null)" || true
-
-# Fetch portable linuxdeployqt if not in PATH
-if [[ -z $LINUXDEPLOYQT || -z $APPIMAGETOOL ]]; then
-	filename="linuxdeployqt-continuous-$ARCH.AppImage"
-	url="https://github.com/probonopd/linuxdeployqt/releases/download/continuous/$filename"
-	echo "   [.......] Downloading: ${url}"
-	wget -N -q "$url" && err=0 || err=$?
-	case "$err" in
-		0) success "Downloaded $PWD/$filename" ;;
-		# 8 == server issued 4xx error
-		8) error "Download failed (perhaps no package available for $ARCH)" ;;
-		*) error "Download failed" ;;
-	esac
-
-	# Extract AppImage and replace LINUXDEPLOYQT variable with extracted binary
-	# to support systems without fuse
-	# Also, we need to set LD_LIBRARY_PATH, but linuxdepoyqt's AppRun unsets it
+# 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
+	# We need to set LD_LIBRARY_PATH, but linuxdepoyqt's AppRun unsets it
 	# See https://github.com/probonopd/linuxdeployqt/pull/370/
-	chmod +x "$filename"
-	./"$filename" --appimage-extract >/dev/null
-	success "Extracted $filename"
-
-	# Use the extracted linuxdeployqt and appimagetool
-	PATH="$(pwd -P)/squashfs-root/usr/bin:$PATH"
-	[[ $LINUXDEPLOYQT ]] || LINUXDEPLOYQT="$(which linuxdeployqt)"
-	[[ $APPIMAGETOOL ]] || APPIMAGETOOL="$(which appimagetool)"
+	LINUXDEPLOYQT="squashfs-root/usr/bin/linuxdeployqt"
+	success "Extracted $APPIMAGETOOL"
+else
+	skipped "$LINUXDEPLOYQT is less than $DAYSOLD days old"
 fi
 
 # Make skeleton AppDir
@@ -122,34 +105,25 @@ chmod +x "${APPDIR}usr/bin/lmms"
 unset LD_LIBRARY_PATH
 
 # Ensure linuxdeployqt can find shared objects
-export LD_LIBRARY_PATH="${APPDIR}"usr/lib/lmms/:"${APPDIR}"usr/lib/lmms/optional:"$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH="${APPDIR}usr/lib/lmms/":"${APPDIR}usr/lib/lmms/optional":$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"
-VSTLIB32="${APPDIR}usr/lib/lmms/32/RemoteVstPlugin32.exe.so"
-VSTLIB64="${APPDIR}usr/lib/lmms/RemoteVstPlugin64.exe.so"
+VSTLIB="${APPDIR}usr/lib/lmms/RemoteVstPlugin.exe.so"
 
 ZYNBIN="${APPDIR}usr/bin/RemoteZynAddSubFx"
-VSTBIN32="${APPDIR}usr/bin/RemoteVstPlugin32.exe.so"
-VSTBIN64="${APPDIR}usr/bin/RemoteVstPlugin64.exe.so"
+VSTBIN="${APPDIR}usr/bin/RemoteVstPlugin.exe.so"
 
 mv "$ZYNLIB" "$ZYNBIN"
-mv "$VSTLIB32" "$VSTBIN32" || true
-mv "$VSTLIB64" "$VSTBIN64" || true
-
-# Handle wine linking
-if [ -d "@WINE_32_LIBRARY_DIR@" ] && \
-		ldd "$VSTBIN32" | grep "libwine\.so" | grep "not found"; then
-   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"@WINE_32_LIBRARY_DIRS@"
-fi
-if [ -d "@WINE_64_LIBRARY_DIR@" ] && \
-		ldd "$VSTBIN64" | grep "libwine\.so" | grep "not found"; then
-   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"@WINE_64_LIBRARY_DIRS@"
-fi
+mv "$VSTLIB" "$VSTBIN" || true
 
 # Patch the desktop file
 sed -i 's/.*Exec=.*/Exec=lmms.real/' "$DESKTOPFILE"
-echo "X-AppImage-Version=@VERSION@" >> "$DESKTOPFILE"
 
 # Fix linking for soft-linked plugins
 for file in "${APPDIR}usr/lib/lmms/"*.so; do
@@ -157,27 +131,22 @@ for file in "${APPDIR}usr/lib/lmms/"*.so; do
    executables="${executables} -executable=$thisfile"
 done
 executables="${executables} -executable=${ZYNBIN}"
-executables="${executables} -executable=${VSTBIN32}"
-executables="${executables} -executable=${VSTBIN64}"
+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"
 
-echo -e "\nWriting verbose output to \"${LOGFILE}\""
-echo -n > "$LOGFILE"
-
 # Bundle both qt and non-qt dependencies into appimage format
 echo -e "\nBundling and relinking system dependencies..."
-
+echo -e ">>>>> linuxdeployqt" > "$LOGFILE"
 # shellcheck disable=SC2086
-run_and_log "$LINUXDEPLOYQT" "$DESKTOPFILE" $executables -bundle-non-qt-libs -verbose=$VERBOSITY $STRIP
+"$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  "$VSTBIN32" "$VSTLIB32" || true
-ln -sr  "$VSTBIN64" "$VSTLIB64" || true
+ln -sr  "$VSTBIN" "$VSTLIB" || true
 
 # Remove wine library conflict
 rm -f "${APPDIR}/usr/lib/libwine.so.1"
@@ -202,12 +171,10 @@ fi
 rm -f "${APPDIR}/AppRun"
 ln -sr "${APPDIR}/usr/bin/lmms" "${APPDIR}/AppRun"
 
-# Add icon
-ln -srf "${APPDIR}/lmms.png" "${APPDIR}/.DirIcon"
-
 # Create AppImage
 echo -e "\nFinishing the AppImage..."
-run_and_log "$APPIMAGETOOL" "${APPDIR}" "@APPIMAGE_FILE@"
+echo -e "\n\n>>>>> appimagetool" >> "$LOGFILE"
+"$APPIMAGETOOL" "${APPDIR}" "@APPIMAGE_FILE@" >> "$LOGFILE" 2>&1
 success "Created @APPIMAGE_FILE@"
 
 echo -e "\nFinished"

cmake/modules/BashCompletion.cmake

@@ -24,7 +24,7 @@
 # - Windows does not support bash completion
 # - macOS support should eventually be added for Homebrew (TODO)
 IF(WIN32)
-	MESSAGE(STATUS "Bash completion is not supported on this platform.")
+	MESSAGE(STATUS "Bash competion is not supported on this platform.")
 ELSEIF(APPLE)
 	MESSAGE(STATUS "Bash completion is not yet implemented for this platform.")
 ELSE()

cmake/modules/BuildPlugin.cmake

@@ -3,13 +3,11 @@
 # 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> LINK <SHARED|MODULE>)
 
-INCLUDE(GenQrc)
-
 MACRO(BUILD_PLUGIN PLUGIN_NAME)
-	CMAKE_PARSE_ARGUMENTS(PLUGIN "" "LINK;EXPORT_BASE_NAME" "MOCFILES;EMBEDDED_RESOURCES;UICFILES" ${ARGN})
+	CMAKE_PARSE_ARGUMENTS(PLUGIN "" "" "MOCFILES;EMBEDDED_RESOURCES;UICFILES;LINK" ${ARGN})
 	SET(PLUGIN_SOURCES ${PLUGIN_UNPARSED_ARGUMENTS})
 
-	INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_SOURCE_DIR}/include")
+	INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_SOURCE_DIR}/include" "${CMAKE_SOURCE_DIR}/src/gui")
 
 	ADD_DEFINITIONS(-DPLUGIN_NAME=${PLUGIN_NAME})
 
@@ -27,14 +25,23 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME)
 		ENDFOREACH()
 		SET(PLUGIN_EMBEDDED_RESOURCES ${NEW_ARGS})
 
-		ADD_GEN_QRC(RCC_OUT "${PLUGIN_NAME}.qrc" PREFIX artwork/${PLUGIN_NAME} ${PLUGIN_EMBEDDED_RESOURCES})
+		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)
 	ENDIF(ER_LEN)
 
-	QT5_WRAP_CPP(plugin_MOC_out ${PLUGIN_MOCFILES})
-	QT5_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} ${RCC_OUT} ${plugin_UIC_out})
+		ADD_FILE_DEPENDENCIES(${f} ${ER_H} ${plugin_UIC_out})
 	ENDFOREACH(f)
 
 	IF(LMMS_BUILD_APPLE)
@@ -50,49 +57,38 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME)
 		SET(QT_LIBRARIES "${QT_OVERRIDE_LIBRARIES}")
 	ENDIF()
 
-	IF (NOT PLUGIN_LINK)
-		SET(PLUGIN_LINK "MODULE")
+	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} ${PLUGIN_LINK} ${PLUGIN_SOURCES} ${plugin_MOC_out} ${RCC_OUT})
-
-	target_link_libraries("${PLUGIN_NAME}" lmms Qt5::Widgets Qt5::Xml)
-
-	INSTALL(TARGETS ${PLUGIN_NAME}
-		LIBRARY DESTINATION "${PLUGIN_DIR}"
-		RUNTIME DESTINATION "${PLUGIN_DIR}"
-	)
+	IF(LMMS_BUILD_WIN32 AND "${PLUGIN_LINK}" STREQUAL "SHARED")
+		INSTALL(TARGETS ${PLUGIN_NAME} RUNTIME DESTINATION "${PLUGIN_DIR}")
+	ELSE()
+		INSTALL(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION "${PLUGIN_DIR}")
+	ENDIF()
 
 	IF(LMMS_BUILD_APPLE)
 		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)
-		add_custom_command(
-			TARGET "${PLUGIN_NAME}"
-			POST_BUILD
-			COMMAND "${STRIP_COMMAND}" "$<TARGET_FILE:${PLUGIN_NAME}>"
-			VERBATIM
-			COMMAND_EXPAND_LISTS
-		)
 		SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES PREFIX "")
-	ENDIF()
+		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 "${RCC_OUT} ${plugin_MOC_out}")
-
-	IF(NOT PLUGIN_EXPORT_BASE_NAME)
-		SET(PLUGIN_EXPORT_BASE_NAME "PLUGIN")
-	ENDIF()
-
-	GENERATE_EXPORT_HEADER(${PLUGIN_NAME}
-		BASE_NAME ${PLUGIN_EXPORT_BASE_NAME}
-	)
-	TARGET_INCLUDE_DIRECTORIES(${PLUGIN_NAME}
-		PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
-	)
-
-	SET_PROPERTY(GLOBAL APPEND PROPERTY PLUGINS_BUILT ${PLUGIN_NAME})
-	GET_PROPERTY(PLUGINS_BUILT GLOBAL PROPERTY PLUGINS_BUILT)
+	SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${ER_H} ${plugin_MOC_out}")
 ENDMACRO(BUILD_PLUGIN)
 

cmake/modules/CheckCXXPreprocessor.cmake

@@ -1,33 +0,0 @@
-
-macro(CHECK_CXX_PREPROCESSOR VAR DIRECTIVE)
-	string(RANDOM DEFINED_KEY)
-	string(RANDOM UNDEFINED_KEY)
-
-	set(TMP_FILENAME "${CMAKE_CURRENT_BINARY_DIR}/CxxTmp/src.cpp")
-	SET(SRC "
-		#if ${DIRECTIVE}
-		#error ${DEFINED_KEY}
-		#else
-		#error ${UNDEFINED_KEY}
-		#endif
-		")
-	file(WRITE ${TMP_FILENAME} "${SRC}")
-	try_compile(RESULT_VAR
-		${CMAKE_CURRENT_BINARY_DIR}
-		${TMP_FILENAME}
-		OUTPUT_VARIABLE OUTPUT_VAR
-	)
-
-	if(OUTPUT_VAR MATCHES ${DEFINED_KEY})
-		set(${VAR} ON)
-	elseif(OUTPUT_VAR MATCHES ${UNDEFINED_KEY})
-		set(${VAR} OFF)
-	else()
-		message(FATAL_ERROR "Can't determine if \"${DIRECTIVE}\" is true.")
-	endif()
-endmacro()
-
-
-macro(CHECK_CXX_DEFINE VAR DEFINE)
-	CHECK_CXX_PREPROCESSOR(${VAR} "defined(${DEFINE})")
-endmacro()

cmake/modules/CheckSubmodules.cmake

@@ -1,213 +0,0 @@
-# Utility for validating and, if needed, cloning all submodules
-#
-# Looks for a .gitmodules in the root project folder
-# Loops over all modules looking well-known configure/build scripts
-#
-# Usage:
-#       INCLUDE(CheckSubmodules)
-#
-# Options:
-#       SET(PLUGIN_LIST "ZynAddSubFx;...") # skips submodules for plugins not explicitely listed
-#
-# Or via command line:       
-#       cmake -PLUGIN_LIST=foo;bar
-#
-# Copyright (c) 2019, 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.
-
-# Files which confirm a successful clone
-SET(VALID_CRUMBS "CMakeLists.txt;Makefile;Makefile.in;Makefile.am;configure.ac;configure.py;autogen.sh;.gitignore;LICENSE;Home.md;license.txt")
-
-OPTION(NO_SHALLOW_CLONE "Disable shallow cloning of submodules" OFF)
-
-# Try and use the specified shallow clone on submodules, if supported
-SET(DEPTH_VALUE 100)
-
-# Number of times git commands will retry before failing
-SET(MAX_ATTEMPTS 2)
-
-MESSAGE("\nChecking submodules...")
-IF(NOT EXISTS "${CMAKE_SOURCE_DIR}/.gitmodules")
-	MESSAGE("Skipping the check because .gitmodules not detected."
-		"Please make sure you have all submodules in the source tree!"
-	)
-	RETURN()
-ENDIF()
-FILE(READ "${CMAKE_SOURCE_DIR}/.gitmodules" SUBMODULE_DATA)
-
-# Force English locale
-SET(LC_ALL_BACKUP "$ENV{LC_ALL}")
-SET(LANG_BACKUP "$ENV{LANG}")
-SET(ENV{LC_ALL} "C")
-SET(ENV{LANG} "en_US")
-
-# Submodule list pairs, unparsed (WARNING: Assumes alpha-numeric paths)
-STRING(REGEX MATCHALL "path = [-0-9A-Za-z/]+" SUBMODULE_LIST_RAW ${SUBMODULE_DATA})
-STRING(REGEX MATCHALL "url = [.:%-0-9A-Za-z/]+" SUBMODULE_URL_RAW ${SUBMODULE_DATA})
-
-# Submodule list pairs, parsed
-SET(SUBMODULE_LIST "")
-SET(SUBMODULE_URL "")
-
-FOREACH(_path ${SUBMODULE_LIST_RAW})
-	# Parse SUBMODULE_PATH
-	STRING(REPLACE "path = " "" SUBMODULE_PATH "${_path}")
-
-	# Grab index for matching SUBMODULE_URL
-	LIST(FIND SUBMODULE_LIST_RAW "${_path}" SUBMODULE_INDEX)
-	LIST(GET SUBMODULE_URL_RAW ${SUBMODULE_INDEX} _url)
-
-	# Parse SUBMODULE_URL
-	STRING(REPLACE "url = " "" SUBMODULE_URL "${_url}")
-
-	SET(SKIP false)
-
-	# Loop over skipped plugins, add to SKIP_SUBMODULES (e.g. -DPLUGIN_LIST=foo;bar)
-	IF(${SUBMODULE_PATH} MATCHES "^plugins/")
-		SET(REMOVE_PLUGIN true)
-		FOREACH(_plugin ${PLUGIN_LIST})
-			IF(_plugin STREQUAL "")
-				CONTINUE()
-			ENDIF()
-			IF(${SUBMODULE_PATH} MATCHES "${_plugin}")
-				SET(REMOVE_PLUGIN false)
-			ENDIF()
-		ENDFOREACH()
-
-		IF(REMOVE_PLUGIN)
-			LIST(APPEND SKIP_SUBMODULES "${SUBMODULE_PATH}")
-		ENDIF()
-	ENDIF()
-
-	# Finally, loop and mark "SKIP" on match
-	IF(SKIP_SUBMODULES)
-		FOREACH(_skip ${SKIP_SUBMODULES})
-			IF("${SUBMODULE_PATH}" MATCHES "${_skip}")
-				MESSAGE("-- Skipping ${SUBMODULE_PATH} matches \"${_skip}\" (absent in PLUGIN_LIST)")
-				SET(SKIP true)
-				BREAK()
-			ENDIF()
-		ENDFOREACH()
-	ENDIF()
-
-	IF(NOT SKIP)
-		LIST(APPEND SUBMODULE_LIST "${SUBMODULE_PATH}")
-		LIST(APPEND SUBMODULE_URL "${SUBMODULE_URL}")
-	ENDIF()
-ENDFOREACH()
-
-# Once called, status is stored in GIT_RESULT respectively.
-# Note: Git likes to write to stderr.  Don't assume stderr is error; Check GIT_RESULT instead.
-MACRO(GIT_SUBMODULE SUBMODULE_PATH FORCE_DEINIT FORCE_REMOTE NO_DEPTH)
-	FIND_PACKAGE(Git REQUIRED)
-	# Handle missing commits
-	SET(FORCE_REMOTE_FLAG "${FORCE_REMOTE}")
-	SET(NO_DEPTH_FLAG "${NO_DEPTH}")
-	IF(FORCE_REMOTE_FLAG)
-		MESSAGE("--   Adding remote submodulefix to ${SUBMODULE_PATH}")
-		EXECUTE_PROCESS(
-			COMMAND "${GIT_EXECUTABLE}" remote rm submodulefix
-			COMMAND "${GIT_EXECUTABLE}" remote add submodulefix ${FORCE_REMOTE}
-			COMMAND "${GIT_EXECUTABLE}" fetch submodulefix
-			WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/${SUBMODULE_PATH}"
-			OUTPUT_QUIET ERROR_QUIET
-		)
-		# Recurse
-		GIT_SUBMODULE(${SUBMODULE_PATH} false false ${NO_DEPTH_FLAG})
-	ELSEIF(${FORCE_DEINIT})
-		MESSAGE("--   Resetting ${SUBMODULE_PATH}")
-		EXECUTE_PROCESS(
-			COMMAND "${GIT_EXECUTABLE}" submodule deinit -f "${CMAKE_SOURCE_DIR}/${SUBMODULE_PATH}"
-			WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-			OUTPUT_QUIET
-		)
-		MESSAGE("--   Deleting ${CMAKE_SOURCE_DIR}/.git/${SUBMODULE_PATH}")
-		FILE(REMOVE_RECURSE "${CMAKE_SOURCE_DIR}/.git/modules/${SUBMODULE_PATH}")
-		# Recurse without depth
-		GIT_SUBMODULE(${SUBMODULE_PATH} false false true)
-	ELSE()
-		# Try to use the depth switch
-		IF(NO_SHALLOW_CLONE OR GIT_VERSION_STRING VERSION_LESS "1.8.4" OR NO_DEPTH_FLAG)
-			# Shallow submodules were introduced in 1.8.4
-			MESSAGE("--   Fetching ${SUBMODULE_PATH}")
-			SET(DEPTH_CMD "")
-			SET(DEPTH_VAL "")
-		ELSE()
-			MESSAGE("--   Fetching ${SUBMODULE_PATH} @ --depth ${DEPTH_VALUE}")
-			SET(DEPTH_CMD "--depth")
-			SET(DEPTH_VAL "${DEPTH_VALUE}")
-		ENDIF()
-		
-		EXECUTE_PROCESS(
-			COMMAND "${GIT_EXECUTABLE}" submodule update --init --recursive ${DEPTH_CMD} ${DEPTH_VAL} "${CMAKE_SOURCE_DIR}/${SUBMODULE_PATH}"
-			WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-			RESULT_VARIABLE GIT_RESULT
-			OUTPUT_VARIABLE GIT_STDOUT
-			ERROR_VARIABLE GIT_STDERR
-		)
-
-		SET(GIT_MESSAGE "${GIT_STDOUT}${GIT_STDERR}")
-		MESSAGE("${GIT_MESSAGE}")
-	ENDIF()
-ENDMACRO()
-
-SET(MISSING_COMMIT_PHRASES "no such remote ref;reference is not a tree;unadvertised object")
-SET(RETRY_PHRASES "Failed to recurse;cannot create directory;already exists;${MISSING_COMMIT_PHRASES}")
-
-# Attempt to do lazy clone
-FOREACH(_submodule ${SUBMODULE_LIST})
-	STRING(REPLACE "/" ";" PATH_PARTS "${_submodule}")
-	LIST(REVERSE PATH_PARTS)
-	LIST(GET PATH_PARTS 0 SUBMODULE_NAME)
-
-	MESSAGE("-- Checking ${SUBMODULE_NAME}...")
-	SET(CRUMB_FOUND false)
-	FOREACH(_crumb ${VALID_CRUMBS})
-		IF(EXISTS "${CMAKE_SOURCE_DIR}/${_submodule}/${_crumb}")
-			SET(CRUMB_FOUND true)
-			MESSAGE("--   Found ${_submodule}/${_crumb}")
-			BREAK()
-		ENDIF()
-	ENDFOREACH()
-	IF(NOT CRUMB_FOUND)
-		GIT_SUBMODULE("${_submodule}" false false false)
-
-		SET(COUNTED 0)
-		# Handle edge-cases where submodule didn't clone properly or re-uses a non-empty directory
-		WHILE(NOT GIT_RESULT EQUAL 0 AND COUNTED LESS MAX_ATTEMPTS)
-			MATH(EXPR COUNTED "${COUNTED}+1")
-			SET(MISSING_COMMIT false)
-			FOREACH(_phrase ${MISSING_COMMIT_PHRASES})
-				IF("${GIT_MESSAGE}" MATCHES "${_phrase}")
-					SET(MISSING_COMMIT true)
-					BREAK()
-				ENDIF()
-			ENDFOREACH()
-			FOREACH(_phrase ${RETRY_PHRASES})
-				IF(${MISSING_COMMIT} AND COUNTED LESS 2)
-					LIST(FIND SUBMODULE_LIST ${_submodule} SUBMODULE_INDEX)
-					LIST(GET SUBMODULE_URL_LIST ${SUBMODULE_INDEX} SUBMODULE_URL)
-					MESSAGE("--   Retrying ${_submodule} using 'remote add submodulefix' (attempt ${COUNTED} of ${MAX_ATTEMPTS})...")
-					
-					GIT_SUBMODULE("${_submodule}" false "${SUBMODULE_URL}" false)
-					BREAK()
-				ELSEIF("${GIT_MESSAGE}" MATCHES "${_phrase}")
-					MESSAGE("--   Retrying ${_submodule} using 'deinit' (attempt ${COUNTED} of ${MAX_ATTEMPTS})...")
-					GIT_SUBMODULE("${_submodule}" true false false)
-					BREAK()
-				ENDIF()
-			ENDFOREACH()
-		ENDWHILE()
-
-		IF(NOT GIT_RESULT EQUAL 0)
-			MESSAGE(FATAL_ERROR "${GIT_EXECUTABLE} exited with status of ${GIT_RESULT}")
-		ENDIF()
-	ENDIF()
-ENDFOREACH()
-MESSAGE("-- Done validating submodules.\n")
-
-# Reset locale
-SET(ENV{LC_ALL} "${LC_ALL_BACKUP}")
-SET(ENV{LANG} "${LANG_BACKUP}")

cmake/modules/CheckWineGcc.cmake

@@ -1,27 +0,0 @@
-INCLUDE(CheckCXXSourceCompiles)
-
-FUNCTION(CheckWineGcc BITNESS WINEGCC_EXECUTABLE RESULT)
-	FILE(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/winegcc_test.cxx" "
-	#include <iostream>
-	#define USE_WS_PREFIX
-	#include <windows.h>
-	int main(int argc, const char* argv[]) {
-		return 0;
-	}
-	")
-	EXECUTE_PROCESS(COMMAND ${WINEGCC_EXECUTABLE} "-m${BITNESS}"
-		"${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/winegcc_test.cxx"
-		"-o" "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/winegcc_test"
-		OUTPUT_QUIET ERROR_QUIET
-		RESULT_VARIABLE WINEGCC_RESULT
-	)
-	FILE(REMOVE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/winegcc_test.cxx"
-		"${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/winegcc_test"
-		"${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/winegcc_test.exe.so"
-	)
-	IF(WINEGCC_RESULT EQUAL 0)
-		SET(${RESULT} True PARENT_SCOPE)
-	ELSE()
-		SET(${RESULT} False PARENT_SCOPE)
-	ENDIF()
-ENDFUNCTION()

cmake/modules/CompileCache.cmake

@@ -1,40 +0,0 @@
-option(USE_COMPILE_CACHE "Use a compiler cache for compilation" OFF)
-
-# Compatibility for old option name
-if(USE_CCACHE)
-	set(USE_COMPILE_CACHE ON)
-endif()
-
-if(NOT USE_COMPILE_CACHE)
-	return()
-endif()
-
-if(NOT CMAKE_CXX_COMPILER_ID MATCHES "(GNU|AppleClang|Clang|MSVC)")
-	message(WARNING "Compiler cache only available with MSVC or GNU")
-	return()
-endif()
-
-set(CACHE_TOOL_NAME ccache)
-find_program(CACHE_TOOL "${CACHE_TOOL_NAME}")
-if(NOT CACHE_TOOL)
-	message(WARNING "USE_COMPILE_CACHE enabled, but no ${CACHE_TOOL_NAME} found")
-	return()
-endif()
-
-if(MSVC)
-	# ccache doesn't support debug information in the PDB format. Setting the
-	# debug information format requires CMP0141, introduced with CMake 3.25, to
-	# be set to NEW prior to the initial `project` command.
-	if(CMAKE_VERSION VERSION_LESS "3.25")
-		message(WARNING "Use of compiler cache with MSVC requires at least CMake 3.25")
-		return()
-	endif()
-
-	set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<$<CONFIG:Debug,RelWithDebInfo>:Embedded>")
-endif()
-
-message(STATUS "Using ${CACHE_TOOL} for compiler caching")
-
-# TODO CMake 3.21: Use CMAKE_<LANG>_<COMPILER|LINKER>_LAUNCHER variables instead
-set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CACHE_TOOL}")
-set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "${CACHE_TOOL}")

cmake/modules/CreateTempFile.cmake

@@ -1,21 +0,0 @@
-function(CreateTempFilePath)
-    set(options CONFIG_SUFFIX)
-    set(oneValueArgs OUTPUT_VAR TAG)
-    set(multiValueArgs CONTENT)
-    cmake_parse_arguments(TEMP "${options}" "${oneValueArgs}"
-            "${multiValueArgs}" ${ARGN} )
-
-    # Use hash to create a unique identifier
-    # for this file.
-    string(SHA1 hashed_content "${TEMP_CONTENT}")
-
-    set(file_name "${CMAKE_BINARY_DIR}/${TEMP_TAG}_${hashed_content}")
-    set(${TEMP_OUTPUT_VAR} "${file_name}" PARENT_SCOPE)
-    if(TEMP_CONFIG_SUFFIX)
-        set(file_name "${file_name}_$<CONFIG>")
-    endif()
-
-    file(GENERATE OUTPUT "${file_name}"
-            CONTENT "${TEMP_CONTENT}")
-
-endfunction()

cmake/modules/DefineInstallVar.cmake

@@ -1,31 +0,0 @@
-# This functions forwards a variable to
-# the install stage.
-# Parameters:
-#   CONTENT: Variable content.
-#   NAME: Variable name.
-# Options:
-#   GENERATOR_EXPRESSION: Support generator expression for CONTENT.
-function(DEFINE_INSTALL_VAR)
-    set(options GENERATOR_EXPRESSION)
-    set(oneValueArgs NAME )
-    set(multiValueArgs CONTENT)
-    cmake_parse_arguments(VAR "${options}" "${oneValueArgs}"
-            "${multiValueArgs}" ${ARGN} )
-
-    # install(CODE) does not support generator expression in ver<3.14
-    if(VAR_GENERATOR_EXPRESSION AND ${CMAKE_VERSION} VERSION_LESS "3.14.0")
-        include(CreateTempFile)
-        if(CMAKE_CONFIGURATION_TYPES) # in case of multi-config generators like MSVC generators
-            CreateTempFilePath(OUTPUT_VAR file_path TAG "${VAR_NAME}" CONTENT "${VAR_CONTENT}" CONFIG_SUFFIX)
-            install(CODE "file(READ \"${file_path}_\${CMAKE_INSTALL_CONFIG_NAME}\" \"${VAR_NAME}\")")
-        else()
-            CreateTempFilePath(OUTPUT_VAR file_path TAG "${VAR_NAME}" CONTENT "${VAR_CONTENT}")
-            install(CODE "file(READ \"${file_path}\" \"${VAR_NAME}\")")
-        endif()
-    else()
-        if(VAR_GENERATOR_EXPRESSION)
-            cmake_policy(SET CMP0087 NEW) # install(CODE) and install(SCRIPT) support generator expressions.
-        endif()
-        install(CODE "set(\"${VAR_NAME}\" \"${VAR_CONTENT}\")")
-    endif()
-endfunction()

cmake/modules/DetectMachine.cmake

@@ -12,87 +12,22 @@ ELSE()
 	SET(LMMS_BUILD_LINUX 1)
 ENDIF(WIN32)
 
-# LMMS_BUILD_MSYS also set in build_winXX.sh
-IF(LMMS_BUILD_WIN32 AND CMAKE_COMPILER_IS_GNUCXX AND DEFINED ENV{MSYSCON})
-	SET(LMMS_BUILD_MSYS TRUE)
-ENDIF()
+# See build_mingwXX.sh for LMMS_BUILD_MSYS
 
 MESSAGE("PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}")
 SET(LMMS_HOST_X86 FALSE)
 SET(LMMS_HOST_X86_64 FALSE)
-SET(LMMS_HOST_ARM32 FALSE)
-SET(LMMS_HOST_ARM64 FALSE)
-SET(LMMS_HOST_RISCV32 FALSE)
-SET(LMMS_HOST_RISCV64 FALSE)
-
-IF(NOT DEFINED WIN64 AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-	# TODO: This seems a bit presumptous
-	SET(WIN64 ON)
-ENDIF()
 
 IF(WIN32)
-	if(MSVC)
-		SET(MSVC_VER ${CMAKE_CXX_COMPILER_VERSION})
-
-		# Detect target architecture
-		IF(CMAKE_GENERATOR_PLATFORM)
-			STRING(TOLOWER "${CMAKE_GENERATOR_PLATFORM}" MSVC_TARGET_PLATFORM)
-		ELSE()
-			STRING(TOLOWER "${CMAKE_VS_PLATFORM_NAME_DEFAULT}" MSVC_TARGET_PLATFORM)
-		ENDIF()
-
-		IF(MSVC_TARGET_PLATFORM MATCHES "x64")
-			SET(IS_X86_64 TRUE)
-			SET(LMMS_BUILD_WIN64 TRUE)
-		ELSEIF(MSVC_TARGET_PLATFORM MATCHES "win32")
-			SET(IS_X86 TRUE)
-		ELSEIF(MSVC_TARGET_PLATFORM MATCHES "arm64")
-			SET(IS_ARM64 TRUE)
-		ELSEIF(MSVC_TARGET_PLATFORM MATCHES "arm")
-			SET(IS_ARM32 TRUE)
-		ELSEIF(CMAKE_CXX_COMPILER MATCHES "amd64/cl.exe$" OR CMAKE_CXX_COMPILER MATCHES "x64/cl.exe$")
-			SET(IS_X86_64 TRUE)
-			SET(LMMS_BUILD_WIN64 TRUE)
-		ELSEIF(CMAKE_CXX_COMPILER MATCHES "bin/cl.exe$" OR CMAKE_CXX_COMPILER MATCHES "x86/cl.exe$")
-			SET(IS_X86 TRUE)
-		ELSEIF(CMAKE_CXX_COMPILER MATCHES "arm64/cl.exe$")
-			SET(IS_ARM64 TRUE)
-		ELSEIF(CMAKE_CXX_COMPILER MATCHES "arm/cl.exe$")
-			SET(IS_ARM32 TRUE)
-		ELSE()
-			MESSAGE(WARNING "Unknown target architecture: ${MSVC_TARGET_PLATFORM}")
-		ENDIF()
-
-		IF(MSVC_VER VERSION_GREATER 19.30 OR MSVC_VER VERSION_EQUAL 19.30)
-			SET(LMMS_MSVC_GENERATOR "Visual Studio 17 2022")
-			SET(LMMS_MSVC_YEAR 2022)
-		ELSEIF(MSVC_VER VERSION_GREATER 19.20 OR MSVC_VER VERSION_EQUAL 19.20)
-			SET(LMMS_MSVC_GENERATOR "Visual Studio 16 2019")
-			SET(LMMS_MSVC_YEAR 2019) # Qt only provides binaries for MSVC 2017, but 2019 is binary compatible
-		ELSEIF(MSVC_VER VERSION_GREATER 19.10 OR MSVC_VER VERSION_EQUAL 19.10)
-			SET(LMMS_MSVC_GENERATOR "Visual Studio 15 2017")
-			SET(LMMS_MSVC_YEAR 2017)
-		ELSEIF(MSVC_VER VERSION_GREATER 19.0 OR MSVC_VER VERSION_EQUAL 19.0)
-			SET(LMMS_MSVC_GENERATOR "Visual Studio 14 2015")
-			SET(LMMS_MSVC_YEAR 2015)
-		ELSE()
-			MESSAGE(SEND_WARNING "Can't detect MSVC version: ${MSVC_VER}")
-		ENDIF()
-
-		unset(MSVC_VER)
-	else()
-		# Cross-compiled
-		# TODO: Handle Windows ARM64 targets
-		IF(WIN64)
-			SET(IS_X86_64 TRUE)
-			SET(LMMS_BUILD_WIN64 TRUE)
-		ELSE(WIN64)
-			SET(IS_X86 TRUE)
-		ENDIF(WIN64)
-	endif()
-ELSE()
-	# Detect target architecture based on compiler target triple e.g. "x86_64-pc-linux"
-	execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpmachine ${CMAKE_C_FLAGS} OUTPUT_VARIABLE Machine)
+	IF(WIN64)
+		SET(IS_X86_64 TRUE)
+		SET(LMMS_BUILD_WIN64 TRUE)
+	ELSE(WIN64)
+		SET(IS_X86 TRUE)
+	ENDIF(WIN64)
+ELSE(WIN32)
+	# Detect target architecture based on compiler target triple
+	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|amd64" IS_X86_64 "${Machine}")
@@ -102,12 +37,6 @@ ELSE()
 		ELSE()
 			SET(IS_ARM32 TRUE)
 		ENDIF()
-	ELSEIF(Machine MATCHES "rv|riscv")
-		IF(Machine MATCHES "rv64|riscv64")
-			SET(IS_RISCV64 TRUE)
-		ELSE()
-			SET(IS_RISCV32 TRUE)
-		ENDIF()
 	ELSEIF(Machine MATCHES "ppc|powerpc")
 		IF(Machine MATCHES "ppc64|powerpc64")
 			SET(IS_PPC64 TRUE)
@@ -115,7 +44,7 @@ ELSE()
 			SET(IS_PPC32 TRUE)
 		ENDIF()
 	ENDIF()
-ENDIF()
+ENDIF(WIN32)
 
 IF(IS_X86)
 	MESSAGE("-- Target host is 32 bit, Intel")
@@ -129,12 +58,6 @@ ELSEIF(IS_ARM32)
 ELSEIF(IS_ARM64)
 	MESSAGE("-- Target host is 64 bit, ARM")
 	SET(LMMS_HOST_ARM64 TRUE)
-ELSEIF(IS_RISCV32)
-	MESSAGE("-- Target host is 32 bit, RISC-V")
-	SET(LMMS_HOST_RISCV32 TRUE)
-ELSEIF(IS_RISCV64)
-	MESSAGE("-- Target host is 64 bit, RISC-V")
-	SET(LMMS_HOST_RISCV64 TRUE)
 ELSEIF(IS_PPC32)
 	MESSAGE("-- Target host is 32 bit, PPC")
 	SET(LMMS_HOST_PPC32 TRUE)

cmake/modules/FindFFTW.cmake

@@ -1,47 +0,0 @@
-# FindFFTW.cmake - Try to find FFTW3
-# Copyright (c) 2018 Lukas W <lukaswhl/at/gmail.com>
-# This file is MIT licensed.
-# See http://opensource.org/licenses/MIT
-
-# Try pkgconfig for hints
-find_package(PkgConfig QUIET)
-
-if(NOT FFTW_FIND_COMPONENTS)
-	set(FFTW_FIND_COMPONENTS fftw3f fftw3 fftwl)
-endif()
-
-if(PKG_CONFIG_FOUND)
-	pkg_check_modules(FFTW_PKG QUIET fftw>=3.0.0)
-	pkg_check_modules(FFTW3_PKG QUIET fftw3>=3.0.0)
-endif()
-
-find_path(FFTW_INCLUDE_DIR
-	NAMES fftw3.h
-	PATHS ${FFTW_PKG_INCLUDE_DIRS} ${FFTW3_PKG_INCLUDE_DIRS}
-)
-
-set(check_list)
-
-foreach(comp ${FFTW_FIND_COMPONENTS})
-	string(TOUPPER ${comp} COMP)
-	if(PKG_CONFIG_FOUND)
-		pkg_check_modules(${COMP}_PKG QUIET ${comp}>=3.0.0)
-	endif()
-
-	find_library(${COMP}_LIBRARY
-		NAMES ${comp}
-		PATHS ${comp}_PKG_LIBRARY_DIRS
- 	)
- 	list(APPEND check_list ${COMP}_LIBRARY)
-
-	set(${COMP}_LIBRARIES ${${COMP}_LIBRARY} CACHE FILEPATH "${COMP} library path")
-	set(${COMP}_INCLUDE_DIRS ${FFTW_INCLUDE_DIR} CACHE PATH "${COMP} include path")
-	mark_as_advanced(${COMP}_LIBRARIES ${COMP}_INCLUDE_DIRS)
-endforeach()
-
-find_package(PackageHandleStandardArgs)	
-find_package_handle_standard_args(FFTW DEFAULT_MSG FFTW_INCLUDE_DIR ${check_list})
-
-set(FFTW_INCLUDE_DIRS ${FFTW_INCLUDE_DIR})
-
-mark_as_advanced(FFTW_LIBRARY FFTW_LIBRARIES FFTW_INCLUDE_DIR FFTW_INCLUDE_DIRS ${check_list})

cmake/modules/FindFluidSynth.cmake

@@ -1,73 +0,0 @@
-# Copyright (c) 2022 Dominic Clark
-#
-# Redistribution and use is allowed according to the terms of the New BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-# Return if we already have FluidSynth
-if(TARGET fluidsynth)
-	set(FluidSynth_FOUND 1)
-	return()
-endif()
-
-# Attempt to find FluidSynth using PkgConfig
-find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
-	pkg_check_modules(FLUIDSYNTH_PKG fluidsynth)
-endif()
-
-# Find the library and headers using the results from PkgConfig as a guide
-find_path(FluidSynth_INCLUDE_DIR
-	NAMES "fluidsynth.h"
-	HINTS ${FLUIDSYNTH_PKG_INCLUDE_DIRS}
-)
-
-find_library(FluidSynth_LIBRARY
-	NAMES "fluidsynth"
-	HINTS ${FLUIDSYNTH_PKG_LIBRARY_DIRS}
-)
-
-if(FluidSynth_INCLUDE_DIR AND FluidSynth_LIBRARY)
-	add_library(fluidsynth UNKNOWN IMPORTED)
-	set_target_properties(fluidsynth PROPERTIES
-		INTERFACE_INCLUDE_DIRECTORIES "${FluidSynth_INCLUDE_DIR}"
-	)
-
-	if(VCPKG_INSTALLED_DIR)
-		include(ImportedTargetHelpers)
-		get_vcpkg_library_configs(FluidSynth_IMPLIB_RELEASE FluidSynth_IMPLIB_DEBUG "${FluidSynth_LIBRARY}")
-	else()
-		set(FluidSynth_IMPLIB_RELEASE "${FluidSynth_LIBRARY}")
-	endif()
-
-	if(FluidSynth_IMPLIB_DEBUG)
-		set_target_properties(fluidsynth PROPERTIES
-			IMPORTED_LOCATION_RELEASE "${FluidSynth_IMPLIB_RELEASE}"
-			IMPORTED_LOCATION_DEBUG "${FluidSynth_IMPLIB_DEBUG}"
-		)
-	else()
-		set_target_properties(fluidsynth PROPERTIES
-			IMPORTED_LOCATION "${FluidSynth_IMPLIB_RELEASE}"
-		)
-	endif()
-
-	if(EXISTS "${FluidSynth_INCLUDE_DIR}/fluidsynth/version.h")
-		file(STRINGS
-			"${FluidSynth_INCLUDE_DIR}/fluidsynth/version.h"
-			_version_string
-			REGEX "^#[\t ]*define[\t ]+FLUIDSYNTH_VERSION[\t ]+\".*\""
-		)
-		string(REGEX REPLACE
-			"^.*FLUIDSYNTH_VERSION[\t ]+\"([^\"]*)\".*$"
-			"\\1"
-			FluidSynth_VERSION_STRING
-			"${_version_string}"
-		)
-		unset(_version_string)
-	endif()
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(FluidSynth
-	REQUIRED_VARS FluidSynth_LIBRARY FluidSynth_INCLUDE_DIR
-	VERSION_VAR FluidSynth_VERSION_STRING
-)

cmake/modules/FindLame.cmake

@@ -1,31 +1,16 @@
-# Copyright (c) 2023 Dominic Clark
+# - Try to find LAME
+# Once done this will define
 #
-# Redistribution and use is allowed according to the terms of the New BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+# LAME_FOUND - system has liblame
+# LAME_INCLUDE_DIRS - the liblame include directory
+# LAME_LIBRARIES - The liblame libraries
 
-include(ImportedTargetHelpers)
-
-find_package_config_mode_with_fallback(mp3lame mp3lame::mp3lame
-	LIBRARY_NAMES "mp3lame"
-	INCLUDE_NAMES "lame/lame.h"
-	PREFIX Lame
-)
-
-determine_version_from_source(Lame_VERSION mp3lame::mp3lame [[
-	#include <iostream>
-	#include <lame/lame.h>
-
-	auto main() -> int
-	{
-		auto version = lame_version_t{};
-		get_lame_version_numerical(&version);
-		std::cout << version.major << "." << version.minor;
-	}
-]])
+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)
 
-find_package_handle_standard_args(Lame
-	REQUIRED_VARS Lame_LIBRARY Lame_INCLUDE_DIRS
-	VERSION_VAR Lame_VERSION
-)
+list(APPEND LAME_DEFINITIONS -DHAVE_LIBMP3LAME=1)
+
+mark_as_advanced(LAME_INCLUDE_DIRS LAME_LIBRARIES LAME_DEFINITIONS)

cmake/modules/FindOggVorbis.cmake

@@ -1,68 +1,86 @@
-# Copyright (c) 2023 Dominic Clark
+# - Try to find the OggVorbis libraries
+# Once done this will define
 #
-# Redistribution and use is allowed according to the terms of the New BSD license.
+#  OGGVORBIS_FOUND - system has OggVorbis
+#  OGGVORBIS_VERSION - set either to 1 or 2
+#  OGGVORBIS_INCLUDE_DIR - the OggVorbis include directory
+#  OGGVORBIS_LIBRARIES - The libraries needed to use OggVorbis
+#  OGG_LIBRARY         - The Ogg library
+#  VORBIS_LIBRARY      - The Vorbis library
+#  VORBISFILE_LIBRARY  - The VorbisFile library
+#  VORBISENC_LIBRARY   - The VorbisEnc library
+
+# Copyright (c) 2006, Richard Laerkaeng, <richard@goteborg.utfors.se>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-include(ImportedTargetHelpers)
 
-find_package_config_mode_with_fallback(Ogg Ogg::ogg
-	LIBRARY_NAMES "ogg"
-	INCLUDE_NAMES "ogg/ogg.h"
-	PKG_CONFIG ogg
-)
+include (CheckLibraryExists)
 
-find_package_config_mode_with_fallback(Vorbis Vorbis::vorbis
-	LIBRARY_NAMES "vorbis"
-	INCLUDE_NAMES "vorbis/codec.h"
-	PKG_CONFIG vorbis
-	DEPENDS Ogg::ogg
-)
+find_path(VORBIS_INCLUDE_DIR vorbis/vorbisfile.h)
+find_path(OGG_INCLUDE_DIR ogg/ogg.h)
 
-find_package_config_mode_with_fallback(Vorbis Vorbis::vorbisfile
-	LIBRARY_NAMES "vorbisfile"
-	INCLUDE_NAMES "vorbis/vorbisfile.h"
-	PKG_CONFIG vorbisfile
-	DEPENDS Vorbis::vorbis
-	PREFIX VorbisFile
-)
+find_library(OGG_LIBRARY NAMES ogg)
+find_library(VORBIS_LIBRARY NAMES vorbis)
+find_library(VORBISFILE_LIBRARY NAMES vorbisfile)
+find_library(VORBISENC_LIBRARY NAMES vorbisenc)
 
-find_package_config_mode_with_fallback(Vorbis Vorbis::vorbisenc
-	LIBRARY_NAMES "vorbisenc"
-	INCLUDE_NAMES "vorbis/vorbisenc.h"
-	PKG_CONFIG vorbisenc
-	DEPENDS Vorbis::vorbis
-	PREFIX VorbisEnc
-)
 
-determine_version_from_source(Vorbis_VERSION Vorbis::vorbis [[
-	#include <iostream>
-	#include <string_view>
-	#include <vorbis/codec.h>
+if (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBISENC_LIBRARY)
+   set(OGGVORBIS_FOUND TRUE)
 
-	auto main() -> int
-	{
-		// Version string has the format "org name version"
-		const auto version = std::string_view{vorbis_version_string()};
-		const auto nameBegin = version.find(' ') + 1;
-		const auto versionBegin = version.find(' ', nameBegin) + 1;
-		std::cout << version.substr(versionBegin);
-	}
-]])
+   set(OGGVORBIS_LIBRARIES ${OGG_LIBRARY} ${VORBIS_LIBRARY} ${VORBISFILE_LIBRARY} ${VORBISENC_LIBRARY})
 
-include(FindPackageHandleStandardArgs)
+   set(_CMAKE_REQUIRED_LIBRARIES_TMP ${CMAKE_REQUIRED_LIBRARIES})
+   set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${OGGVORBIS_LIBRARIES})
+   check_library_exists(vorbis vorbis_bitrate_addblock "" HAVE_LIBVORBISENC2)
+   set(CMAKE_REQUIRED_LIBRARIES ${_CMAKE_REQUIRED_LIBRARIES_TMP})
+
+   if (HAVE_LIBVORBISENC2)
+      set (OGGVORBIS_VERSION 2)
+   else (HAVE_LIBVORBISENC2)
+      set (OGGVORBIS_VERSION 1)
+   endif (HAVE_LIBVORBISENC2)
+
+else (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBISENC_LIBRARY)
+   set (OGGVORBIS_VERSION)
+   set(OGGVORBIS_FOUND FALSE)
+endif (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBISENC_LIBRARY)
+
+
+if (OGGVORBIS_FOUND)
+   if (NOT OggVorbis_FIND_QUIETLY)
+      message(STATUS "Found OggVorbis: ${OGGVORBIS_LIBRARIES}")
+   endif (NOT OggVorbis_FIND_QUIETLY)
+else (OGGVORBIS_FOUND)
+   if (OggVorbis_FIND_REQUIRED)
+      message(FATAL_ERROR "Could NOT find OggVorbis libraries")
+   endif (OggVorbis_FIND_REQUIRED)
+   if (NOT OggVorbis_FIND_QUITELY)
+      message(STATUS "Could NOT find OggVorbis libraries")
+   endif (NOT OggVorbis_FIND_QUITELY)
+endif (OGGVORBIS_FOUND)
+
+#check_include_files(vorbis/vorbisfile.h HAVE_VORBISFILE_H)
+#check_library_exists(ogg ogg_page_version "" HAVE_LIBOGG)
+#check_library_exists(vorbis vorbis_info_init "" HAVE_LIBVORBIS)
+#check_library_exists(vorbisfile ov_open "" HAVE_LIBVORBISFILE)
+#check_library_exists(vorbisenc vorbis_info_clear "" HAVE_LIBVORBISENC)
+#check_library_exists(vorbis vorbis_bitrate_addblock "" HAVE_LIBVORBISENC2)
+
+#if (HAVE_LIBOGG AND HAVE_VORBISFILE_H AND HAVE_LIBVORBIS AND HAVE_LIBVORBISFILE AND HAVE_LIBVORBISENC)
+#    message(STATUS "Ogg/Vorbis found")
+#    set (VORBIS_LIBS "-lvorbis -logg")
+#    set (VORBISFILE_LIBS "-lvorbisfile")
+#    set (VORBISENC_LIBS "-lvorbisenc")
+#    set (OGGVORBIS_FOUND TRUE)
+#    if (HAVE_LIBVORBISENC2)
+#        set (HAVE_VORBIS 2)
+#    else (HAVE_LIBVORBISENC2)
+#        set (HAVE_VORBIS 1)
+#    endif (HAVE_LIBVORBISENC2)
+#else (HAVE_LIBOGG AND HAVE_VORBISFILE_H AND HAVE_LIBVORBIS AND HAVE_LIBVORBISFILE AND HAVE_LIBVORBISENC)
+#    message(STATUS "Ogg/Vorbis not found")
+#endif (HAVE_LIBOGG AND HAVE_VORBISFILE_H AND HAVE_LIBVORBIS AND HAVE_LIBVORBISFILE AND HAVE_LIBVORBISENC)
 
-find_package_handle_standard_args(OggVorbis
-	REQUIRED_VARS
-		Ogg_LIBRARY
-		Ogg_INCLUDE_DIRS
-		Vorbis_LIBRARY
-		Vorbis_INCLUDE_DIRS
-		VorbisFile_LIBRARY
-		VorbisFile_INCLUDE_DIRS
-		VorbisEnc_LIBRARY
-		VorbisEnc_INCLUDE_DIRS
-	# This only reports the Vorbis version - Ogg can have a different version,
-	# so if we ever care about that, it should be split off into a different
-	# find module.
-	VERSION_VAR Vorbis_VERSION
-)

cmake/modules/FindPortaudio.cmake

@@ -1,34 +1,36 @@
-# Copyright (c) 2023 Dominic Clark
+# - Try to find Portaudio
+# Once done this will define
+#
+#  PORTAUDIO_FOUND - system has Portaudio
+#  PORTAUDIO_INCLUDE_DIRS - the Portaudio include directory
+#  PORTAUDIO_LIBRARIES - Link these to use Portaudio
+#  PORTAUDIO_DEFINITIONS - Compiler switches required for using Portaudio
+#
+#  Copyright (c) 2006 Andreas Schneider <mail@cynapses.org>
 #
 # Redistribution and use is allowed according to the terms of the New BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
 
-include(ImportedTargetHelpers)
 
-find_package_config_mode_with_fallback(portaudio portaudio
-	LIBRARY_NAMES "portaudio"
-	INCLUDE_NAMES "portaudio.h"
-	PKG_CONFIG portaudio-2.0
-	PREFIX Portaudio
-)
+if (PORTAUDIO_LIBRARIES AND PORTAUDIO_INCLUDE_DIRS)
+  # in cache already
+  set(PORTAUDIO_FOUND TRUE)
+else (PORTAUDIO_LIBRARIES AND PORTAUDIO_INCLUDE_DIRS)
+   include(FindPkgConfig)
+   pkg_check_modules(PORTAUDIO portaudio-2.0)
+  if (PORTAUDIO_FOUND)
+    if (NOT Portaudio_FIND_QUIETLY)
+      message(STATUS "Found Portaudio: ${PORTAUDIO_LIBRARIES}")
+    endif (NOT Portaudio_FIND_QUIETLY)
+  else (PORTAUDIO_FOUND)
+    if (Portaudio_FIND_REQUIRED)
+      message(FATAL_ERROR "Could not find Portaudio")
+    endif (Portaudio_FIND_REQUIRED)
+  endif (PORTAUDIO_FOUND)
 
-determine_version_from_source(Portaudio_VERSION portaudio [[
-	#include <iostream>
-	#include "portaudio.h"
+  # show the PORTAUDIO_INCLUDE_DIRS and PORTAUDIO_LIBRARIES variables only in the advanced view
+  mark_as_advanced(PORTAUDIO_INCLUDE_DIRS PORTAUDIO_LIBRARIES)
 
-	auto main() -> int
-	{
-		// Version number has the format 0xMMmmpp
-		const auto version = Pa_GetVersion();
-		std::cout << ((version >> 16) & 0xff)
-			<< "." << ((version >> 8) & 0xff)
-			<< "." << ((version >> 0) & 0xff);
-	}
-]])
+endif (PORTAUDIO_LIBRARIES AND PORTAUDIO_INCLUDE_DIRS)
 
-include(FindPackageHandleStandardArgs)
-
-find_package_handle_standard_args(Portaudio
-	REQUIRED_VARS Portaudio_LIBRARY Portaudio_INCLUDE_DIRS
-	VERSION_VAR Portaudio_VERSION
-)

cmake/modules/FindSDL2.cmake

@@ -1,118 +0,0 @@
-# This module defines
-# SDL2::SDL2, a target providing SDL2 itself
-# SDL2_LIBRARY, the name of the library to link against
-# SDL2_FOUND, if false, do not try to link to SDL2
-# SDL2_INCLUDE_DIR, where to find SDL.h
-#
-# On OSX, this will prefer the Framework version (if found) over others.
-# People will have to manually change the cache values of
-# SDL2_LIBRARY to override this selection or set the CMake environment
-# CMAKE_INCLUDE_PATH to modify the search paths.
-#
-# $SDL2DIR is an environment variable that would
-# correspond to the ./configure --prefix=$SDL2DIR
-# used in building SDL2.
-#
-# Modified by Eric Wing, l.e.galup, and Dominic Clark
-#
-#=============================================================================
-# Copyright 2003-2009 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file COPYING-CMAKE-SCRIPTS for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-# Try config mode first - anything SDL2 itself provides is likely to be more
-# reliable than our guesses.
-find_package(SDL2 CONFIG QUIET)
-
-if(TARGET SDL2::SDL2)
-	# Extract details for find_package_handle_standard_args
-	get_target_property(SDL2_LIBRARY SDL2::SDL2 LOCATION)
-	get_target_property(SDL2_INCLUDE_DIR SDL2::SDL2 INTERFACE_INCLUDE_DIRECTORIES)
-else()
-	set(SDL2_SEARCH_PATHS
-		~/Library/Frameworks
-		/Library/Frameworks
-		/usr/local
-		/usr
-		/sw # Fink
-		/opt/local # DarwinPorts
-		/opt/csw # Blastwave
-		/opt
-		${SDL2_PATH}
-	)
-
-	find_path(SDL2_INCLUDE_DIR
-		NAMES SDL.h
-		HINTS $ENV{SDL2DIR} ${SDL2_INCLUDE_DIRS}
-		PATH_SUFFIXES SDL2 include/SDL2 include
-		PATHS ${SDL2_SEARCH_PATHS}
-	)
-
-	if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-		set(PATH_SUFFIXES lib64 lib/x64 lib)
-	else()
-		set(PATH_SUFFIXES lib/x86 lib)
-	endif()
-
-	find_library(SDL2_LIBRARY
-		NAMES SDL2
-		HINTS $ENV{SDL2DIR} ${SDL2_LIBDIR}
-		PATH_SUFFIXES ${PATH_SUFFIXES}
-		PATHS ${SDL2_SEARCH_PATHS}
-	)
-
-	# SDL2 may require threads on your system.
-	# The Apple build may not need an explicit flag because one of the
-	# frameworks may already provide it.
-	# But for non-OSX systems, I will use the CMake Threads package.
-	if(NOT APPLE)
-		find_package(Threads)
-	endif()
-
-	if(SDL2_LIBRARY AND SDL2_INCLUDE_DIR)
-		add_library(SDL2::SDL2 UNKNOWN IMPORTED)
-		set_target_properties(SDL2::SDL2 PROPERTIES
-			IMPORTED_LOCATION "${SDL2_LIBRARY}"
-			INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}"
-		)
-
-		# For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
-		if(APPLE)
-			set_property(TARGET SDL2::SDL2 APPEND PROPERTY
-				INTERFACE_LINK_OPTIONS "-framework Cocoa"
-			)
-		endif()
-
-		# For threads, as mentioned Apple doesn't need this.
-		# In fact, there seems to be a problem if I used the Threads package
-		# and try using this line, so I'm just skipping it entirely for OS X.
-		if(NOT APPLE AND Threads_FOUND)
-			set_property(TARGET SDL2::SDL2 APPEND PROPERTY
-				INTERFACE_LINK_LIBRARIES "Threads::Threads"
-			)
-		endif()
-
-		if(EXISTS "${SDL2_INCLUDE_DIR}/SDL_version.h")
-			file(READ "${SDL2_INCLUDE_DIR}/SDL_version.h" _sdl_version_h)
-			string(REGEX REPLACE ".*#[\t ]*define[\t ]+SDL_MAJOR_VERSION[\t ]+([0-9]+).*" "\\1" SDL2_VERSION_MAJOR "${_sdl_version_h}")
-			string(REGEX REPLACE ".*#[\t ]*define[\t ]+SDL_MINOR_VERSION[\t ]+([0-9]+).*" "\\1" SDL2_VERSION_MINOR "${_sdl_version_h}")
-			string(REGEX REPLACE ".*#[\t ]*define[\t ]+SDL_PATCHLEVEL[\t ]+([0-9]+).*" "\\1" SDL2_VERSION_PATCH "${_sdl_version_h}")
-			set(SDL2_VERSION "${SDL2_VERSION_MAJOR}.${SDL2_VERSION_MINOR}.${SDL2_VERSION_PATCH}")
-			unset(_sdl_version_h)
-		endif()
-	endif()
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(SDL2
-	REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR
-	VERSION_VAR SDL2_VERSION
-)

cmake/modules/FindSTK.cmake

@@ -1,27 +1,20 @@
-include(ImportedTargetHelpers)
+FIND_PATH(STK_INCLUDE_DIR Stk.h /usr/include/stk /usr/local/include/stk ${CMAKE_INSTALL_PREFIX}/include/stk ${CMAKE_FIND_ROOT_PATH}/include/stk)
 
-# TODO CMake 3.18: Alias this target to something less hideous
-find_package_config_mode_with_fallback(unofficial-libstk unofficial::libstk::libstk
-	LIBRARY_NAMES "stk"
-	INCLUDE_NAMES "stk/Stk.h"
-	LIBRARY_HINTS "/usr/lib" "/usr/local/lib" "${CMAKE_INSTALL_PREFIX}/lib" "${CMAKE_FIND_ROOT_PATH}/lib"
-	INCLUDE_HINTS "/usr/include" "/usr/local/include" "${CMAKE_INSTALL_PREFIX}/include" "${CMAKE_FIND_ROOT_PATH}/include"
-	PREFIX STK
-)
+FIND_LIBRARY(STK_LIBRARY NAMES stk PATH /usr/lib /usr/local/lib ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_FIND_ROOT_PATH}/lib) 
 
-# Find STK rawwave path
-if(STK_INCLUDE_DIRS)
-	list(GET STK_INCLUDE_DIRS 0 STK_INCLUDE_DIR)
-	find_path(STK_RAWWAVE_ROOT
-		NAMES silence.raw sinewave.raw
-		HINTS "${STK_INCLUDE_DIR}/.."
-		PATH_SUFFIXES share/stk/rawwaves share/libstk/rawwaves
-	)
-endif()
+IF (STK_INCLUDE_DIR AND STK_LIBRARY)
+   SET(STK_FOUND TRUE)
+ENDIF (STK_INCLUDE_DIR AND STK_LIBRARY)
 
-include(FindPackageHandleStandardArgs)
 
-find_package_handle_standard_args(STK
-	REQUIRED_VARS STK_LIBRARY STK_INCLUDE_DIR
-	# STK doesn't appear to expose its version, so we can't pass it here
-)
+IF (STK_FOUND)
+   IF (NOT STK_FIND_QUIETLY)
+      MESSAGE(STATUS "Found STK: ${STK_LIBRARY}")
+	SET(HAVE_STK TRUE)
+   ENDIF (NOT STK_FIND_QUIETLY)
+ELSE (STK_FOUND)
+   IF (STK_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find STK")
+   ENDIF (STK_FIND_REQUIRED)
+ENDIF (STK_FOUND)
+

cmake/modules/FindSamplerate.cmake

@@ -1,35 +0,0 @@
-# Copyright (c) 2023 Dominic Clark
-#
-# Redistribution and use is allowed according to the terms of the New BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-include(ImportedTargetHelpers)
-
-find_package_config_mode_with_fallback(SampleRate SampleRate::samplerate
-	LIBRARY_NAMES "samplerate" "libsamplerate" "libsamplerate-0"
-	INCLUDE_NAMES "samplerate.h"
-	PKG_CONFIG samplerate
-	PREFIX Samplerate
-)
-
-determine_version_from_source(Samplerate_VERSION SampleRate::samplerate [[
-	#include <iostream>
-	#include <string_view>
-	#include <samplerate.h>
-
-	auto main() -> int
-	{
-		// Version string has the format "name-version copyright"
-		const auto version = std::string_view{src_get_version()};
-		const auto begin = version.find('-') + 1;
-		const auto end = version.find(' ', begin);
-		std::cout << version.substr(begin, end - begin);
-	}
-]])
-
-include(FindPackageHandleStandardArgs)
-
-find_package_handle_standard_args(Samplerate
-	REQUIRED_VARS Samplerate_LIBRARY Samplerate_INCLUDE_DIRS
-	VERSION_VAR Samplerate_VERSION
-)

cmake/modules/FindSndFile.cmake

@@ -1,34 +0,0 @@
-# Copyright (c) 2023 Dominic Clark
-#
-# Redistribution and use is allowed according to the terms of the New BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-include(ImportedTargetHelpers)
-
-find_package_config_mode_with_fallback(SndFile SndFile::sndfile
-	LIBRARY_NAMES "sndfile" "libsndfile" "libsndfile-1"
-	INCLUDE_NAMES "sndfile.h"
-	PKG_CONFIG sndfile
-)
-
-determine_version_from_source(SndFile_VERSION SndFile::sndfile [[
-	#include <iostream>
-	#include <string_view>
-	#include <sndfile.h>
-
-	auto main() -> int
-	{
-		// Version string has the format "name-version", optionally followed by "-exp"
-		const auto version = std::string_view{sf_version_string()};
-		const auto begin = version.find('-') + 1;
-		const auto end = version.find('-', begin);
-		std::cout << version.substr(begin, end - begin);
-	}
-]])
-
-include(FindPackageHandleStandardArgs)
-
-find_package_handle_standard_args(SndFile
-	REQUIRED_VARS SndFile_LIBRARY SndFile_INCLUDE_DIRS
-	VERSION_VAR SndFile_VERSION
-)

cmake/modules/FindSndio.cmake

@@ -29,6 +29,6 @@ find_package_handle_standard_args(SNDIO DEFAULT_MSG SNDIO_LIBRARY SNDIO_INCLUDE_
 if(SNDIO_FOUND)
     set(SNDIO_INCLUDE_DIRS "${SNDIO_INCLUDE_DIR}")
     set(SNDIO_LIBRARIES "${SNDIO_LIBRARY}")
-endif()
+endif(HAVE_SNDIO)
 
 mark_as_advanced(SNDIO_INCLUDE_DIR SNDIO_LIBRARY SNDIO_INCLUDE_DIRS SNDIO_LIBRARIES)

cmake/modules/FindWine.cmake

@@ -3,120 +3,40 @@
 #
 #  WINE_FOUND - System has wine
 #  WINE_INCLUDE_DIRS - The wine include directories
+#  WINE_LIBRARIES - The libraries needed to use wine
 #  WINE_DEFINITIONS - Compiler switches required for using wine
 #
 
-MACRO(_findwine_find_flags output expression result)
-	STRING(REPLACE " " ";" WINEBUILD_FLAGS "${output}")
-	FOREACH(FLAG ${WINEBUILD_FLAGS})
-		IF("${FLAG}" MATCHES "${expression}")
-			LIST(APPEND ${result} "${FLAG}")
-		ENDIF()
-	ENDFOREACH()
-ENDMACRO()
+LIST(APPEND CMAKE_PREFIX_PATH /opt/wine-stable /opt/wine-devel /opt/wine-staging)
 
-MACRO(_regex_replace_foreach EXPRESSION REPLACEMENT RESULT INPUT)
-	SET(${RESULT} "")
-	FOREACH(ITEM ${INPUT})
-		STRING(REGEX REPLACE "${EXPRESSION}" "${REPLACEMENT}" ITEM "${ITEM}")
-		LIST(APPEND ${RESULT} "${ITEM}")
-	ENDFOREACH()
-ENDMACRO()
+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)
 
-LIST(APPEND CMAKE_PREFIX_PATH /opt/wine-stable /opt/wine-devel /opt/wine-staging /usr/lib/wine/)
+set(WINE_INCLUDE_DIRS ${WINE_INCLUDE_DIR} )
+set(WINE_LIBRARIES ${WINE_LIBRARY} )
 
-FIND_PROGRAM(WINE_CXX
-	NAMES wineg++ winegcc winegcc64 winegcc32 winegcc-stable
-	PATHS /usr/lib/wine
-)
-FIND_PROGRAM(WINE_BUILD NAMES winebuild)
-# Detect wine paths and handle linking problems
-IF(WINE_CXX)
-	execute_process(COMMAND ${WINE_CXX} -m32 -v /dev/zero OUTPUT_VARIABLE WINEBUILD_OUTPUT_32)
-	execute_process(COMMAND ${WINE_CXX} -m64 -v /dev/zero OUTPUT_VARIABLE WINEBUILD_OUTPUT_64)
-	_findwine_find_flags("${WINEBUILD_OUTPUT_32}" "^-isystem/usr/include$" BUGGED_WINEGCC)
-	_findwine_find_flags("${WINEBUILD_OUTPUT_32}" "^-isystem" WINEGCC_INCLUDE_DIR)
-	_findwine_find_flags("${WINEBUILD_OUTPUT_32}" "libwinecrt0\\.a.*" WINECRT_32)
-	_findwine_find_flags("${WINEBUILD_OUTPUT_64}" "libwinecrt0\\.a.*" WINECRT_64)
-	_regex_replace_foreach("^-isystem" "" WINE_INCLUDE_HINT "${WINEGCC_INCLUDE_DIR}")
-	_regex_replace_foreach("/wine/windows$" "" WINE_INCLUDE_HINT "${WINE_INCLUDE_HINT}")
-	STRING(REGEX REPLACE "wine/libwinecrt0\\.a.*" "" WINE_32_LIBRARY_DIR "${WINECRT_32}")
-	STRING(REGEX REPLACE "wine/libwinecrt0\\.a.*" "" WINE_64_LIBRARY_DIR "${WINECRT_64}")
+# Handle wine linking problems
+EXEC_PROGRAM(${WINE_CXX} ARGS "-v -m32 /dev/zero" OUTPUT_VARIABLE WINEBUILD_OUTPUT)
+STRING(REPLACE " " ";" WINEBUILD_FLAGS "${WINEBUILD_OUTPUT}")
 
-	IF(BUGGED_WINEGCC)
-		MESSAGE(WARNING "Your winegcc is unusable due to https://bugs.winehq.org/show_bug.cgi?id=46293,\n
-			Consider either upgrading or downgrading wine.")
-		RETURN()
+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()
-	IF(WINE_32_LIBRARY_DIR STREQUAL WINE_64_LIBRARY_DIR)
-		MESSAGE(STATUS "Old winegcc detected, trying to use workaround linking")
-		# Fix library search directory according to the target bitness
-		IF(WINE_32_LIBRARY_DIR MATCHES "/lib/(x86_64|i386)-")
-			# Debian systems
-			STRING(REPLACE "/lib/x86_64-" "/lib/i386-" WINE_32_LIBRARY_DIR "${WINE_32_LIBRARY_DIR}")
-			STRING(REPLACE "/lib/i386-" "/lib/x86_64-" WINE_64_LIBRARY_DIR "${WINE_64_LIBRARY_DIR}")
-		ELSEIF(WINE_32_LIBRARY_DIR MATCHES "/(lib|lib64)/wine/$")
-			# WineHQ (/opt/wine-stable, /opt/wine-devel, /opt/wine-staging)
-			STRING(REGEX REPLACE "/lib64/wine/$" "/lib/wine/" WINE_32_LIBRARY_DIR "${WINE_32_LIBRARY_DIR}")
-			STRING(REGEX REPLACE "/lib/wine/$" "/lib64/wine/" WINE_64_LIBRARY_DIR "${WINE_64_LIBRARY_DIR}")
-		ELSEIF(WINE_32_LIBRARY_DIR MATCHES "/lib32/")
-			# Systems with old multilib layout
-			STRING(REPLACE "/lib32/" "/lib/" WINE_64_LIBRARY_DIR "${WINE_32_LIBRARY_DIR}")
-		ELSEIF(WINE_32_LIBRARY_DIR MATCHES "/lib64/")
-			# We need to test if the corresponding 64bit library directory is lib or lib32
-			STRING(REPLACE "/lib64/" "/lib32/" WINE_32_LIBRARY_DIR "${WINE_64_LIBRARY_DIR}")
-			IF(NOT EXISTS "${WINE_32_LIBRARY_DIR}")
-				STRING(REPLACE "/lib64/" "/lib/" WINE_32_LIBRARY_DIR "${WINE_64_LIBRARY_DIR}")
-			ENDIF()
-		ELSEIF(WINE_32_LIBRARY_DIR MATCHES "/lib/")
-			# Test if this directory is for 32bit or 64bit
-			STRING(REPLACE "/lib/" "/lib32/" WINE_32_LIBRARY_DIR "${WINE_64_LIBRARY_DIR}")
-			IF(NOT EXISTS "${WINE_32_LIBRARY_DIR}")
-				SET(WINE_32_LIBRARY_DIR "${WINE_64_LIBRARY_DIR}")
-				STRING(REPLACE "/lib/" "/lib64/" WINE_64_LIBRARY_DIR "${WINE_64_LIBRARY_DIR}")
-			ENDIF()
-		ELSE()
-			MESSAGE(WARNING "Can't detect wine installation layout. You may get some build errors.")
-		ENDIF()
-		SET(WINE_LIBRARY_FIX "${WINE_32_LIBRARY_DIR} and ${WINE_64_LIBRARY_DIR}")
-	ENDIF()
-ENDIF()
-
-FIND_PATH(WINE_INCLUDE_DIR wine/exception.h
-	HINTS ${WINE_INCLUDE_HINT}
-)
-
-SET(_ARCHITECTURE ${CMAKE_LIBRARY_ARCHITECTURE})
-
-SET(CMAKE_LIBRARY_ARCHITECTURE ${_ARCHITECTURE})
-
-SET(WINE_INCLUDE_DIRS ${WINE_INCLUDE_DIR} )
+ENDFOREACH()
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Wine DEFAULT_MSG WINE_CXX WINE_INCLUDE_DIRS)
+find_package_handle_standard_args(Wine DEFAULT_MSG WINE_LIBRARIES WINE_INCLUDE_DIRS)
 
-mark_as_advanced(WINE_INCLUDE_DIR WINE_LIBRARY WINE_CXX WINE_BUILD)
-
-IF(WINE_32_LIBRARY_DIR)
-	IF(WINE_32_LIBRARY_DIR MATCHES "wine*/lib")
-		SET(WINE_32_FLAGS "-L${WINE_32_LIBRARY_DIR} -L${WINE_32_LIBRARY_DIR}../")
-		SET(WINE_32_LIBRARY_DIRS "${WINE_32_LIBRARY_DIR}:${WINE_32_LIBRARY_DIR}/..")
-	ELSE()
-		SET(WINE_32_FLAGS "-L${WINE_32_LIBRARY_DIR} -L${WINE_32_LIBRARY_DIR}wine/")
-		SET(WINE_32_LIBRARY_DIRS "${WINE_32_LIBRARY_DIR}:${WINE_32_LIBRARY_DIR}wine/")
-	ENDIF()
-ENDIF()
-
-IF(WINE_64_LIBRARY_DIR)
-	IF(WINE_64_LIBRARY_DIR MATCHES "wine*/lib")
-		SET(WINE_64_FLAGS "-L${WINE_64_LIBRARY_DIR} -L${WINE_64_LIBRARY_DIR}../")
-		SET(WINE_64_LIBRARY_DIRS "${WINE_64_LIBRARY_DIR}:${WINE_64_LIBRARY_DIR}/..")
-	ELSE()
-		SET(WINE_64_FLAGS "-L${WINE_64_LIBRARY_DIR} -L${WINE_64_LIBRARY_DIR}wine/")
-		SET(WINE_64_LIBRARY_DIRS "${WINE_64_LIBRARY_DIR}:${WINE_64_LIBRARY_DIR}wine/")
-	ENDIF()
-ENDIF()
-
-# Create winegcc wrapper
-configure_file(${CMAKE_CURRENT_LIST_DIR}/winegcc_wrapper.in winegcc_wrapper @ONLY)
-SET(WINEGCC "${CMAKE_CURRENT_BINARY_DIR}/winegcc_wrapper")
+mark_as_advanced(WINE_INCLUDE_DIR WINE_LIBRARY)

cmake/modules/GenQrc.cmake

@@ -1,80 +0,0 @@
-# GenQrc.cmake - Copyright (c) 2015 Lukas W <lukaswhl/at/gmail.com>
-
-# Generates a simple qrc file named ${QRC_NAME} containing the given resource
-# files ${ARGN}, rccs it, and returns Qt's output file.
-# Must only be run once per CMakeLists.txt.
-# Usage example:
-#     add_gen_qrc(RCC_OUTPUT resources.qrc artwork.png icon.png PREFIX /icons)
-#     add_executable(myexe main.cpp ${RCC_OUTPUT})
-# Files may also be added using a pattern with the GLOB keyword, e.g.:
-#     add_gen_qrc(RCC_OUTPUT resources.qrc GLOB *.png)
-function(add_gen_qrc RCC_OUT QRC_NAME)
-	cmake_parse_arguments(RC "" "PREFIX;GLOB" "" ${ARGN})
-
-	# Get the absolute paths for the generated files
-	if(IS_ABSOLUTE "${QRC_NAME}")
-		set(QRC_FILE "${QRC_NAME}")
-	else()
-		set(QRC_FILE "${CMAKE_CURRENT_BINARY_DIR}/${QRC_NAME}")
-	endif()
-	get_filename_component(RESOURCE_NAME "${QRC_FILE}" NAME_WE)
-	get_filename_component(OUTPUT_DIR "${QRC_FILE}" DIRECTORY)
-	set(CPP_FILE "${OUTPUT_DIR}/qrc_${RESOURCE_NAME}.cpp")
-
-	# Set the standard prefix to "/" if none is given
-	if(NOT DEFINED RC_PREFIX)
-		set(RC_PREFIX "/")
-	endif()
-
-	# Determine input files
-	set(FILES ${RC_UNPARSED_ARGUMENTS})
-	if(DEFINED RC_GLOB)
-		file(GLOB GLOB_FILES "${RC_GLOB}")
-		list(APPEND FILES ${GLOB_FILES})
-	endif()
-
-	# Add the command to generate the QRC file
-	set(GENQRC_SCRIPT "${CMAKE_SOURCE_DIR}/cmake/scripts/GenQrc.cmake")
-	add_custom_command(
-		OUTPUT "${QRC_FILE}"
-		COMMAND "${CMAKE_COMMAND}"
-			-D "OUT_FILE=${QRC_FILE}"
-			-D "RC_PREFIX=${RC_PREFIX}"
-			-D "FILES:list=${FILES}"
-			-D "DIR=${CMAKE_CURRENT_SOURCE_DIR}"
-			-P "${GENQRC_SCRIPT}"
-		DEPENDS "${GENQRC_SCRIPT}"
-		WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-		VERBATIM
-	)
-
-	# Add the command to compile the QRC file
-	# Note: we can't use `qt5_add_resources` or `AUTORCC` here; we have to add
-	# the command ourselves instead. This is in order to handle dependencies
-	# correctly: the QRC file is generated at build time, so the dependencies
-	# of the compiled file can't be automatically determined at configure time.
-	# Additionally, `qt5_add_resources` adds unnecessary dependencies for
-	# generated QRC files, which can cause dependency cycles with some
-	# generators. See issue #6177.
-	add_custom_command(
-		OUTPUT "${CPP_FILE}"
-		COMMAND Qt5::rcc
-			--name "${RESOURCE_NAME}"
-			--output "${CPP_FILE}"
-			"${QRC_FILE}"
-		DEPENDS "${QRC_FILE}" ${FILES}
-		VERBATIM
-	)
-
-	# Flag the generated files to be ignored by automatic tool processing
-	set_source_files_properties("${QRC_FILE}" PROPERTIES
-		SKIP_AUTORCC ON # We added the rcc command for this manually
-	)
-	set_source_files_properties("${CPP_FILE}" PROPERTIES
-		SKIP_AUTOMOC ON # The rcc output file has no need for moc or uic
-		SKIP_AUTOUIC ON
-	)
-
-	# Return the rcc output file
-	set("${RCC_OUT}" "${CPP_FILE}" PARENT_SCOPE)
-endfunction()

cmake/modules/ImportedTargetHelpers.cmake

@@ -1,228 +0,0 @@
-# ImportedTargetHelpers.cmake - various helper functions for use in find modules.
-#
-# Copyright (c) 2022-2023 Dominic Clark
-#
-# Redistribution and use is allowed according to the terms of the New BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-# If the version variable is not yet set, build the source linked to the target,
-# run it, and set the version variable to the output. Useful for libraries which
-# do not expose the version information in a header where it can be extracted
-# with regular expressions, but do provide a function to get the version.
-#
-# Usage:
-# 	determine_version_from_source(
-#		<output variable> # The cache variable in which to store the computed version
-#		<target>          # The target which the source will link to
-#		<source>          # The source code to determine the version
-#	)
-function(determine_version_from_source _version_out _target _source)
-	# Return if we already know the version, or the target was not found
-	if(NOT "${${_version_out}}" STREQUAL "" OR NOT TARGET "${_target}")
-		return()
-	endif()
-
-	# Return with a notice if cross-compiling, since we are unlikely to be able
-	# to run the compiled source
-	if(CMAKE_CROSSCOMPILING)
-		message(
-			"${_target} was found but the version could not be determined automatically.\n"
-			"Set the cache variable `${_version_out}` to the version you have installed."
-		)
-		return()
-	endif()
-
-	# Write the source code to a temporary file
-	string(SHA1 _source_hash "${_source}")
-	set(_source_file "${CMAKE_CURRENT_BINARY_DIR}/${_source_hash}.cpp")
-	file(WRITE "${_source_file}" "${_source}")
-
-	# Build and run the temporary file to get the version
-	# TODO CMake 3.25: Use the new signature for try_run which has a NO_CACHE
-	#                  option and doesn't require separate file management.
-	try_run(
-		_dvfs_run_result _dvfs_compile_result "${CMAKE_CURRENT_BINARY_DIR}"
-		SOURCES "${_source_file}"
-		LINK_LIBRARIES "${_target}"
-		CXX_STANDARD 17
-		RUN_OUTPUT_VARIABLE _run_output
-		COMPILE_OUTPUT_VARIABLE _compile_output
-	)
-
-	# Clean up the temporary file
-	file(REMOVE "${_source_file}")
-
-	# Set the version if the run was successful, using a cache variable since
-	# this version check may be relatively expensive. Otherwise, log the error
-	# and inform the user.
-	if(_dvfs_run_result EQUAL "0")
-		set("${_version_out}" "${_run_output}" CACHE INTERNAL "Version of ${_target}")
-	else()
-		message(DEBUG "${_compile_output}")
-		message(
-			"${_target} was found but the version could not be determined automatically.\n"
-			"Set the cache variable `${_version_out}` to the version you have installed."
-		)
-	endif()
-endfunction()
-
-# Search for a package using config mode. If this fails to find the desired
-# target, use the specified fallbacks and add the target if they succeed. Set
-# the variables `prefix_LIBRARY`, `prefix_INCLUDE_DIRS`, and `prefix_VERSION`
-# if found for the caller to pass to `find_package_handle_standard_args`.
-#
-# Usage:
-# 	find_package_config_mode_with_fallback(
-#		<package_name>                 # The package to search for with config mode
-#		<target_name>                  # The target to expect from config mode, or define if not found
-# 		LIBRARY_NAMES names...         # Possible library names to search for as a fallback
-# 		INCLUDE_NAMES names...         # Possible header names to search for as a fallback
-# 		[PKG_CONFIG <pkg_config_name>] # The pkg-config name to search for as a fallback
-# 		[LIBRARY_HINTS hints...]       # Locations to look for libraries
-# 		[INCLUDE_HINTS hints...]       # Locations to look for headers
-#		[DEPENDS dependencies...]      # Dependencies of the target - added to INTERFACE_LINK_LIBRARIES, and will fail if not found
-#		[PREFIX <prefix>]              # The prefix for result variables - defaults to the package name
-# 	)
-function(find_package_config_mode_with_fallback _fpcmwf_PACKAGE_NAME _fpcmwf_TARGET_NAME)
-	# Parse remaining arguments
-	set(_options "")
-	set(_one_value_args "PKG_CONFIG" "PREFIX")
-	set(_multi_value_args "LIBRARY_NAMES" "LIBRARY_HINTS" "INCLUDE_NAMES" "INCLUDE_HINTS" "DEPENDS")
-	cmake_parse_arguments(PARSE_ARGV 2 _fpcmwf "${_options}" "${_one_value_args}" "${_multi_value_args}")
-
-	# Compute result variable names
-	if(NOT DEFINED _fpcmwf_PREFIX)
-		set(_fpcmwf_PREFIX "${_fpcmwf_PACKAGE_NAME}")
-	endif()
-	set(_version_var "${_fpcmwf_PREFIX}_VERSION")
-	set(_library_var "${_fpcmwf_PREFIX}_LIBRARY")
-	set(_include_var "${_fpcmwf_PREFIX}_INCLUDE_DIRS")
-
-	# Try config mode if possible
-	find_package("${_fpcmwf_PACKAGE_NAME}" CONFIG QUIET)
-
-	if(TARGET "${_fpcmwf_TARGET_NAME}")
-		# Extract package details from existing target
-		get_target_property("${_library_var}" "${_fpcmwf_TARGET_NAME}" LOCATION)
-		get_target_property("${_include_var}" "${_fpcmwf_TARGET_NAME}" INTERFACE_INCLUDE_DIRECTORIES)
-		if(DEFINED "${_fpcmwf_PACKAGE_NAME}_VERSION")
-			set("${_version_var}" "${${_fpcmwf_PACKAGE_NAME}_VERSION}")
-		endif()
-	else()
-		# Check whether the dependencies exist
-		foreach(_dependency IN LISTS _fpcmwf_DEPENDS)
-			if(NOT TARGET "${_dependency}")
-				return()
-			endif()
-		endforeach()
-
-		# Attempt to find the package using pkg-config, if we have it and it was requested
-		set(_pkg_config_prefix "${_fpcmwf_PKG_CONFIG}_PKG")
-		if(DEFINED _fpcmwf_PKG_CONFIG)
-			find_package(PkgConfig QUIET)
-			if(PKG_CONFIG_FOUND)
-				pkg_check_modules("${_pkg_config_prefix}" QUIET "${_fpcmwf_PKG_CONFIG}")
-				if("${${_pkg_config_prefix}_FOUND}")
-					set("${_version_var}" "${${_pkg_config_prefix}_VERSION}")
-				endif()
-			endif()
-		endif()
-
-		# Find the library and headers using the results from pkg-config as a guide
-		find_library("${_library_var}"
-			NAMES ${_fpcmwf_LIBRARY_NAMES}
-			HINTS ${${_pkg_config_prefix}_LIBRARY_DIRS} ${_fpcmwf_LIBRARY_HINTS}
-		)
-
-		find_path("${_include_var}"
-			NAMES ${_fpcmwf_INCLUDE_NAMES}
-			HINTS ${${_pkg_config_prefix}_INCLUDE_DIRS} ${_fpcmwf_INCLUDE_HINTS}
-		)
-
-		# Create an imported target if we succeeded in finding the package
-		if(${_library_var} AND ${_include_var})
-			add_library("${_fpcmwf_TARGET_NAME}" UNKNOWN IMPORTED)
-			set_target_properties("${_fpcmwf_TARGET_NAME}" PROPERTIES
-				IMPORTED_LOCATION "${${_library_var}}"
-				INTERFACE_INCLUDE_DIRECTORIES "${${_include_var}}"
-				INTERFACE_LINK_LIBRARIES "${_fpcmwf_DEPENDS}"
-			)
-		endif()
-
-		mark_as_advanced("${_library_var}" "${_include_var}")
-	endif()
-
-	# Return results to caller
-	if(DEFINED "${_version_var}")
-		set("${_version_var}" "${${_version_var}}" PARENT_SCOPE)
-	else()
-		unset("${_version_var}" PARENT_SCOPE)
-	endif()
-	set("${_library_var}" "${${_library_var}}" PARENT_SCOPE)
-	set("${_include_var}" "${${_include_var}}" PARENT_SCOPE)
-endfunction()
-
-# Given a library in vcpkg, find appropriate debug and release versions. If only
-# one version exists, use it as the release version, and do not set the debug
-# version.
-#
-# Usage:
-#	get_vcpkg_library_configs(
-#		<release library> # Variable in which to store the path to the release version of the library
-#		<debug library>   # Variable in which to store the path to the debug version of the library
-#		<base library>    # Known path to some version of the library
-#	)
-function(get_vcpkg_library_configs _release_out _debug_out _library)
-	# We want to do all operations within the vcpkg directory
-	file(RELATIVE_PATH _lib_relative "${VCPKG_INSTALLED_DIR}" "${_library}")
-
-	# Return early if we're not using vcpkg
-	if(IS_ABSOLUTE _lib_relative OR _lib_relative MATCHES "^\\.\\./")
-		set("${_release_out}" "${_library}" PARENT_SCOPE)
-		return()
-	endif()
-
-	string(REPLACE "/" ";" _path_bits "${_lib_relative}")
-
-	# Determine whether we were given the debug or release version
-	list(FIND _path_bits "debug" _debug_index)
-	if(_debug_index EQUAL -1)
-		# We have the release version, so use it
-		set(_release_lib "${_library}")
-
-		# Try to find a debug version too
-		list(FIND _path_bits "lib" _lib_index)
-		if(_lib_index GREATER_EQUAL 0)
-			list(INSERT _path_bits "${_lib_index}" "debug")
-			list(INSERT _path_bits 0 "${VCPKG_INSTALLED_DIR}")
-			string(REPLACE ";" "/" _debug_lib "${_path_bits}")
-
-			if(NOT EXISTS "${_debug_lib}")
-				# Debug version does not exist - only use given version
-				unset(_debug_lib)
-			endif()
-		endif()
-	else()
-		# We have the debug version, so try to find a release version too
-		list(REMOVE_AT _path_bits "${_debug_index}")
-		list(INSERT _path_bits 0 "${VCPKG_INSTALLED_DIR}")
-		string(REPLACE ";" "/" _release_lib "${_path_bits}")
-
-		if(NOT EXISTS "${_release_lib}")
-			# Release version does not exist - only use given version
-			set(_release_lib "${_library}")
-		else()
-			# Release version exists, so use given version as debug
-			set(_debug_lib "${_library}")
-		endif()
-	endif()
-
-	# Set output variables appropriately
-	if(_debug_lib)
-		set("${_release_out}" "${_release_lib}" PARENT_SCOPE)
-		set("${_debug_out}" "${_debug_lib}" PARENT_SCOPE)
-	else()
-		set("${_release_out}" "${_release_lib}" PARENT_SCOPE)
-		unset("${_debug_out}" PARENT_SCOPE)
-	endif()
-endfunction()

cmake/modules/InstallDependencies.cmake

@@ -1,187 +0,0 @@
-include(GetPrerequisites)
-include(CMakeParseArguments)
-
-# Project's cmake_minimum_required doesn't propagate to install scripts
-cmake_policy(PUSH)
-cmake_policy(SET CMP0057 NEW) # Support new if() IN_LIST operator.
-
-function(make_absolute var)
-	get_filename_component(abs "${${var}}" ABSOLUTE BASE_DIR "${CMAKE_INSTALL_PREFIX}")
-	set(${var} ${abs} PARENT_SCOPE)
-endfunction()
-
-# Reads lines of a file into a list, skipping '#' comment lines
-function(READ_LIST_FILE FILE VAR)
-	file(STRINGS "${FILE}" list)
-
-	set(result "")
-	foreach(item ${list})
-		string(STRIP "${item}" item)
-		if(item STREQUAL "" OR item MATCHES "^\#")
-			continue()
-		endif()
-		list(APPEND result "${item}")
-	endforeach()
-
-	set(${VAR} ${result} PARENT_SCOPE)
-endfunction()
-
-function(make_all_absolute list_var)
-	set(result "")
-	foreach(file ${${list_var}})
-		make_absolute(file)
-		list(APPEND result ${file})
-	endforeach()
-	set(${list_var} ${result} PARENT_SCOPE)
-endfunction()
-
-if(CMAKE_BINARY_DIR)
-	set(tmp_lib_dir "${CMAKE_BINARY_DIR}/bundled-libraries")
-elseif(CMAKE_HOST_UNIX)
-	set(tmp_lib_dir "/tmp/bundled-libraries")
-elseif(DEFINED ENV{TEMP})
-	set(tmp_lib_dir "$ENV{TMP}/bundled-libraries")
-else()
-	message(FATAL_ERROR "Can't find a temp dir for libraries")
-endif()
-
-# Like file(INSTALL), but resolves symlinks
-function(install_file_resolved file destination)
-
-	get_filename_component(file_name "${file}" NAME)
-	if(IS_SYMLINK "${file}")
-		get_filename_component(real_path "${file}" REALPATH)
-		get_filename_component(real_name "${real_path}" NAME)
-		file(COPY "${real_path}" DESTINATION "${tmp_lib_dir}")
-		file(RENAME "${tmp_lib_dir}/${real_name}" "${tmp_lib_dir}/${file_name}")
-		set(file_path "${tmp_lib_dir}/${file_name}")
-	else()
-		set(file_path "${file}")
-	endif()
-
-	file(INSTALL "${file_path}" DESTINATION "${destination}")
-endfunction()
-
-function(install_resolved)
-	cmake_parse_arguments("" "" "DESTINATION" "FILES" ${ARGN})
-	foreach(file ${_FILES})
-		install_file_resolved("${file}" "${_DESTINATION}")
-	endforeach()
-endfunction()
-
-if(CMAKE_CROSSCOMPILING)
-	# If we're cross-compiling, GetPrerequisites may not be able to find system libraries such as kernel32.dll because
-	# they're supplied by the toolchain. To suppress thousands of lines of warnings being printed to the console, we
-	# override gp_resolved_file_type to return "system" for any library in ${IGNORE_LIBS} without trying to resolve the
-	# file first.
-	# GetPrerequisites supports using an override function called gp_resolved_file_type_override, but it's not suited
-	# for our purpose because it's only called by gp_resolved_file_type *after* trying to resolve the file.
-	function(gp_resolved_file_type original_file file exepath dirs type_var)
-		set(file_find "${file}")
-		if(_IGNORE_CASE)
-			# On case-insensitive systems, convert to upper characters to respect it
-			string(TOUPPER "${file_find}" file_find)
-		endif()
-		SET(IGNORE_LIBS ${_IGNORE_LIBS} CACHE INTERNAL "Ignored library names" FORCE)
-		if(IGNORE_LIBS AND ${file_find} IN_LIST IGNORE_LIBS)
-			set(${type_var} system PARENT_SCOPE)
-		else()
-			#_gp_resolved_file_type(${ARGV})
-			_gp_resolved_file_type("${original_file}" "${file}" "${exepath}" "${dirs}" "${type_var}" ${ARGN})
-		endif()
-	endfunction()
-endif()
-
-function(INSTALL_DEPENDENCIES)
-	cmake_parse_arguments("" "INCLUDE_SYSTEM;IGNORE_CASE" "GP_TOOL;DESTINATION;IGNORE_LIBS_FILE" "FILES;LIB_DIRS;SEARCH_PATHS;IGNORE_LIBS" ${ARGN})
-
-	# Make paths absolute
-	make_absolute(_DESTINATION)
-	make_all_absolute(_FILES)
-	make_all_absolute(_LIB_DIRS)
-	make_all_absolute(_SEARCH_PATHS)
-
-	if(_INCLUDE_SYSTEM)
-		set(EXCLUDE_SYSTEM 0)
-	else()
-		set(EXCLUDE_SYSTEM 1)
-	endif()
-
-	if(_IGNORE_LIBS_FILE)
-		READ_LIST_FILE("${_IGNORE_LIBS_FILE}" _IGNORE_LIBS)
-		if(_IGNORE_CASE)
-			# On case-insensitive systems, convert to upper characters to respect it
-			string(TOUPPER "${_IGNORE_LIBS}" _IGNORE_LIBS)
-		endif()
-		SET(IGNORE_LIBS ${_IGNORE_LIBS} CACHE INTERNAL "Ignored library names" FORCE)
-	endif()
-
-	if(_GP_TOOL)
-		set(gp_tool "${_GP_TOOL}")
-	endif()
-
-	set(prereqs "")
-	foreach(file ${_FILES})
-		get_filename_component(file_name "${file}" NAME)
-		message("-- Finding prerequisites of ${file_name}")
-		find_prerequisites("${file}" _prereqs
-			${EXCLUDE_SYSTEM} # exclude system files
-			1 # recurse
-			""
-			"${_LIB_DIRS}"
-			"${_SEARCH_PATHS}"
-			"${_IGNORE_LIBS}"
-		)
-
-		list(APPEND prereqs ${_prereqs})
-	endforeach()
-
-	list(REMOVE_DUPLICATES prereqs)
-
-	foreach(prereq ${prereqs})
-		get_filename_component(prereq_name "${prereq}" NAME)
-
-		foreach(rpath ${_SEARCH_PATHS})
-			if(EXISTS "${rpath}/${prereq_name}")
-				list(REMOVE_ITEM prereqs "${prereq}")
-				break()
-			endif()
-		endforeach()
-	endforeach()
-
-	#file(INSTALL ${prereqs} DESTINATION ${_DESTINATION})
-	install_resolved(FILES ${prereqs} DESTINATION "${_DESTINATION}")
-endfunction()
-
-# Like get_prerequisites, but returns full paths
-function(FIND_PREREQUISITES target RESULT_VAR exclude_system recurse
-	exepath dirs rpaths)
-	set(RESULTS)
-
-	get_prerequisites("${target}" _prereqs ${exclude_system} ${recurse}
-                  "" "${dirs}" "${rpaths}")
-
-	foreach(prereq ${_prereqs})
-		get_filename_component(prereq_name "${prereq}" NAME)
-		if(_IGNORE_CASE)
-			# Windows is case insensitive.
-			# Use upper characters to respect it.
-			string(TOUPPER "${prereq_name}" prereq_name)
-		endif()
-		if("${prereq_name}" IN_LIST IGNORE_LIBS)
-			continue()
-		endif()
-
-		gp_resolve_item("${LIB_DLL}" "${prereq}" "" "${dirs}" RESOLVED_PREREQ "${rpaths}")
-
-		if(RESOLVED_PREREQ AND IS_ABSOLUTE ${RESOLVED_PREREQ} AND EXISTS ${RESOLVED_PREREQ})
-			list(APPEND RESULTS ${RESOLVED_PREREQ})
-		else()
-			message(FATAL_ERROR "Can't resolve dependency ${prereq}.")
-		endif()
-	endforeach()
-
-	set(${RESULT_VAR} ${RESULTS} PARENT_SCOPE)
-endfunction()
-
-cmake_policy(POP)

cmake/modules/InstallTargetDependencies.cmake

@@ -1,90 +0,0 @@
-include(DefineInstallVar)
-
-SET(DEFAULT_SEARCH_DIRECTORIES "${BIN_DIR}" "${LIB_DIR}" "${CMAKE_FIND_ROOT_PATH}" "${CMAKE_PREFIX_PATH}")
-SET(DEFAULT_SEARCH_SUFFIXES "bin" "lib" "../bin")
-
-# Like INSTALL_DEPENDENCIES but can be called from regular cmake code
-# (instead of install(CODE)), takes targets instead of files,
-# takes care of configuring search paths, and other platform-specific tweaks.
-# Arguments:
-#	TARGETS:			list of cmake targets to install.
-#	NAME:				unique string for this install.
-#	DESTINATION:		directory path to install the binaries to.
-#	LIB_DIRS:			list of paths for looking up dependencies.
-#	LIB_DIRS_SUFFIXES:	list of possible suffixes for LIB_DIRS entries.
-#	SEARCH_PATHS:			list of library search paths on runtime
-#	NO_DEFAULT_PATHS:	supply this value to avoid adding DEFAULT_SEARCH_DIRECTORIES
-#						to LIB_DIRS and DEFAULT_SEARCH_SUFFIXES to LIB_DIRS_SUFFIXES.
-FUNCTION(INSTALL_TARGET_DEPENDENCIES)
-	set(options NO_DEFAULT_PATHS)
-	set(oneValueArgs NAME)
-	set(multiValueArgs TARGETS DESTINATION LIB_DIRS_SUFFIXES LIB_DIRS SEARCH_PATHS)
-	cmake_parse_arguments(DEPS "${options}" "${oneValueArgs}"
-			"${multiValueArgs}" ${ARGN} )
-
-	if(NOT DEPS_LIB_DIRS)
-		set(DEPS_LIB_DIRS "")
-	endif()
-
-	# Set default values.
-	if(NOT DEPS_NO_DEFAULT_PATHS)
-		list(APPEND DEPS_LIB_DIRS ${DEFAULT_SEARCH_DIRECTORIES})
-		set(DEPS_LIB_DIRS_SUFFIXES "${DEPS_LIB_DIRS_SUFFIXES}" ${DEFAULT_SEARCH_SUFFIXES})
-	endif()
-
-	FOREACH(TARGET ${DEPS_TARGETS})
-		IF(NOT TARGET ${TARGET})
-			message(FATAL_ERROR "Not a target: ${TARGET}")
-		ENDIF()
-
-		# Collect target output files.
-		LIST(APPEND DEPLOY_TARGETS "$<TARGET_FILE:${TARGET}>")
-
-		# Collect target link directories
-		get_target_property(target_libs ${TARGET} LINK_LIBRARIES)
-
-		foreach(lib ${target_libs})
-			if(TARGET ${lib} OR NOT IS_ABSOLUTE ${lib})
-				continue()
-			endif()
-
-			get_filename_component(lib_dir ${lib} PATH)
-			list(APPEND DEPS_LIB_DIRS ${lib_dir})
-		endforeach()
-	ENDFOREACH()
-
-	LIST(APPEND DEPS_LIB_DIRS ${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES})
-
-	FOREACH(LIB_PATH ${DEPS_LIB_DIRS})
-		FOREACH(suffix ${DEPS_LIB_DIRS_SUFFIXES})
-			list(APPEND DEPS_LIB_DIRS "${LIB_PATH}/${suffix}")
-		ENDFOREACH()
-	ENDFOREACH()
-
-	DEFINE_INSTALL_VAR(NAME "DEPLOY_FILES" CONTENT "${DEPLOY_TARGETS}" GENERATOR_EXPRESSION)
-
-	LIST(REMOVE_DUPLICATES DEPS_LIB_DIRS)
-
-	IF(LMMS_BUILD_LINUX)
-		FILE(DOWNLOAD "https://raw.githubusercontent.com/AppImage/AppImages/master/excludelist"
-				"${CMAKE_BINARY_DIR}/excludelist")
-		SET(additional_args INCLUDE_SYSTEM IGNORE_LIBS_FILE ${CMAKE_BINARY_DIR}/excludelist)
-	ELSEIF(LMMS_BUILD_WIN32)
-		SET(additional_args IGNORE_CASE IGNORE_LIBS_FILE "${LMMS_SOURCE_DIR}/cmake/install/excludelist-win")
-		IF(CMAKE_CROSSCOMPILING)
-			SET(additional_args "${additional_args}" GP_TOOL objdump)
-		ENDIF()
-	ENDIF()
-
-	INSTALL(CODE "
-		INCLUDE(\"${LMMS_SOURCE_DIR}/cmake/modules/InstallDependencies.cmake\")
-
-		INSTALL_DEPENDENCIES(
-			FILES \"\${DEPLOY_FILES}\"
-			DESTINATION \"${DEPS_DESTINATION}\"
-			LIB_DIRS \"${DEPS_LIB_DIRS}\"
-			SEARCH_PATHS \"${DEPS_SEARCH_PATHS}\"
-			${additional_args}
-		)
-	")
-ENDFUNCTION()

cmake/modules/MinGWCrossCompile.cmake

@@ -0,0 +1,102 @@
+# Required by cmake if `uname -s` is inadaquate
+SET(CMAKE_SYSTEM_NAME               Windows)
+SET(CMAKE_SYSTEM_VERSION            1)
+
+# The target environment
+SET(CMAKE_FIND_ROOT_PATH            ${MINGW_PREFIX})
+SET(CMAKE_INSTALL_PREFIX            ${MINGW_PREFIX})
+
+# 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++)
+
+	# 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)
+
+	# 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()
+
+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/PluginList.cmake

@@ -1,111 +0,0 @@
-# Provides a fast mechanism for filtering the plugins used at build-time
-SET(PLUGIN_LIST "" CACHE STRING "List of plug-ins to build")
-STRING(REPLACE " " ";" PLUGIN_LIST "${PLUGIN_LIST}")
-OPTION(LMMS_MINIMAL "Build a minimal list of plug-ins" OFF)
-OPTION(LIST_PLUGINS "Lists the available plugins for building" OFF)
-
-SET(MINIMAL_LIST
-	AudioFileProcessor
-	Kicker
-	TripleOscillator
-)
-
-IF(LMMS_MINIMAL)
-	IF("${PLUGIN_LIST}" STREQUAL "")
-		STRING(REPLACE ";" " " MINIMAL_LIST_STRING "${MINIMAL_LIST}")
-		MESSAGE(
-"-- Using minimal plug-ins: ${MINIMAL_LIST_STRING}\n"
-"   Note: You can specify specific plug-ins using -DPLUGIN_LIST=\"foo bar\""
-		)
-	ENDIF()
-	SET(PLUGIN_LIST ${MINIMAL_LIST} ${PLUGIN_LIST})
-ENDIF()
-
-SET(LMMS_PLUGIN_LIST
-	${MINIMAL_LIST}
-	Amplifier
-	BassBooster
-	BitInvader
-	Bitcrush
-	CarlaBase
-	CarlaPatchbay
-	CarlaRack
-	Compressor
-	CrossoverEQ
-	Delay
-	Dispersion
-	DualFilter
-	DynamicsProcessor
-	Eq
-	Flanger
-	HydrogenImport
-	LadspaBrowser
-	LadspaEffect
-	LOMM
-	Lv2Effect
-	Lv2Instrument
-	Lb302
-	MidiImport
-	MidiExport
-	MultitapEcho
-	Monstro
-	Nes
-	OpulenZ
-	Organic
-	FreeBoy
-	Patman
-	PeakControllerEffect
-	GigPlayer
-	ReverbSC
-	Sf2Player
-	Sfxr
-	Sid
-	SlicerT
-	SpectrumAnalyzer
-	StereoEnhancer
-	StereoMatrix
-	Stk
-	TapTempo
-	VstBase
-	Vestige
-	VstEffect
-	Watsyn
-	WaveShaper
-	Vectorscope
-	Vibed
-	Xpressive
-	ZynAddSubFx
-)
-
-IF("${PLUGIN_LIST}" STREQUAL "")
-	SET(PLUGIN_LIST ${LMMS_PLUGIN_LIST})
-ENDIF()
-
-MACRO(LIST_ALL_PLUGINS)
-	MESSAGE("\n\nAll possible -DPLUGIN_LIST values")
-	MESSAGE("\n   KEYWORD:")
-	MESSAGE("      -DLMMS_MINIMAL=True")
-	FOREACH(item IN LISTS MINIMAL_LIST)
-		MESSAGE("         ${item}")
-	ENDFOREACH()
-	MESSAGE("\n   NAME:")
-	FOREACH(item IN LISTS LMMS_PLUGIN_LIST)
-		MESSAGE("      ${item}")
-	ENDFOREACH()
-	MESSAGE("\nNote:  This value also impacts the fetching of git submodules.\n")
-	MESSAGE(FATAL_ERROR "Information was requested, aborting build!")
-ENDMACRO()
-
-IF(LIST_PLUGINS)
-	UNSET(LIST_PLUGINS CACHE)
-	LIST_ALL_PLUGINS()
-ENDIF()
-
-IF(MSVC)
-	SET(MSVC_INCOMPATIBLE_PLUGINS
-		LadspaEffect
-	)
-	message(WARNING "Compiling with MSVC. The following plugins are not available: ${MSVC_INCOMPATIBLE_PLUGINS}")
-	LIST(REMOVE_ITEM PLUGIN_LIST ${MSVC_INCOMPATIBLE_PLUGINS})
-ENDIF()
-

cmake/modules/VersionInfo.cmake

@@ -1,79 +1,30 @@
 FIND_PACKAGE(Git)
 IF(GIT_FOUND AND NOT FORCE_VERSION)
-	SET(MAJOR_VERSION 0)
-	SET(MINOR_VERSION 0)
-	SET(PATCH_VERSION 0)
-
-	# If this is a GitHub Actions pull request build, get the pull request
-	# number from the environment and add it to the build metadata
-	if("$ENV{GITHUB_REF}" MATCHES "refs/pull/([0-9]+)/merge")
-		list(APPEND BUILD_METADATA "pr${CMAKE_MATCH_1}")
-	endif()
-
-	# Look for git tag information (e.g. Tagged: "v1.0.0", Untagged: "v1.0.0-123-a1b2c3d")
-	# Untagged format: [latest tag]-[number of commits]-[latest commit hash]
+	# 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)
-	# Read: TAG_LIST = GIT_TAG.split("-")
 	STRING(REPLACE "-" ";" TAG_LIST "${GIT_TAG}")
-	# Read: TAG_LIST_LENGTH = TAG_LIST.length()
 	LIST(LENGTH TAG_LIST TAG_LIST_LENGTH)
-	# Untagged versions contain at least 2 dashes, giving 3 strings on split.
-	# Hence, for untagged versions TAG_LIST_LENGTH = [dashes in latest tag] + 3.
-	# Corollary: if TAG_LIST_LENGTH <= 2, the version must be tagged.
 	IF(TAG_LIST_LENGTH GREATER 0)
-		# Set FORCE_VERSION to TAG_LIST[0], strip any 'v's to get MAJ.MIN.PAT
 		LIST(GET TAG_LIST 0 FORCE_VERSION)
 		STRING(REPLACE "v" "" FORCE_VERSION "${FORCE_VERSION}")
-		# Split FORCE_VERSION on '.' and populate MAJOR/MINOR/PATCH_VERSION
-		STRING(REPLACE "." ";" MAJ_MIN_PAT "${FORCE_VERSION}")
-		LIST(GET MAJ_MIN_PAT 0 MAJOR_VERSION)
-		LIST(GET MAJ_MIN_PAT 1 MINOR_VERSION)
-		LIST(GET MAJ_MIN_PAT 2 PATCH_VERSION)
 	ENDIF()
-	# 1 dash total: Dash in latest tag, no additional commits => pre-release
 	IF(TAG_LIST_LENGTH EQUAL 2)
-		# Get the pre-release stage
 		LIST(GET TAG_LIST 1 VERSION_STAGE)
-		list(APPEND PRERELEASE_DATA "${VERSION_STAGE}")
-	# 2 dashes: Assume untagged with no dashes in latest tag name => stable + commits
+		SET(FORCE_VERSION "${FORCE_VERSION}-${VERSION_STAGE}")
 	ELSEIF(TAG_LIST_LENGTH EQUAL 3)
-		# Get the number of commits and latest commit hash
 		LIST(GET TAG_LIST 1 EXTRA_COMMITS)
-		LIST(GET TAG_LIST 2 COMMIT_HASH)
-		list(APPEND PRERELEASE_DATA "${EXTRA_COMMITS}")
-		list(APPEND BUILD_METADATA "${COMMIT_HASH}")
-		# Bump the patch version, since a pre-release (as specified by the extra
-		# commits) compares lower than the main version alone
-		MATH(EXPR PATCH_VERSION "${PATCH_VERSION}+1")
-		# Reassemble the main version using the new patch version
-		set(FORCE_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")
-	# 3 dashes: Assume untagged with 1 dash in latest tag name => pre-release + commits
+		SET(FORCE_VERSION "${FORCE_VERSION}.${EXTRA_COMMITS}")
 	ELSEIF(TAG_LIST_LENGTH EQUAL 4)
-		# Get the pre-release stage, number of commits, and latest commit hash
 		LIST(GET TAG_LIST 1 VERSION_STAGE)
 		LIST(GET TAG_LIST 2 EXTRA_COMMITS)
-		LIST(GET TAG_LIST 3 COMMIT_HASH)
-		list(APPEND PRERELEASE_DATA "${VERSION_STAGE}")
-		list(APPEND PRERELEASE_DATA "${EXTRA_COMMITS}")
-		list(APPEND BUILD_METADATA "${COMMIT_HASH}")
+		SET(FORCE_VERSION
+			"${FORCE_VERSION}-${VERSION_STAGE}.${EXTRA_COMMITS}")
 	ENDIF()
-
-	# If there is any pre-release data, append it after a hyphen
-	if(PRERELEASE_DATA)
-		string(REPLACE ";" "." PRERELEASE_DATA "${PRERELEASE_DATA}")
-		set(FORCE_VERSION "${FORCE_VERSION}-${PRERELEASE_DATA}")
-	endif()
-
-	# If there is any build metadata, append it after a plus
-	if(BUILD_METADATA)
-		string(REPLACE ";" "." BUILD_METADATA "${BUILD_METADATA}")
-		set(FORCE_VERSION "${FORCE_VERSION}+${BUILD_METADATA}")
-	endif()
 ENDIF()
 
 IF(FORCE_VERSION STREQUAL "internal")
@@ -123,3 +74,4 @@ MESSAGE("\n"
 	"*   Override version:           -DFORCE_VERSION=x.x.x-x\n"
 	"*   Ignore Git information:     -DFORCE_VERSION=internal\n"
 )
+

cmake/modules/Win32Toolchain.cmake

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

cmake/modules/Win64Toolchain.cmake

@@ -0,0 +1,16 @@
+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(WIN64                           TRUE)
+
+
+INCLUDE(MinGWCrossCompile)
+

cmake/modules/winegcc_wrapper.in

@@ -1,78 +0,0 @@
-#!/bin/sh
-# Wrapper script for winegcc to remove .exe file ending automatically
-# appended by winebuild.
-# See FindWine.cmake for usage
-
-set -e
-
-args="$@"
-
-# Find output name, link mode and architecture
-while [ $# -gt 0 ]; do
-	key="$1"
-
-	case $key in
-		-o)
-			output=$2
-			shift
-			;;
-		-c)
-			no_link=true
-			;;
-		-m32)
-			win32=true
-			;;
-		-m64)
-			win64=true
-			;;
-		*)
-
-			;;
-	esac
-
-	shift
-done
-
-if [ -z "$output" ]; then
-	# If -c is used without specifying an output name, GCC defaults to "a.out".
-	if [ "$no_link" != true ]; then
-		output="a.out"
-		no_move=true
-	fi
-fi
-
-# Some Wine distributions can't find their own headers. WINE_INCLUDE_DIR provided
-# by FindWine.cmake
-extra_args="-I@WINE_INCLUDE_DIR@ -I@WINE_INCLUDE_DIR@/wine/windows"
-
-# Apply manually specified flags
-extra_args="$extra_args @WINE_CXX_FLAGS@"
-
-# Apply -m32 library fix if necessary
-# Additionally, apply "-z notext" to fix an inconsistency in ld.lld vs ld.bfd and ld.gold
-if [ "$win32" = true ] && [ "$no_link" != true ]; then
-	extra_args="$extra_args @WINE_32_FLAGS@ -z notext"
-fi
-
-# Apply -m64 library fix if necessary
-if [ "$win64" = true ] && [ "$no_link" != true ]; then
-	extra_args="$extra_args @WINE_64_FLAGS@"
-fi
-
-# Work around https://bugs.winehq.org/show_bug.cgi?id=47710
-extra_args="$extra_args -D__WIDL_objidl_generated_name_0000000C="
-
-# Run winegcc
-export WINEBUILD=@WINE_BUILD@
-@WINE_CXX@ $extra_args $args
-
-if [ "$no_move" = true ] || [ "$no_link" = true ]; then
-	exit 0
-fi
-
-if [ ! -e "$output.exe" ]; then
-	echo "Fatal error in winegcc wrapper: No output file \"$output.exe\" found."
-	exit 1
-fi
-
-mv $output.exe $output

cmake/msys/extract_debs.sh

@@ -1,16 +1,14 @@
 #!/bin/bash
-set -e
-
 ppa_dir=./ppa/
 
 pushd $ppa_dir
 
 for f in *.deb; do
 	echo "Extracting $f..."
-	ar xv "$f"
+	ar xv $f
 	rm debian-binary
 	rm control.tar.*
-	tar xf data.tar.* --exclude=*mingw*/bin/fluid
+	tar xf data.tar.*
 	rm data.tar.*
 done
 

cmake/msys/fetch_ppa.sh

@@ -9,10 +9,10 @@ PPA_ARCH=amd64
 # These shouldn't change
 PPA_HOST=http://ppa.launchpad.net
 PPA_USER=tobydox
-PPA_PROJECT=mingw-x-trusty
+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.gz
+PPA_URL=$PPA_ROOT/dists/$PPA_DISTRO/main/binary-$PPA_ARCH/Packages
 
 ppa_dir=./ppa/
 
@@ -20,18 +20,18 @@ 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 x-runtime gcc qt_4 qt5 x-stk pkgconfig" 
 skip_files="$skip_files glib2 libpng"
 
-echo "Connecting to $PPA_URL to get list of packages..."
-wget -qO- $PPA_URL | gzip -d -c | grep "Filename:" > $temp_file
+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
+	grep -v $j $temp_file > $temp_temp_file
 	mv $temp_temp_file $temp_file
 done
 
-line_count=$(wc -l $temp_file |awk '{print $1}')
+line_count=`wc -l $temp_file |awk '{print $1}'`
 
 echo "Found $line_count packages for download..."
 
@@ -39,15 +39,20 @@ echo "Downloading packages.  They will be saved to $ppa_dir"
 
 mkdir $ppa_dir
 
-while read -r j
-do
+for j in `cat $temp_file` ; do
+	if [ "$j" = "Filename:" ] ; then 
+		continue 
+	fi
 	echo "Downloading $j..."
-	echo "$PPA_ROOT/$j"
-	wget -qO "$ppa_dir$(basename "$j")" "$(echo "$PPA_ROOT/$j" | sed 's/\/Filename: /\//gi')"
-done < $temp_file
+	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

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -eu
-
 # Git repo information
 fork="lmms"	# i.e. "lmms" or "tobydox"
 branch="master"	# i.e. "master" or "stable-1.2"
@@ -17,45 +15,49 @@ function warn() { echo -e "\n${yellow}$1${plain}"; }
 function err() { echo -e "\n${red}$1${plain}"; exit 1;}
 
 info "Checking for mingw environment"
-if ! env | grep MINGW; then
+env |grep MINGW
+if [ $? -ne 0 ]; then
 	err "  - Failed. Please relaunch using MinGW shell"
 fi
 
 info "Preparing the git directory..."
-mkdir "$HOME/.git" || true
-touch "$HOME/.git/config" > /dev/null 2>&1
+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
+if [ -d ./lmms ]; then 
 	warn "  - Skipping, ./lmms already exists"
-else
+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
+if [ -d $HOME/ppa ]; then
         warn "  - Skipping, $HOME/ppa already exists"
 else
-	lmms/cmake/msys/fetch_ppa.sh
+	./lmms/cmake/msys/fetch_ppa.sh	
 fi
 
+
 info "Extracting debs to $HOME/ppa/opt/, etc..."
-if [ -d "$HOME/ppa/opt" ]; then
+if [ -d $HOME/ppa/opt ]; then
         warn "  - Skipping, $HOME/ppa/opt already exists"
 else
-        lmms/cmake/msys/extract_debs.sh
+        ./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
+chmod u+w /mingw32/include/qt4 -R 
 
 info "Merging mingw headers and libraries from ppa over existing system libraries..."
-if ! find /mingw64 | grep sndfile.h; then
-	command cp -r "$HOME/ppa/opt/mingw"* /
-else
-	warn "  - Skipping, sndfile.h has already been merged"
+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"
@@ -65,162 +67,220 @@ flacver="1.3.2"
 gigver="4.0.0"
 stkver="4.5.1"
 
-mingw_root="/$(echo "$MSYSTEM"|tr '[:upper:]' '[:lower:]')"
-
 info "Downloading and building fltk $fltkver"
-if ! command -v fluid; then
-	wget http://fltk.org/pub/fltk/$fltkver/fltk-$fltkver-source.tar.gz -O "$HOME/fltk-source.tar.gz"
-	tar zxf "$HOME/fltk-source.tar.gz" -C "$HOME/"
-	pushd "$HOME/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
+	./configure --prefix=$mingw_root --enable-shared
+
 	make
 
 	info "  - Installing fltk..."
 	make install
 
-#	ln -s $mingw_root/usr/local/bin/fluid.exe $mingw_root/bin/fluid.exe
+	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"
+	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"
-	tar xf "$HOME/libogg-source.tar.xz" -C "$HOME/"
-	pushd "$HOME/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"
+	./configure --prefix=$mingw_root
+
 	make
 
 	info "  - Installing libogg..."
 	make install
+
 	# for some reason libgig needs this
-	./configure --prefix="/opt$mingw_root"
+	./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"
+	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"
-	tar xf "$HOME/libvorbis-source.tar.xz" -C "$HOME/"
-	pushd "$HOME/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"
+	./configure --prefix=$mingw_root
+
 	make
 
 	info "  - Installing libvorbis..."
 	make install
 
 	# for some reason libgig needs this
-	./configure --prefix="/opt$mingw_root"
+	./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"
+	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"
-	tar xf "$HOME/flac-source.tar.xz" -C "$HOME/"
-	pushd "$HOME/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"
+	./configure --prefix=$mingw_root
+
 	make
 
 	info "  - Installing flac..."
 	make install
 
 	# for some reason libgig needs this
-	./configure --prefix="/opt$mingw_root"
+	./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"
+	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"
-	tar xf "$HOME/gig-source.tar.xz" -C "$HOME/"
-	pushd "$HOME/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"
+	./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"
+	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"
+	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"
-	tar xf "$HOME/stk-source.tar.xz" -C "$HOME/"
-	pushd "$HOME/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"
+	./configure --prefix=$mingw_root
+
 	make
 
 	info "  - Installing stk..."
 	make install
 
-	mv "$mingw_root/lib/libstk.so" "$mingw_root/lib/libstk.dll"
-	mv "$mingw_root/lib/libstk-$stkver.so" "$mingw_root/lib/libstk-$stkver.dll"
+	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"
+	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
+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
-elif [ "$mingw_root" = "/mingw32" ]; then
-	if [ ! -e /opt/mingw32/bin/i686-w64-mingw32-pkg-config ]; then
+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"
+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

@@ -1,12 +1,4 @@
-SET(WIN_PLATFORM mingw)
-if(LMMS_MSVC_YEAR)
-	SET(WIN_PLATFORM "msvc${LMMS_MSVC_YEAR}")
-endif()
-
 SET(CPACK_PACKAGE_ICON                  "${CMAKE_SOURCE_DIR}/cmake/nsis/nsis_branding.bmp")
-IF(MSVC)
-	STRING(REPLACE "/" "\\\\" CPACK_PACKAGE_ICON ${CPACK_PACKAGE_ICON})
-ENDIF(MSVC)
 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)
@@ -16,11 +8,10 @@ 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                  "
-  !addincludedir ${CMAKE_SOURCE_DIR}/cmake/nsis
-  !include FileAssociation.nsh
+  !include ${CMAKE_SOURCE_DIR}/cmake/nsis/FileAssociation.nsh
   !include LogicLib.nsh
   !include WinVer.nsh")
-SET(CPACK_PACKAGE_FILE_NAME             "${CMAKE_PROJECT_NAME}-${VERSION}-${WIN_PLATFORM}-win32")
+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)\\\"
@@ -36,7 +27,7 @@ SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
   " PARENT_SCOPE)
 
 IF(WIN64)
-	SET(CPACK_PACKAGE_FILE_NAME      "${CMAKE_PROJECT_NAME}-${VERSION}-${WIN_PLATFORM}-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} 
@@ -46,10 +37,10 @@ ENDIF()
 
 # Fix windows paths for msys
 IF(LMMS_BUILD_MSYS)
-	STRING(REPLACE "/" "\\\\" CPACK_PACKAGE_ICON "${CPACK_PACKAGE_ICON}")
-	STRING(REPLACE "/" "\\\\" CPACK_NSIS_MUI_ICON "${CPACK_NSIS_MUI_ICON}")
-	STRING(REPLACE "/" "\\\\" CPACK_NSIS_DEFINES "${CPACK_NSIS_DEFINES}")
-	STRING(REPLACE "/" "\\\\" CMAKE_BINARY_DIR_FIX "${CMAKE_BINARY_DIR}")
+	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)
@@ -71,7 +62,13 @@ 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")
+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 .)

cmake/postinstall/CMakeLists.txt

@@ -0,0 +1,4 @@
+IF(LMMS_BUILD_APPLE)
+	INSTALL(CODE "EXECUTE_PROCESS(COMMAND chmod u+x ${CMAKE_BINARY_DIR}/install_apple.sh)")
+	INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_BINARY_DIR}/install_apple.sh)")
+ENDIF()

cmake/scripts/GenQrc.cmake

@@ -1,26 +0,0 @@
-# GenQrcScript.cmake - Copyright (c) 2015 Lukas W <lukaswhl/at/gmail.com>
-
-INCLUDE(CMakeParseArguments)
-
-FILE(REMOVE ${OUT_FILE})
-MACRO(OUT STRING)
-	FILE(APPEND ${OUT_FILE} "${STRING}\n")
-ENDMACRO()
-
-IF(NOT DEFINED RC_PREFIX)
-	SET(RC_PREFIX "/")
-ENDIF()
-
-# Write qrc file
-OUT("<RCC>")
-OUT("	<qresource prefix=\"${RC_PREFIX}\">")
-FOREACH(VAR ${FILES})
-	GET_FILENAME_COMPONENT(FILENAME ${VAR} NAME)
-	IF(IS_ABSOLUTE ${VAR})
-		OUT("		<file alias=\"${FILENAME}\">${VAR}</file>")
-	ELSE()
-		OUT("		<file alias=\"${FILENAME}\">${DIR}/${VAR}</file>")
-	ENDIF()
-ENDFOREACH()
-OUT("	</qresource>")
-OUT("</RCC>")

cmake/toolchains/MSYS-32.cmake

@@ -1,4 +0,0 @@
-INCLUDE(${CMAKE_CURRENT_LIST_DIR}/common/MSYS.cmake)
-INCLUDE(${CMAKE_CURRENT_LIST_DIR}/common/Win32.cmake)
-
-SET(MINGW_PREFIX                /mingw32)

cmake/toolchains/MSYS-64.cmake

@@ -1,5 +0,0 @@
-INCLUDE(${CMAKE_CURRENT_LIST_DIR}/common/MSYS.cmake)
-INCLUDE(${CMAKE_CURRENT_LIST_DIR}/common/Win64.cmake)
-
-SET(MINGW_PREFIX                /mingw64)
-SET(MINGW_PREFIX32              /mingw32)

cmake/toolchains/Ubuntu-MinGW-W64-32.cmake

@@ -1,2 +0,0 @@
-INCLUDE(${CMAKE_CURRENT_LIST_DIR}/common/Win32.cmake)
-INCLUDE(${CMAKE_CURRENT_LIST_DIR}/common/Ubuntu-MinGW-W64.cmake)

cmake/toolchains/Ubuntu-MinGW-W64-64.cmake

@@ -1,4 +0,0 @@
-SET(CMAKE_TOOLCHAIN_FILE_32			"${CMAKE_CURRENT_LIST_DIR}/Ubuntu-MinGW-W64-32.cmake")
-
-INCLUDE(${CMAKE_CURRENT_LIST_DIR}/common/Win64.cmake)
-INCLUDE(${CMAKE_CURRENT_LIST_DIR}/common/Ubuntu-MinGW-W64.cmake)

cmake/toolchains/Ubuntu-MinGW-X-Trusty-32.cmake

@@ -1,3 +0,0 @@
-SET(MINGW_PREFIX           /opt/mingw32)
-
-INCLUDE(${CMAKE_CURRENT_LIST_DIR}/common/Ubuntu-MinGW-X-Trusty.cmake)

cmake/toolchains/Ubuntu-MinGW-X-Trusty-64.cmake

@@ -1,9 +0,0 @@
-SET(MINGW_PREFIX   /opt/mingw64)
-SET(MINGW_PREFIX32 /opt/mingw32)
-
-SET(WIN64          TRUE)
-
-SET(CMAKE_TOOLCHAIN_FILE_32			"${CMAKE_CURRENT_LIST_DIR}/Ubuntu-MinGW-X-Trusty-32.cmake")
-SET(CMAKE_PREFIX_PATH_32			"${MINGW_PREFIX32}")
-
-INCLUDE(${CMAKE_CURRENT_LIST_DIR}/common/Ubuntu-MinGW-X-Trusty.cmake)

cmake/toolchains/common/MSYS.cmake

@@ -1,22 +0,0 @@
-# The target environment
-SET(CMAKE_FIND_ROOT_PATH            ${MINGW_PREFIX})
-SET(CMAKE_INSTALL_PREFIX            ${MINGW_PREFIX})
-
-# Windows msys mingw ships with a mostly-suitable preconfigured environment
-SET(STRIP                       ${MINGW_PREFIX}/bin/strip)
-SET(CMAKE_RC_COMPILER           ${MINGW_PREFIX}/bin/windres)
-SET(CMAKE_C_COMPILER            ${MINGW_PREFIX}/bin/gcc)
-SET(CMAKE_CXX_COMPILER          ${MINGW_PREFIX}/bin/g++)
-
-# 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)
-
-SET(LMMS_BUILD_MSYS 1)

cmake/toolchains/common/Ubuntu-MinGW-W64.cmake

@@ -1,17 +0,0 @@
-# Toolchain for Ubuntu MinGw compiler shipped with the mingw-w64 and
-# g++-mingw-w64 packages
-SET(TOOLCHAIN_PREFIX      ${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32)
-set(CMAKE_C_COMPILER      ${TOOLCHAIN_PREFIX}-gcc)
-set(CMAKE_CXX_COMPILER    ${TOOLCHAIN_PREFIX}-g++)
-set(CMAKE_RC_COMPILER     ${TOOLCHAIN_PREFIX}-windres)
-
-set(CMAKE_FIND_ROOT_PATH  /usr/${TOOLCHAIN_PREFIX})
-SET(ENV{PKG_CONFIG}       /usr/bin/${TOOLCHAIN_PREFIX}-pkg-config)
-
-IF(WIN64)
-	SET(TOOLCHAIN_PREFIX32   ${CMAKE_SYSTEM_PROCESSOR32}-w64-mingw32)
-	SET(CMAKE_C_COMPILER32   ${TOOLCHAIN_PREFIX32}-gcc)
-	SET(CMAKE_CXX_COMPILER32 ${TOOLCHAIN_PREFIX32}-g++)
-ENDIF()
-
-INCLUDE(${CMAKE_CURRENT_LIST_DIR}/WinCrossCompile.cmake)

cmake/toolchains/common/Ubuntu-MinGW-X-Trusty.cmake

@@ -1,58 +0,0 @@
-IF(WIN64)
-	INCLUDE(${CMAKE_CURRENT_LIST_DIR}/Win64.cmake)
-ELSE()
-	INCLUDE(${CMAKE_CURRENT_LIST_DIR}/Win32.cmake)
-ENDIF()
-INCLUDE(${CMAKE_CURRENT_LIST_DIR}/WinCrossCompile.cmake)
-
-# The target environment
-SET(CMAKE_FIND_ROOT_PATH            ${MINGW_PREFIX})
-SET(CMAKE_INSTALL_PREFIX            ${MINGW_PREFIX})
-
-# Linux mingw requires explicitly defined tools to prevent clash with native system tools
-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}windres)
-
-# Mingw tools
-SET(STRIP                       ${MINGW_TOOL_PREFIX}strip)
-SET(ENV{PKG_CONFIG}             ${MINGW_TOOL_PREFIX}pkg-config)
-
-# 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)
-
-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("* 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/toolchains/common/Win32.cmake

@@ -1,6 +0,0 @@
-SET(CMAKE_SYSTEM_NAME        Windows)
-SET(CMAKE_SYSTEM_VERSION     1)
-
-SET(CMAKE_SYSTEM_PROCESSOR   i686)
-
-SET(WIN64                    FALSE)

cmake/toolchains/common/Win64.cmake

@@ -1,7 +0,0 @@
-SET(CMAKE_SYSTEM_NAME        Windows)
-SET(CMAKE_SYSTEM_VERSION     1)
-
-SET(CMAKE_SYSTEM_PROCESSOR          x86_64)
-SET(CMAKE_SYSTEM_PROCESSOR32        i686)
-
-SET(WIN64                           TRUE)

cmake/toolchains/common/WinCrossCompile.cmake

@@ -1,9 +0,0 @@
-# Required by cmake if `uname -s` is inadaquate
-SET(CMAKE_SYSTEM_NAME               Windows)
-SET(CMAKE_SYSTEM_VERSION            1)
-
-# 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)