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
This commit is contained in:
@@ -295,6 +295,14 @@ void wxStandardPaths::IgnoreAppBuildSubDirs()
|
|||||||
IgnoreAppSubDir("debug");
|
IgnoreAppSubDir("debug");
|
||||||
IgnoreAppSubDir("release");
|
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;
|
wxString compilerPrefix;
|
||||||
#ifdef __VISUALC__
|
#ifdef __VISUALC__
|
||||||
compilerPrefix = "vc";
|
compilerPrefix = "vc";
|
||||||
|
Reference in New Issue
Block a user