diff --git a/modules/juce_core/files/juce_File.h b/modules/juce_core/files/juce_File.h index 8f18d99f1b..de3a7d9e9f 100644 --- a/modules/juce_core/files/juce_File.h +++ b/modules/juce_core/files/juce_File.h @@ -877,10 +877,21 @@ public: #endif /** The directory in which applications normally get installed. - So on windows, this would be something like "c:\program files", on the + So on windows, this would be something like "C:\Program Files", on the Mac "/Applications", or "/usr" on linux. */ - globalApplicationsDirectory + globalApplicationsDirectory, + + #if JUCE_WINDOWS + /** On a Windows machine, returns the directory in which 32 bit applications + normally get installed. On a 64 bit machine this would be something like + "C:\Program Files (x86)", whereas for 32 bit machines this would match + globalApplicationsDirectory and be something like "C:\Program Files". + + @see globalApplicationsDirectory + */ + globalApplicationsDirectoryX86 + #endif }; /** Finds the location of a special type of file or directory, such as a home folder or diff --git a/modules/juce_core/native/juce_win32_Files.cpp b/modules/juce_core/native/juce_win32_Files.cpp index 72f7c85ff9..5185d12087 100644 --- a/modules/juce_core/native/juce_win32_Files.cpp +++ b/modules/juce_core/native/juce_win32_Files.cpp @@ -568,6 +568,7 @@ File JUCE_CALLTYPE File::getSpecialLocation (const SpecialLocationType type) case commonApplicationDataDirectory: csidlType = CSIDL_COMMON_APPDATA; break; case commonDocumentsDirectory: csidlType = CSIDL_COMMON_DOCUMENTS; break; case globalApplicationsDirectory: csidlType = CSIDL_PROGRAM_FILES; break; + case globalApplicationsDirectoryX86: csidlType = CSIDL_PROGRAM_FILESX86; break; case userMusicDirectory: csidlType = 0x0d; /*CSIDL_MYMUSIC*/ break; case userMoviesDirectory: csidlType = 0x0e; /*CSIDL_MYVIDEO*/ break; case userPicturesDirectory: csidlType = 0x27; /*CSIDL_MYPICTURES*/ break;