Initial support for winegcc on ARM64

tresf · Feb 5, 2025 · 9078d5c · 9078d5c
1 parent 6a0a4cd
commit 9078d5c
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -116,8 +116,6 @@ jobs:
           ccache --zero-stats
           cmake -S . \
                 -B build \
-                -DWANT_VST_32=OFF \
-                -DWANT_VST_64=OFF \
                 $CMAKE_OPTS
       - name: Build
         run: cmake --build build

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -575,7 +575,14 @@ if(WANT_VST)
 		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(LMMS_HOST_X86_64)
+				CheckWineGcc(-m${bits} "${WINEGCC}" WINEGCC_WORKING)
+			elseif("${bits}" EQUAL 64)
+				# assume 64-bit only
+				CheckWineGcc("" "${WINEGCC}" WINEGCC_WORKING)
+			else()
+				set(WINEGCC_WORKING false)
+			endif()
 			if(WINEGCC_WORKING)
 				set(LMMS_HAVE_VST_${bits} TRUE)
 				if(WINE_LIBRARY_FIX)

diff --git a/cmake/modules/CheckWineGcc.cmake b/cmake/modules/CheckWineGcc.cmake
@@ -1,6 +1,6 @@
 INCLUDE(CheckCXXSourceCompiles)
 
-FUNCTION(CheckWineGcc BITNESS WINEGCC_EXECUTABLE RESULT)
+FUNCTION(CheckWineGcc MPLATFORM WINEGCC_EXECUTABLE RESULT)
 	FILE(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/winegcc_test.cxx" "
 	#include <iostream>
 	#define USE_WS_PREFIX
@@ -9,7 +9,7 @@ FUNCTION(CheckWineGcc BITNESS WINEGCC_EXECUTABLE RESULT)
 		return 0;
 	}
 	")
-	EXECUTE_PROCESS(COMMAND ${WINEGCC_EXECUTABLE} "-m${BITNESS}"
+	EXECUTE_PROCESS(COMMAND ${WINEGCC_EXECUTABLE} "${MPLATFORM}"
 		"${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/winegcc_test.cxx"
 		"-o" "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/winegcc_test"
 		OUTPUT_QUIET ERROR_QUIET

diff --git a/cmake/modules/FindWine.cmake b/cmake/modules/FindWine.cmake
@@ -73,8 +73,13 @@ FIND_PROGRAM(WINE_BUILD NAMES winebuild PATHS ${WINE_CXX_LOCATIONS} NO_DEFAULT_P
 # Detect wine paths and handle linking problems
 IF(WINE_CXX)
 	# call wineg++ to obtain implied includes and libs
-	execute_process(COMMAND ${WINE_CXX} -m32 -v /dev/zero OUTPUT_VARIABLE WINEBUILD_OUTPUT_32 ERROR_QUIET)
-	execute_process(COMMAND ${WINE_CXX} -m64 -v /dev/zero OUTPUT_VARIABLE WINEBUILD_OUTPUT_64 ERROR_QUIET)
+	if(LMMS_HOST_X86_64 OR LMMS_HOST_X86)
+		execute_process(COMMAND ${WINE_CXX} -m32 -v /dev/zero OUTPUT_VARIABLE WINEBUILD_OUTPUT_32 ERROR_QUIET)
+		execute_process(COMMAND ${WINE_CXX} -m64 -v /dev/zero OUTPUT_VARIABLE WINEBUILD_OUTPUT_64 ERROR_QUIET)
+	else()
+		execute_process(COMMAND ${WINE_CXX} -v /dev/zero OUTPUT_VARIABLE WINEBUILD_OUTPUT_64 ERROR_QUIET)
+	endif()
+
 	_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)

diff --git a/plugins/VstBase/RemoteVstPlugin64.cmake b/plugins/VstBase/RemoteVstPlugin64.cmake
@@ -1,12 +1,15 @@
 IF(LMMS_BUILD_WIN64)
 	ADD_SUBDIRECTORY(RemoteVstPlugin)
 ELSEIF(LMMS_BUILD_LINUX)
+	if(LMMS_HOST_X86_64)
+		set(CXX_FLAGS -m64)
+	endif()
 	ExternalProject_Add(RemoteVstPlugin64
 		"${EXTERNALPROJECT_ARGS}"
 		CMAKE_ARGS
 			"${EXTERNALPROJECT_CMAKE_ARGS}"
 			"-DCMAKE_CXX_COMPILER=${WINEGCC}"
-			"-DCMAKE_CXX_FLAGS=-m64"
+			"-DCMAKE_CXX_FLAGS=${CXX_FLAGS}"
 	)
 	INSTALL(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/../RemoteVstPlugin64" "${CMAKE_CURRENT_BINARY_DIR}/../RemoteVstPlugin64.exe.so" DESTINATION "${PLUGIN_DIR}")
 ENDIF()