Revert irrelevant changes

cmake/linux/package_linux.sh.in

@@ -108,7 +108,7 @@ chmod +x "${APPDIR}usr/bin/lmms"
 unset LD_LIBRARY_PATH
 
 # Ensure linuxdeployqt can find shared objects
-export LD_LIBRARY_PATH="${APPDIR}"usr/lib/:"${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"
 
 # Move executables so linuxdeployqt can find them
 ZYNLIB="${APPDIR}usr/lib/lmms/RemoteZynAddSubFx"

cmake/modules/BuildPlugin.cmake

@@ -5,14 +5,10 @@
 
 INCLUDE(GenQrc)
 
-FUNCTION(BUILD_PLUGIN PLUGIN_NAME)
-	CMAKE_PARSE_ARGUMENTS(PLUGIN "" "DESTINATION;LINK;EXPORT_BASE_NAME" "MOCFILES;EMBEDDED_RESOURCES;UICFILES" ${ARGN})
+MACRO(BUILD_PLUGIN PLUGIN_NAME)
+	CMAKE_PARSE_ARGUMENTS(PLUGIN "" "LINK;EXPORT_BASE_NAME" "MOCFILES;EMBEDDED_RESOURCES;UICFILES" ${ARGN})
 	SET(PLUGIN_SOURCES ${PLUGIN_UNPARSED_ARGUMENTS})
 
-	IF(NOT PLUGIN_DESTINATION)
-		SET(PLUGIN_DESTINATION "${PLUGIN_DIR}")
-	ENDIF()
-
 	INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_SOURCE_DIR}/include")
 
 	ADD_DEFINITIONS(-DPLUGIN_NAME=${PLUGIN_NAME})
@@ -60,17 +56,26 @@ FUNCTION(BUILD_PLUGIN PLUGIN_NAME)
 
 	ADD_LIBRARY(${PLUGIN_NAME} ${PLUGIN_LINK} ${PLUGIN_SOURCES} ${plugin_MOC_out} ${RCC_OUT})
 
-	TARGET_LINK_LIBRARIES(${PLUGIN_NAME} Qt5::Widgets Qt5::Xml lmmslib)
+	TARGET_LINK_LIBRARIES(${PLUGIN_NAME} Qt5::Widgets Qt5::Xml)
+
+	IF(LMMS_BUILD_WIN32)
+		TARGET_LINK_LIBRARIES(${PLUGIN_NAME} lmms)
+	ENDIF(LMMS_BUILD_WIN32)
 
 	INSTALL(TARGETS ${PLUGIN_NAME}
-		LIBRARY DESTINATION "${PLUGIN_DESTINATION}"
-		RUNTIME DESTINATION "${PLUGIN_DESTINATION}"
+		LIBRARY DESTINATION "${PLUGIN_DIR}"
+		RUNTIME DESTINATION "${PLUGIN_DIR}"
 	)
 
-	IF(LMMS_BUILD_APPLE AND "${PLUGIN_LINK}" STREQUAL "SHARED")
-		SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
-	ENDIF()
-	IF(LMMS_BUILD_WIN32 AND STRIP)
+	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)
 		IF(STRIP)
 			ADD_CUSTOM_COMMAND(TARGET ${PLUGIN_NAME} POST_BUILD COMMAND ${STRIP} "$<TARGET_FILE:${PLUGIN_NAME}>")
 		ENDIF()
@@ -92,4 +97,5 @@ FUNCTION(BUILD_PLUGIN PLUGIN_NAME)
 
 	SET_PROPERTY(GLOBAL APPEND PROPERTY PLUGINS_BUILT ${PLUGIN_NAME})
 	GET_PROPERTY(PLUGINS_BUILT GLOBAL PROPERTY PLUGINS_BUILT)
-ENDFUNCTION(BUILD_PLUGIN)
+ENDMACRO(BUILD_PLUGIN)
+

cmake/modules/DetectMachine.cmake

@@ -1,5 +1,3 @@
-INCLUDE(CheckCXXSourceCompiles)
-
 IF(WIN32)
 	SET(LMMS_BUILD_WIN32 1)
 ELSEIF(APPLE)
@@ -109,27 +107,3 @@ IF(LMMS_BUILD_APPLE)
 	STRING(REGEX REPLACE "\\.[0-9]*$" "" APPLE_OS_VER "${APPLE_OS_VER}")
 	SET(CMAKE_MACOSX_RPATH 1)	
 ENDIF()
-
-# Detect MinGW
-IF(WIN32 AND CMAKE_COMPILER_IS_GNUCXX)
-	SET(MINGW TRUE)
-ENDIF()
-
-# Detect MINGW thread support
-IF(MINGW)
-	CHECK_CXX_SOURCE_COMPILES("
-	#include <mutex>
-	#include <thread>
-	int main(int argc, const char* argv[]) {
-		std::mutex m;
-		std::this_thread::yield();
-		return 0;
-	}
-	" HAS_STD_THREADS)
-	IF(NOT HAS_STD_THREADS)
-		SET(NEED_MINGW_THREADS_REPLACEMENT TRUE)
-	ELSE()
-		SET(NEED_MINGW_THREADS_REPLACEMENT FALSE)
-	ENDIF()
-	MESSAGE(NEED_MINGW_THREADS_REPLACEMENT ${NEED_MINGW_THREADS_REPLACEMENT})
-ENDIF()

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

@@ -5,16 +5,13 @@ set(CMAKE_C_COMPILER      ${TOOLCHAIN_PREFIX}-gcc)
 set(CMAKE_CXX_COMPILER    ${TOOLCHAIN_PREFIX}-g++)
 set(CMAKE_RC_COMPILER     ${TOOLCHAIN_PREFIX}-windres)
 
-set(MINGW_PREFIX          /usr/${TOOLCHAIN_PREFIX})
-
-set(CMAKE_FIND_ROOT_PATH  ${MINGW_PREFIX})
+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++)
-	set(MINGW_PREFIX32       /usr/${TOOLCHAIN_PREFIX32})
 ENDIF()
 
 INCLUDE(${CMAKE_CURRENT_LIST_DIR}/WinCrossCompile.cmake)