From 3696b0e54454d7409a67bacc24da1e0e830676ab Mon Sep 17 00:00:00 2001
From: Aki <please@ignore.pl>
Date: Tue, 20 Feb 2024 23:48:05 +0100
Subject: Fixed CMAKE_CROSSCOMPILING_EMULATOR; wine should work more
 consistently now

---
 cmake/modules/AddDatafile.cmake        | 8 +++-----
 cmake/toolchains/i686-w64-mingw32-wine | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/cmake/modules/AddDatafile.cmake b/cmake/modules/AddDatafile.cmake
index ae9039c..fd454b7 100644
--- a/cmake/modules/AddDatafile.cmake
+++ b/cmake/modules/AddDatafile.cmake
@@ -38,13 +38,11 @@ function(add_datafile DATAFILE_TARGET)
 	if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
 		set(DATAFILE_VAR PATH)
 		set(DATAFILE_PATHS $ENV{PATH})
-		list(PREPEND DATAFILE_PATHS $<TARGET_FILE_DIR:Zlib::zlib>)
 	else()
 		set(DATAFILE_VAR WINEPATH)
 		set(DATAFILE_PATHS $ENV{WINEPATH})
-		list(PREPEND DATAFILE_PATHS $<TARGET_FILE_DIR:Zlib::zlib>)
-		list(PREPEND DATAFILE_PATHS $<SHELL_PATH:${CMAKE_FIND_ROOT_PATH}/bin>)
 	endif()
+	list(PREPEND DATAFILE_PATHS $<TARGET_FILE_DIR:Zlib::zlib>)
 	add_custom_command(
 		OUTPUT ${DATAFILE_OUTPUT}
 		COMMAND ${CMAKE_COMMAND} -E rm -f ${DATAFILE_OUTPUT}
@@ -58,7 +56,7 @@ function(add_datafile DATAFILE_TARGET)
 			COMMAND
 				${CMAKE_COMMAND} -E chdir ${RESOURCE_DIRECTORY}
 				${CMAKE_COMMAND} -E env "${DATAFILE_VAR}='${DATAFILE_PATHS}'"
-				${CMAKE_CORSSCOMPILING_EMULATOR}
+				${CMAKE_CROSSCOMPILING_EMULATOR}
 				$<TARGET_FILE:dat> -cu $<SHELL_PATH:${DATAFILE_OUTPUT}> .
 			)
 	endforeach()
@@ -75,7 +73,7 @@ function(add_datafile DATAFILE_TARGET)
 			COMMAND
 				${CMAKE_COMMAND} -E chdir ${DATAFILE_SOURCE}
 				${CMAKE_COMMAND} -E env "${DATAFILE_VAR}='${DATAFILE_PATHS}'"
-				${CMAKE_CORSSCOMPILING_EMULATOR}
+				${CMAKE_CROSSCOMPILING_EMULATOR}
 				$<TARGET_FILE:dat> -cu $<SHELL_PATH:${DATAFILE_OUTPUT}> .
 			)
 	endif()
diff --git a/cmake/toolchains/i686-w64-mingw32-wine b/cmake/toolchains/i686-w64-mingw32-wine
index 65b4aad..6f67c68 100755
--- a/cmake/toolchains/i686-w64-mingw32-wine
+++ b/cmake/toolchains/i686-w64-mingw32-wine
@@ -2,6 +2,6 @@
 toolchain=i686-w64-mingw32
 prefix=/usr/$toolchain
 export WINEPREFIX=$HOME/.wine-$toolchain
-export WINEPATH=$prefix/bin
+export WINEPATH="${WINEPATH:+${WINEPATH};}$prefix/bin"
 export WINEARCH=win32
 exec /usr/bin/wine "$@"
-- 
cgit v1.1