Skip to content

Commit

Permalink
Fix Linux and 32-bit compilation
Browse files Browse the repository at this point in the history
  • Loading branch information
robbr48 committed Apr 4, 2024
1 parent e580003 commit 900387c
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions HopsanGUI/Configuration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1313,9 +1313,9 @@ void Configuration::registerSettings()
mStringSettings.insert(cfg::dir::gcc32, "");
#ifndef _WIN32
#ifdef HOPSANCOMPILED64BIT
mStringSettings.insert(cfg::GCC64DIR, "/usr/bin");
mStringSettings.insert(cfg::dir::gcc64, "/usr/bin");
#else
mStringSettings.insert(cfg::GCC32DIR, "/usr/bin");
mStringSettings.insert(cfg::dir::gcc32, "/usr/bin");
#endif
//! @todo OSX ?
#endif
Expand Down Expand Up @@ -1343,7 +1343,7 @@ void Configuration::registerSettings()
#if defined(_WIN32)
mBoolSettings.insert(cfg::nativestylesheet, false);
#else
mBoolSettings.insert(cfg::NATIVESTYLESHEET, true);
mBoolSettings.insert(cfg::nativestylesheet, true);
#endif
mBoolSettings.insert(cfg::showpopuphelp, true);
mBoolSettings.insert(cfg::multicore, false);
Expand All @@ -1355,7 +1355,7 @@ void Configuration::registerSettings()
#ifdef _WIN32
mBoolSettings.insert(cfg::preferincludedcompiler, true);
#else
mBoolSettings.insert(cfg::PREFERINCLUDEDCOMPILER, false);
mBoolSettings.insert(cfg::preferincludedcompiler, false);
#endif

// Integer settings
Expand Down Expand Up @@ -1392,7 +1392,7 @@ QString Configuration::getGCCPath() const
#ifdef HOPSANCOMPILED64BIT
return getStringSetting(cfg::dir::gcc64);
#else
return getStringSetting(cfg::GCC32DIR);
return getStringSetting(cfg::dir::gcc32);
#endif
}

Expand Down

0 comments on commit 900387c

Please sign in to comment.