Merge branch 'master' into fix/msvc

# Conflicts: # plugins/LadspaEffect/CMakeLists.txt # plugins/Xpressive/Xpressive.cpp # plugins/opl2/CMakeLists.txt # plugins/papu/CMakeLists.txt # plugins/xpressive/CMakeLists.txt # src/CMakeLists.txt
2017-11-22 17:26:49 +01:00
parent 852708863a d634ed344f
commit 8f3ab4b1b0
735 changed files with 4298 additions and 213826 deletions
--- a/cmake/linux/CMakeLists.txt
+++ b/cmake/linux/CMakeLists.txt
@@ -1,4 +1,19 @@
-INSTALL(FILES lmms.png                  DESTINATION "${DATA_DIR}/pixmaps")
-INSTALL(FILES lmms                      DESTINATION "${DATA_DIR}/menu")
+INSTALL(FILES lmms.svg                  DESTINATION "${DATA_DIR}/icons/hicolor/scalable/apps")
+INSTALL(FILES project.svg               DESTINATION "${DATA_DIR}/icons/hicolor/scalable/mimetypes/" RENAME "application-x-lmms-project.svg")
 INSTALL(FILES lmms.desktop              DESTINATION "${DATA_DIR}/applications")
 INSTALL(FILES lmms.xml                  DESTINATION "${DATA_DIR}/mime/packages")
+
+# AppImage creation target
+SET(APPIMAGE_FILE "${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${VERSION}-linux-${CMAKE_SYSTEM_PROCESSOR}.AppImage")
+
+CONFIGURE_FILE("package_linux.sh.in"    "${CMAKE_BINARY_DIR}/package_linux.sh" @ONLY)
+
+FILE(REMOVE "${APPIMAGE_FILE}")
+ADD_CUSTOM_TARGET(removeappimage
+	COMMAND rm -f "${APPIMAGE_FILE}"
+	COMMENT "Removing old AppImage")
+ADD_CUSTOM_TARGET(appimage 
+	COMMAND chmod +x "${CMAKE_BINARY_DIR}/package_linux.sh"
+	COMMAND "${CMAKE_BINARY_DIR}/package_linux.sh"
+	COMMENT "Generating AppImage")
+ADD_DEPENDENCIES(appimage removeappimage)
--- a/cmake/linux/lmms
+++ b/cmake/linux/lmms
@@ -1,4 +1,4 @@
 ?package(lmms):needs="X11" section="Apps/Sound" \
  title="LMMS" hints="Audio" command="/usr/bin/lmms" \
  longtitle="LMMS" \
-  icon="/usr/share/pixmaps/lmms.png"
+  icon="/usr/share/icons/hicolor/scalable/apps/lmms.svg"
--- a/cmake/linux/lmms.desktop
+++ b/cmake/linux/lmms.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Name=LMMS
-GenericName=music production suite
+GenericName=Music production suite
 GenericName[ca]=Programari de producció musical
 GenericName[de]=Software zur Musik-Produktion
 GenericName[fr]=Ensemble pour la production musicale
 GenericName[pl]=Narzędzia do produkcji muzyki
-Comment=easy music production for everyone!
+Comment=Music sequencer and synthesizer
 Comment[ca]=Producció fàcil de música per a tothom!
 Comment[fr]=Production facile de musique pour tout le monde !
 Comment[pl]=Prosta produkcja muzyki dla każdego!
--- a/cmake/linux/lmms.svg
+++ b/cmake/linux/lmms.svg
--- a/cmake/linux/lmms.xml
+++ b/cmake/linux/lmms.xml
@@ -4,11 +4,7 @@
    <sub-class-of type="application/xml"/>
    <comment>LMMS project</comment>
    <comment xml:lang="ca">Projecte LMMS</comment>
-    <glob pattern="*.mmp"/>
    <glob pattern="*.mmpz"/>
-    <magic priority="80">
-      <match type="string" value="&lt;!DOCTYPE multimedia-project" offset="0:256"/>
-      <match type="string" value="&lt;multimedia-project" offset="0:64"/>
-    </magic>
+    <glob pattern="*.mmp"/>
  </mime-type>
 </mime-info>
--- a/cmake/linux/package_linux.sh.in
+++ b/cmake/linux/package_linux.sh.in
@@ -0,0 +1,184 @@
+#!/usr/bin/env bash
+# Creates Linux ".AppImage" for @PROJECT_NAME_UCASE@
+#
+# Depends:  linuxdeployqt
+#
+# Notes:    Will attempt to fetch linuxdeployqt automatically (x86_64 only)
+#           See Also: https://github.com/probonopd/linuxdeployqt/blob/master/BUILDING.md
+
+set -e
+
+USERBIN="$HOME/bin"
+LINUXDEPLOYQT="$USERBIN/linuxdeployqt"
+APPIMAGETOOL="$USERBIN/appimagetool"
+VERBOSITY=2 # 3=debug
+LOGFILE="@CMAKE_BINARY_DIR@/appimage.log"
+APPDIR="@CMAKE_BINARY_DIR@/@PROJECT_NAME_UCASE@.AppDir/"
+DESKTOPFILE="${APPDIR}usr/share/applications/lmms.desktop"
+STRIP=""
+
+# Don't strip for Debug|RelWithDebInfo builds
+# shellcheck disable=SC2193
+if [[ "@CMAKE_BUILD_TYPE@" == *"Deb"* ]]; then
+	STRIP="-no-strip"
+fi
+
+# Console colors
+RED="\\x1B[1;31m"
+GREEN="\\x1B[1;32m"
+YELLOW="\\x1B[1;33m"
+PLAIN="\\x1B[0m"
+
+function error {
+	echo -e "   ${PLAIN}[${RED}error${PLAIN}] ${1}"
+	return 1
+}
+
+function success {
+	echo -e "   ${PLAIN}[${GREEN}success${PLAIN}] ${1}"
+}
+
+function skipped {
+	echo -e "   ${PLAIN}[${YELLOW}skipped${PLAIN}] ${1}"
+}
+
+
+# Check for problematic install locations
+INSTALL=$(echo "@CMAKE_INSTALL_PREFIX@" | sed 's/\/*$//g')
+if [ "$INSTALL" == "/usr/local" ] || [ "$INSTALL" == "/usr" ] ; then
+	error "Incompatible CMAKE_INSTALL_PREFIX for creating AppImage: @CMAKE_INSTALL_PREFIX@"
+fi
+
+echo -e "\nWriting verbose output to \"${LOGFILE}\""
+
+# Ensure linuxdeployqt uses the same qmake version as cmake
+export PATH
+PATH="$(dirname "@QT_QMAKE_EXECUTABLE@")":$PATH
+
+# Fetch portable linuxdeployqt if cache is older than $DAYSOLD
+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
+	mv "squashfs-root/usr/bin/appimagetool" "$APPIMAGETOOL"
+	success "Extracted $APPIMAGETOOL"
+	mv "squashfs-root/usr/bin/mksquashfs" "$USERBIN/mksquashfs"
+	success "Extracted $USERBIN/mksquashfs"
+	rm -rf "squashfs-root/"
+
+else
+	skipped "$LINUXDEPLOYQT is less than $DAYSOLD days old"
+fi
+
+# Make skeleton AppDir
+echo -e "\nCreating ${APPDIR}..."
+rm -rf "${APPDIR}"
+mkdir -p "${APPDIR}usr"
+success "Created ${APPDIR}"
+
+# Clone install to AppDir
+echo -e "\nCopying @CMAKE_INSTALL_PREFIX@ to ${APPDIR}..."
+cp -R "@CMAKE_INSTALL_PREFIX@/." "${APPDIR}usr"
+rm -rf "${APPDIR}usr/include"
+success "${APPDIR}"
+
+# Copy rawwaves directory for stk/mallets
+mkdir -p "${APPDIR}usr/share/stk/"
+cp -R /usr/share/stk/rawwaves/ "${APPDIR}usr/share/stk/"
+
+# Create a wrapper script which calls the lmms executable
+mv "${APPDIR}usr/bin/lmms" "${APPDIR}usr/bin/lmms.real"
+# shellcheck disable=SC1083
+cat >"${APPDIR}usr/bin/lmms" <<EOL
+#!/usr/bin/env bash
+DIR="\$( cd "\$( dirname "\${BASH_SOURCE[0]}" )" && pwd )"
+export LD_LIBRARY_PATH=\$DIR/usr/lib/:\$DIR/usr/lib/lmms:\$LD_LIBRARY_PATH
+# Prevent segfault on VirualBox
+if lsmod |grep vboxguest > /dev/null 2>&1; then
+   echo "VirtualBox detected.  Forcing libgl software rendering."
+   export LIBGL_ALWAYS_SOFTWARE=1;
+fi
+if ldconfig -p | grep libjack.so.0 > /dev/null 2>&1; then
+   echo "Jack appears to be installed on this system, so we'll use it."
+else
+   echo "Jack does not appear to be installed.  That's OK, we'll use a dummy version instead."
+   export LD_LIBRARY_PATH=\$DIR/usr/lib/lmms/optional:\$LD_LIBRARY_PATH
+fi
+QT_X11_NO_NATIVE_MENUBAR=1 QT_AUTO_SCREEN_SCALE_FACTOR=1 \$DIR/usr/bin/lmms.real "\$@"
+EOL
+
+chmod +x "${APPDIR}usr/bin/lmms"
+
+# Per https://github.com/probonopd/linuxdeployqt/issues/129 
+unset LD_LIBRARY_PATH
+
+# Ensure linuxdeployqt can find shared objects
+export LD_LIBRARY_PATH="${APPDIR}usr/lib/lmms/":$LD_LIBRARY_PATH
+
+# Handle wine linking
+if [ -d "@WINE_LIBRARY_FIX@" ]; then
+   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@WINE_LIBRARY_FIX@:@WINE_LIBRARY_FIX@wine/
+fi
+
+# Move executables so linuxdeployqt can find them
+ZYNLIB="${APPDIR}usr/lib/lmms/RemoteZynAddSubFx"
+VSTLIB="${APPDIR}usr/lib/lmms/RemoteVstPlugin.exe.so"
+
+ZYNBIN="${APPDIR}usr/bin/RemoteZynAddSubFx"
+VSTBIN="${APPDIR}usr/bin/RemoteVstPlugin.exe.so"
+
+mv "$ZYNLIB" "$ZYNBIN"
+mv "$VSTLIB" "$VSTBIN"
+
+# Patch the desktop file
+sed -i 's/.*Exec=.*/Exec=lmms.real/' "$DESKTOPFILE"
+
+# Fix linking for soft-linked plugins
+for file in "${APPDIR}usr/lib/lmms/"*.so; do
+   thisfile="${APPDIR}usr/lib/lmms/${file##*/}"
+   executables="${executables} -executable=$thisfile"
+done
+executables="${executables} -executable=${ZYNBIN}"
+executables="${executables} -executable=${VSTBIN}"
+executables="${executables} -executable=${APPDIR}usr/lib/lmms/ladspa/imp_1199.so"
+executables="${executables} -executable=${APPDIR}usr/lib/lmms/ladspa/imbeq_1197.so"
+executables="${executables} -executable=${APPDIR}usr/lib/lmms/ladspa/pitch_scale_1193.so"
+executables="${executables} -executable=${APPDIR}usr/lib/lmms/ladspa/pitch_scale_1194.so"
+
+# Bundle both qt and non-qt dependencies into appimage format
+echo -e "\nBundling and relinking system dependencies..."
+echo -e ">>>>> linuxdeployqt" > "$LOGFILE"
+# shellcheck disable=SC2086
+"$LINUXDEPLOYQT" "$DESKTOPFILE" $executables -bundle-non-qt-libs -verbose=$VERBOSITY $STRIP >> "$LOGFILE" 2>&1
+success "Bundled and relinked dependencies"
+
+# Link to original location so lmms can find them
+ln -sr  "$ZYNBIN" "$ZYNLIB"
+ln -sr  "$VSTBIN" "$VSTLIB"
+
+# Remove wine library conflict
+rm -f "${APPDIR}/usr/lib/libwine.so.1"
+
+# Remove problematic jack library, replace with weakjack
+if [ -e "${APPDIR}/usr/lib/libjack.so.0" ]; then
+   rm -f "${APPDIR}/usr/lib/libjack.so.0"
+   ln -sr "${APPDIR}usr/lib/lmms/optional/libweakjack.so" "${APPDIR}usr/lib/lmms/optional/libjack.so.0"
+fi
+
+# Create AppImage
+echo -e "\nFinishing the AppImage..."
+echo -e "\n\n>>>>> appimagetool" >> "$LOGFILE"
+"$APPIMAGETOOL" "${APPDIR}" "@APPIMAGE_FILE@" >> "$LOGFILE" 2>&1
+success "Created @APPIMAGE_FILE@"
+
+echo -e "\nFinished"
--- a/cmake/linux/project.svg
+++ b/cmake/linux/project.svg
--- a/cmake/modules/CheckSubmodules.cmake
+++ b/cmake/modules/CheckSubmodules.cmake
@@ -0,0 +1,184 @@
+# 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(SKIP_SUBMODULES "foo;bar")
+#
+# Or via command line:       
+#       cmake -DSKIP_SUBMODULES=foo;bar
+#
+# Copyright (c) 2017, 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")
+
+# 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("\nValidating submodules...")
+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")
+
+# Assume alpha-numeric paths
+STRING(REGEX MATCHALL "path = [-0-9A-Za-z/]+" SUBMODULE_LIST ${SUBMODULE_DATA})
+STRING(REGEX MATCHALL "url = [.:%-0-9A-Za-z/]+" SUBMODULE_URL_LIST ${SUBMODULE_DATA})
+
+FOREACH(_part ${SUBMODULE_LIST})
+	STRING(REPLACE "path = " "" SUBMODULE_PATH ${_part})
+
+	LIST(FIND SUBMODULE_LIST ${_part} SUBMODULE_INDEX)
+	LIST(GET SUBMODULE_URL_LIST ${SUBMODULE_INDEX} _url)
+	STRING(REPLACE "url = " "" SUBMODULE_URL ${_url})
+
+	# Remove submodules from validation as specified in -DSKIP_SUBMODULES=foo;bar
+	SET(SKIP false)
+	IF(SKIP_SUBMODULES)
+		FOREACH(_skip ${SKIP_SUBMODULES})
+			IF(${SUBMODULE_PATH} MATCHES ${_skip})
+				MESSAGE("-- Skipping ${SUBMODULE_PATH} matches \"${_skip}\"")
+				SET(SKIP true)
+			ENDIF()
+		ENDFOREACH()
+	ENDIF()
+	IF(NOT SKIP)
+		LIST(INSERT SUBMODULE_LIST ${SUBMODULE_INDEX} ${SUBMODULE_PATH})
+		LIST(INSERT SUBMODULE_URL_LIST ${SUBMODULE_INDEX} ${SUBMODULE_URL})
+	ENDIF()
+	LIST(REMOVE_ITEM SUBMODULE_LIST ${_part})
+	LIST(REMOVE_ITEM SUBMODULE_URL_LIST ${_url})
+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)
+	FIND_PACKAGE(Git REQUIRED)
+	# Handle missing commits
+	SET(FORCE_REMOTE_FLAG "${FORCE_REMOTE}")
+	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)
+	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
+		)
+		# Recurse
+		GIT_SUBMODULE(${SUBMODULE_PATH} false false)
+	ELSE()
+		# Try to use the depth switch
+		SET(DEPTH_CMD "")
+			MESSAGE("--   Fetching ${SUBMODULE_PATH}")
+		IF(DEPTH_VALUE)
+			SET(DEPTH_CMD "--depth" )
+			MESSAGE("--   Fetching ${SUBMODULE_PATH} @ --depth ${DEPTH_VALUE}")
+		ENDIF()
+		
+		EXECUTE_PROCESS(
+			COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive ${DEPTH_CMD} ${DEPTH_VALUE} ${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")
+SET(RETRY_PHRASES "Failed to recurse;unadvertised object;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)
+
+		SET(COUNTED 0)
+		SET(COUNTING "")
+		# 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)
+			LIST(APPEND COUNTING "x")
+			LIST(LENGTH COUNTING COUNTED)
+			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})
+					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}")
+					BREAK()
+				ELSEIF("${GIT_MESSAGE}" MATCHES "${_phrase}")
+					MESSAGE("--   Retrying ${_submodule} using 'deinit' (attempt ${COUNTED} of ${MAX_ATTEMPTS})...")
+
+					# Shallow submodules were introduced in 1.8.4
+					# Shallow commits can fail to clone from non-default branches, only try once
+					IF(GIT_VERSION_STRING VERSION_GREATER "1.8.3" AND COUNTED LESS 2)
+						# Try a shallow submodule clone
+					ELSE()
+						UNSET(DEPTH_VALUE)
+					ENDIF()
+					
+					GIT_SUBMODULE(${_submodule} true 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}")
--- a/cmake/modules/FindWine.cmake
+++ b/cmake/modules/FindWine.cmake
@@ -16,6 +16,26 @@ FIND_PROGRAM(WINE_CXX NAMES wineg++ winegcc winegcc64 winegcc32)
 SET(WINE_INCLUDE_DIRS ${WINE_INCLUDE_DIR} )
 SET(WINE_LIBRARIES ${WINE_LIBRARY} )

+# Handle wine linking problems
+EXEC_PROGRAM(${WINE_CXX} ARGS "-v -m32 /dev/zero" OUTPUT_VARIABLE WINEBUILD_OUTPUT)
+
+# Debian systems 
+IF("${WINEBUILD_OUTPUT}" MATCHES ".*x86_64-linux-gnu/wine/libwinecrt0.a.*")
+	SET(WINE_LIBRARY_FIX "/usr/lib/i386-linux-gnu/" )
+# Fedora systems 
+ELSEIF("${WINEBUILD_OUTPUT}" MATCHES "/usr/lib/lib64/wine/libwinecrt0.a.*")
+	SET(WINE_LIBRARY_FIX "/usr/lib/i386/")
+# Wine stable
+ELSEIF("${WINEBUILD_OUTPUT}" MATCHES "/opt/wine-stable/lib64/wine/libwinecrt0.a.*")
+	SET(WINE_LIBRARY_FIX "/opt/wine-stable/lib/")
+# Wine development
+ELSEIF("${WINEBUILD_OUTPUT}" MATCHES "/opt/wine-devel/lib64/wine/libwinecrt0.a.*")
+	SET(WINE_LIBRARY_FIX "/opt/wine-devel/lib/")
+# Wine staging
+ELSEIF("${WINEBUILD_OUTPUT}" MATCHES "/opt/wine-staging/lib64/wine/libwinecrt0.a.*")
+	SET(WINE_LIBRARY_FIX "/opt/wine-staging/lib/")
+ENDIF()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Wine DEFAULT_MSG WINE_LIBRARIES WINE_INCLUDE_DIRS)