From 79e27d2a087afbd6b81cc614ff87628d90dcd78c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 24 Aug 2014 15:31:24 +0000
Subject: [PATCH] Also ignore arch-specific build directories in wxMSW
 wxStandardPaths.

In addition to ignoring debug/release subdirectories, also ignore their
(possible) parent Win32/x64 directories, and for the same reason: this allows
the code using wxStandardPaths to work even when the program is ran from the
build directory.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/msw/stdpaths.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/msw/stdpaths.cpp b/src/msw/stdpaths.cpp
index b79d87f940..1f46b139d9 100644
--- a/src/msw/stdpaths.cpp
+++ b/src/msw/stdpaths.cpp
@@ -295,6 +295,14 @@ void wxStandardPaths::IgnoreAppBuildSubDirs()
     IgnoreAppSubDir("debug");
     IgnoreAppSubDir("release");
 
+    // there can also be an architecture-dependent parent directory, ignore it
+    // as well
+#ifdef __WIN64__
+    IgnoreAppSubDir("x64");
+#else // __WIN32__
+    IgnoreAppSubDir("Win32");
+#endif // __WIN64__/__WIN32__
+
     wxString compilerPrefix;
 #ifdef __VISUALC__
     compilerPrefix = "vc";