From 3ac3906fea538498577aae04f301f36ba61e8034 Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Wed, 15 Jun 2022 12:00:38 +0200
Subject: [PATCH] unify cross windows builds with separate wine dirs per host
 arch (and thus wine version)

---
 configure/os/CONFIG.Linux.win32-x86          | 4 ++++
 configure/os/CONFIG.Linux.windows-x64        | 4 ++++
 configure/os/CONFIG.RHEL7-x86_64.win32-x86   | 4 +---
 configure/os/CONFIG.RHEL7-x86_64.windows-x64 | 4 +---
 configure/os/CONFIG.RHEL8-x86_64.win32-x86   | 6 +-----
 configure/os/CONFIG.RHEL8-x86_64.windows-x64 | 6 +-----
 6 files changed, 12 insertions(+), 16 deletions(-)
 create mode 100644 configure/os/CONFIG.Linux.win32-x86
 create mode 100644 configure/os/CONFIG.Linux.windows-x64

diff --git a/configure/os/CONFIG.Linux.win32-x86 b/configure/os/CONFIG.Linux.win32-x86
new file mode 100644
index 000000000..8e229ac11
--- /dev/null
+++ b/configure/os/CONFIG.Linux.win32-x86
@@ -0,0 +1,4 @@
+include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
+
+PATH := /opt/wine-msvc-2017/bin/x86:$(PATH)
+export WINEPREFIX = $(HOME)/.wine-$(EPICS_HOST_ARCH)
diff --git a/configure/os/CONFIG.Linux.windows-x64 b/configure/os/CONFIG.Linux.windows-x64
new file mode 100644
index 000000000..62eadf653
--- /dev/null
+++ b/configure/os/CONFIG.Linux.windows-x64
@@ -0,0 +1,4 @@
+include $(CONFIG)/os/CONFIG.windows-x64.windows-x64
+
+PATH := /opt/wine-msvc-2017/bin/x64:$(PATH)
+export WINEPREFIX = $(HOME)/.wine-$(EPICS_HOST_ARCH)
diff --git a/configure/os/CONFIG.RHEL7-x86_64.win32-x86 b/configure/os/CONFIG.RHEL7-x86_64.win32-x86
index e3e9d6d2e..22830f6c2 100644
--- a/configure/os/CONFIG.RHEL7-x86_64.win32-x86
+++ b/configure/os/CONFIG.RHEL7-x86_64.win32-x86
@@ -1,3 +1 @@
-include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
-
-PATH := /opt/wine-msvc-2017/bin/x86:$(PATH)
+include $(CONFIG)/os/CONFIG.Linux.win32-x86
diff --git a/configure/os/CONFIG.RHEL7-x86_64.windows-x64 b/configure/os/CONFIG.RHEL7-x86_64.windows-x64
index f2019c929..f79e7a452 100644
--- a/configure/os/CONFIG.RHEL7-x86_64.windows-x64
+++ b/configure/os/CONFIG.RHEL7-x86_64.windows-x64
@@ -1,3 +1 @@
-include $(CONFIG)/os/CONFIG.windows-x64.windows-x64
-
-PATH := /opt/wine-msvc-2017/bin/x64:$(PATH)
+include $(CONFIG)/os/CONFIG.Linux.windows-x64
diff --git a/configure/os/CONFIG.RHEL8-x86_64.win32-x86 b/configure/os/CONFIG.RHEL8-x86_64.win32-x86
index c2a22ffa5..22830f6c2 100644
--- a/configure/os/CONFIG.RHEL8-x86_64.win32-x86
+++ b/configure/os/CONFIG.RHEL8-x86_64.win32-x86
@@ -1,5 +1 @@
-include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
-
-PATH_FILTER = $(subst /,/,$(1))
-
-PATH := /opt/wine-msvc-2017/bin/x86:$(PATH)
+include $(CONFIG)/os/CONFIG.Linux.win32-x86
diff --git a/configure/os/CONFIG.RHEL8-x86_64.windows-x64 b/configure/os/CONFIG.RHEL8-x86_64.windows-x64
index 62c9136b0..f79e7a452 100644
--- a/configure/os/CONFIG.RHEL8-x86_64.windows-x64
+++ b/configure/os/CONFIG.RHEL8-x86_64.windows-x64
@@ -1,5 +1 @@
-include $(CONFIG)/os/CONFIG.windows-x64.windows-x64
-
-PATH_FILTER = $(subst /,/,$(1))
-
-PATH := /opt/wine-msvc-2017/bin/x64:$(PATH)
+include $(CONFIG)/os/CONFIG.Linux.windows-x64