diff --git a/include/wx/platinfo.h b/include/wx/platinfo.h index 4a119cf10d..863d94f51f 100644 --- a/include/wx/platinfo.h +++ b/include/wx/platinfo.h @@ -260,6 +260,8 @@ public: { return GetBitnessName(); } wxString GetEndiannessName() const { return GetEndiannessName(m_endian); } + wxString GetCpuArchitectureName() const + { return m_cpuArch; } wxString GetOperatingSystemDescription() const { return m_osDesc; } wxString GetDesktopEnvironment() const @@ -301,6 +303,8 @@ public: { SetBitness(n); } void SetEndianness(wxEndianness n) { m_endian = n; } + void SetCpuArchitectureName(const wxString& cpuArch) + { m_cpuArch = cpuArch; } void SetDesktopEnvironment(const wxString& de) { m_desktopEnv = de; } @@ -386,6 +390,9 @@ protected: // endianness of the machine wxEndianness m_endian; + + // CPU architecture family name, possibly empty if unknown + wxString m_cpuArch; }; diff --git a/interface/wx/platinfo.h b/interface/wx/platinfo.h index 2346d67015..67cd046f97 100644 --- a/interface/wx/platinfo.h +++ b/interface/wx/platinfo.h @@ -368,6 +368,15 @@ public: */ wxEndianness GetEndianness() const; + /** + Returns the CPU architecture name, if available. + + @see wxGetCpuArchitectureName() + + @since 3.1.5 + */ + wxString GetCpuArchitectureName() const; + /** Returns the run-time major version of the OS associated with this wxPlatformInfo instance. diff --git a/src/common/platinfo.cpp b/src/common/platinfo.cpp index 6bfd18c890..f06e0706e7 100644 --- a/src/common/platinfo.cpp +++ b/src/common/platinfo.cpp @@ -197,6 +197,7 @@ void wxPlatformInfo::InitForCurrentPlatform() m_osDesc = wxGetOsDescription(); m_endian = wxIsPlatformLittleEndian() ? wxENDIAN_LITTLE : wxENDIAN_BIG; m_bitness = wxIsPlatform64Bit() ? wxBITNESS_64 : wxBITNESS_32; + m_cpuArch = wxGetCpuArchitectureName(); #ifdef __LINUX__ m_ldi = wxGetLinuxDistributionInfo();