From 62a760c2255cd7ce099df136a8df272e7d00f0fa Mon Sep 17 00:00:00 2001
From: utelle <ulrich.telle@gmx.de>
Date: Sun, 14 Feb 2021 22:59:23 +0100
Subject: [PATCH] Make wxStandardPaths::IgnoreAppBuildSubDirs() more permissive

Add some common architecture-dependent directories to the list of
subdirectories that should be ignored.

For Win32 the directory name x86 is also common.

For Win64 the directory names Win64 and x86_64 are frequently in use,
too.

Closes https://github.com/wxWidgets/wxWidgets/pull/2233
---
 src/msw/stdpaths.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/msw/stdpaths.cpp b/src/msw/stdpaths.cpp
index f2987bf869..a38e262707 100644
--- a/src/msw/stdpaths.cpp
+++ b/src/msw/stdpaths.cpp
@@ -261,10 +261,13 @@ void wxStandardPaths::IgnoreAppBuildSubDirs()
     // there can also be an architecture-dependent parent directory, ignore it
     // as well
 #ifdef __WIN64__
+    IgnoreAppSubDir("Win64");
     IgnoreAppSubDir("x64");
+    IgnoreAppSubDir("x86_64");
     IgnoreAppSubDir("ARM64");
 #else // __WIN32__
     IgnoreAppSubDir("Win32");
+    IgnoreAppSubDir("x86");
 #endif // __WIN64__/__WIN32__
 
     wxString compilerPrefix;