diff --git a/common/build_version.cpp b/common/build_version.cpp index 03ad115d6a..5268d2e117 100644 --- a/common/build_version.cpp +++ b/common/build_version.cpp @@ -50,6 +50,18 @@ extern std::string GetCurlLibVersion(); #include +wxString GetPlatformGetBitnessName() +{ + wxPlatformInfo platform; +// TODO (ISM): Read conditional once our wx fork and flatpaks are running released 3.1.5 +#if 0 && wxCHECK_VERSION( 3, 1, 5 ) + return platform.GetBitnessName(); +#else + return platform.GetArchName(); +#endif +} + + wxString GetBuildVersion() { wxString msg = wxString::Format( wxT( "%s" ), wxT( KICAD_VERSION_FULL ) ); @@ -128,12 +140,7 @@ wxString GetVersionInfoData( const wxString& aTitle, bool aHtml, bool aBrief ) aMsg << eol; aMsg << "Platform: " << wxGetOsDescription() << ", " -// TODO (ISM): Readd conditional once our wx fork and flatpaks are running released 3.1.5 -#if 0 && wxCHECK_VERSION( 3, 1, 5 ) - << platform.GetBitnessName() << ", " -#else - << platform.GetArchName() << ", " -#endif + << GetPlatformGetBitnessName() << ", " << platform.GetEndiannessName() << ", " << platform.GetPortIdName(); diff --git a/common/kicad_curl/kicad_curl_easy.cpp b/common/kicad_curl/kicad_curl_easy.cpp index aad85e53ae..f114e202b0 100644 --- a/common/kicad_curl/kicad_curl_easy.cpp +++ b/common/kicad_curl/kicad_curl_easy.cpp @@ -121,7 +121,7 @@ KICAD_CURL_EASY::KICAD_CURL_EASY() : m_headers( nullptr ) wxPlatformInfo platformInfo; wxString application( Pgm().App().GetAppName() ); wxString version( GetBuildVersion() ); - wxString platform = "(" + wxGetOsDescription() + ";" + platformInfo.GetArchName(); + wxString platform = "(" + wxGetOsDescription() + ";" + GetPlatformGetBitnessName(); #if defined( KICAD_BUILD_ARCH_X64 ) platform << ";64-bit"; diff --git a/include/build_version.h b/include/build_version.h index 41acf9e152..17dcbf2700 100644 --- a/include/build_version.h +++ b/include/build_version.h @@ -38,6 +38,11 @@ class wxString; */ wxString GetBuildVersion(); +/** + * @return the bitness name string (like "Little endian") + */ +wxString GetPlatformGetBitnessName(); + /** * Get the semantic version string for KiCad defined inside the KiCadVersion.cmake file in * the variable KICAD_SEMANTIC_VERSION.