Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed the behavior to always display the GCC. Extended it to report "Hybrid"

Browse Source 
as needed. "Hybrid" is a new string for localization.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36419 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia 2010-04-22 15:49:01 +00:00
parent d49d3f60d8
commit c966de0646
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/apps/aboutsystem/AboutSystem.cpp
View File

@ -492,13 +492,16 @@ AboutView::AboutView()
B_ALIGN_VERTICAL_UNSET)); B_ALIGN_VERTICAL_UNSET));
// GCC version // GCC version
#if __GNUC__ != 2 BEntry gccFourHybrid("/boot/system/lib/gcc2/libstdc++.r4.so");
snprintf(string, sizeof(string), "GCC %d", __GNUC__); BEntry gccTwoHybrid("/boot/system/lib/gcc4/libsupc++.so");
if (gccFourHybrid.Exists() || gccTwoHybrid.Exists())
snprintf(string, sizeof(string), TR("GCC %d Hybrid"), __GNUC__);
else
snprintf(string, sizeof(string), "GCC %d", __GNUC__);
BStringView* gccView = new BStringView("gcctext", string); BStringView* gccView = new BStringView("gcctext", string);
gccView->SetExplicitAlignment(BAlignment(B_ALIGN_LEFT, gccView->SetExplicitAlignment(BAlignment(B_ALIGN_LEFT,
B_ALIGN_VERTICAL_UNSET)); B_ALIGN_VERTICAL_UNSET));
#endif
// CPU count, type and clock speed // CPU count, type and clock speed
char processorLabel[256]; char processorLabel[256];
@ -560,9 +563,7 @@ AboutView::AboutView()
.AddGroup(B_VERTICAL) .AddGroup(B_VERTICAL)
.Add(_CreateLabel("oslabel", TR("Version:"))) .Add(_CreateLabel("oslabel", TR("Version:")))
.Add(versionView) .Add(versionView)
#if __GNUC__ != 2
.Add(gccView) .Add(gccView)
#endif
.AddStrut(offset) .AddStrut(offset)
.Add(_CreateLabel("cpulabel", processorLabel)) .Add(_CreateLabel("cpulabel", processorLabel))
.Add(cpuView) .Add(cpuView)