From f7b4c91163ceeb47380efe5d2df95cba1d1014a3 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Mon, 19 Jul 2021 15:38:00 +0200 Subject: [PATCH] extend PATH to find wine --- configure/os/CONFIG.RHEL7-x86_64.win32-x86 | 5 +---- configure/os/CONFIG.RHEL7-x86_64.windows-x64 | 5 +---- configure/os/CONFIG.RHEL8-x86_64.win32-x86 | 5 +---- configure/os/CONFIG.RHEL8-x86_64.windows-x64 | 5 +---- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/configure/os/CONFIG.RHEL7-x86_64.win32-x86 b/configure/os/CONFIG.RHEL7-x86_64.win32-x86 index 93b0b79bc..c2a22ffa5 100644 --- a/configure/os/CONFIG.RHEL7-x86_64.win32-x86 +++ b/configure/os/CONFIG.RHEL7-x86_64.win32-x86 @@ -2,7 +2,4 @@ include $(CONFIG)/os/CONFIG.win32-x86.win32-x86 PATH_FILTER = $(subst /,/,$(1)) -# Silence the tr1 namespace deprecation warnings -USR_CXXFLAGS_WIN32 += -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING - -MSVC_DIR = /opt/wine-msvc-2017/bin/x86/ +PATH := /opt/wine-msvc-2017/bin/x86:$(PATH) diff --git a/configure/os/CONFIG.RHEL7-x86_64.windows-x64 b/configure/os/CONFIG.RHEL7-x86_64.windows-x64 index 8ea1a5ee5..62c9136b0 100644 --- a/configure/os/CONFIG.RHEL7-x86_64.windows-x64 +++ b/configure/os/CONFIG.RHEL7-x86_64.windows-x64 @@ -2,7 +2,4 @@ include $(CONFIG)/os/CONFIG.windows-x64.windows-x64 PATH_FILTER = $(subst /,/,$(1)) -# Silence the tr1 namespace deprecation warnings -USR_CXXFLAGS_WIN32 += -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING - -MSVC_DIR = /opt/wine-msvc-2017/bin/x64/ +PATH := /opt/wine-msvc-2017/bin/x64:$(PATH) diff --git a/configure/os/CONFIG.RHEL8-x86_64.win32-x86 b/configure/os/CONFIG.RHEL8-x86_64.win32-x86 index 93b0b79bc..c2a22ffa5 100644 --- a/configure/os/CONFIG.RHEL8-x86_64.win32-x86 +++ b/configure/os/CONFIG.RHEL8-x86_64.win32-x86 @@ -2,7 +2,4 @@ include $(CONFIG)/os/CONFIG.win32-x86.win32-x86 PATH_FILTER = $(subst /,/,$(1)) -# Silence the tr1 namespace deprecation warnings -USR_CXXFLAGS_WIN32 += -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING - -MSVC_DIR = /opt/wine-msvc-2017/bin/x86/ +PATH := /opt/wine-msvc-2017/bin/x86:$(PATH) diff --git a/configure/os/CONFIG.RHEL8-x86_64.windows-x64 b/configure/os/CONFIG.RHEL8-x86_64.windows-x64 index 8ea1a5ee5..62c9136b0 100644 --- a/configure/os/CONFIG.RHEL8-x86_64.windows-x64 +++ b/configure/os/CONFIG.RHEL8-x86_64.windows-x64 @@ -2,7 +2,4 @@ include $(CONFIG)/os/CONFIG.windows-x64.windows-x64 PATH_FILTER = $(subst /,/,$(1)) -# Silence the tr1 namespace deprecation warnings -USR_CXXFLAGS_WIN32 += -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING - -MSVC_DIR = /opt/wine-msvc-2017/bin/x64/ +PATH := /opt/wine-msvc-2017/bin/x64:$(PATH)