Improve architecture detection in About window

drhelius · Apr 17, 2024 · f09c8f5 · f09c8f5
1 parent d45da57
commit f09c8f5
Showing 1 changed file with 25 additions and 11 deletions.
diff --git a/platforms/desktop-shared/gui.cpp b/platforms/desktop-shared/gui.cpp
@@ -1529,32 +1529,46 @@ static void popup_modal_about(void)
 
         ImGui::Separator();
 
-        #ifdef _M_ARM64
+        #if defined(_M_ARM64)
         ImGui::Text("Windows ARM64 build");
-        #elif defined(_WIN64)
+        #endif
+        #if defined(_WIN64)
         ImGui::Text("Windows 64 bit build");
-        #elif defined(_WIN32)
+        #endif
+        #if defined(_WIN32)
         ImGui::Text("Windows 32 bit build");
         #endif
-        #ifdef __linux__
-        ImGui::Text("Linux build");
+        #if defined(__linux__) && defined(__x86_64__)
+        ImGui::Text("Linux 64 bit build");
+        #endif
+        #if defined(__linux__) && defined(__i386__)
+        ImGui::Text("Linux 32 bit build");
+        #endif
+        #if defined(__linux__) && defined(__arm__)
+        ImGui::Text("Linux ARM build");
+        #endif
+        #if defined(__linux__) && defined(__aarch64__)
+        ImGui::Text("Linux ARM64 build");
+        #endif
+        #if defined(__APPLE__) && defined(__arm64__ )
+        ImGui::Text("macOS build (Apple Silicon)");
         #endif
-        #ifdef __APPLE__
-        ImGui::Text("macOS build");
+        #if defined(__APPLE__) && defined(__x86_64__)
+        ImGui::Text("macOS build (Intel)");
         #endif
-        #ifdef _MSC_VER
+        #if defined(_MSC_VER)
         ImGui::Text("Microsoft C++ %d.", _MSC_VER);
         #endif
-        #ifdef __MINGW32__
+        #if defined(__MINGW32__)
         ImGui::Text("MinGW 32 bit (%d.%d)", __MINGW32_MAJOR_VERSION, __MINGW32_MINOR_VERSION);
         #endif
-        #ifdef __MINGW64__
+        #if defined(__MINGW64__)
         ImGui::Text("MinGW 64 bit (%d.%d)", __MINGW64_VERSION_MAJOR, __MINGW64_VERSION_MINOR);
         #endif
         #if defined(__GNUC__) && !defined(__llvm__) && !defined(__INTEL_COMPILER)
         ImGui::Text("GCC %d.%d.%d", (int)__GNUC__, (int)__GNUC_MINOR__, (int)__GNUC_PATCHLEVEL__);
         #endif
-        #ifdef __clang_version__
+        #if defined(__clang_version__)
         ImGui::Text("Clang %s", __clang_version__);
         #endif