diff options
| author | Didier Raboud <odyx@debian.org> | 2013-06-25 09:34:25 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2013-06-25 09:36:43 +0200 |
| commit | 3c40e53ea651c837086fb1628443ad3f413a21d0 (patch) | |
| tree | 23bd87c2804b6096a4ce0feb15578ba35669779b /src/common/profile.cpp | |
| parent | 627f86efa406057608c921cf8330c628afb41ab6 (diff) | |
| parent | 7c2e955e1552a9c4e412ea2c936be61fc78ba010 (diff) | |
| download | colobot-3c40e53ea651c837086fb1628443ad3f413a21d0.tar.gz colobot-3c40e53ea651c837086fb1628443ad3f413a21d0.tar.bz2 colobot-3c40e53ea651c837086fb1628443ad3f413a21d0.zip | |
Merge tag 'colobot-gold-0.1.0-alpha' into debian
Diffstat (limited to 'src/common/profile.cpp')
| -rw-r--r-- | src/common/profile.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/common/profile.cpp b/src/common/profile.cpp index c6af6cc..77c70c3 100644 --- a/src/common/profile.cpp +++ b/src/common/profile.cpp @@ -47,11 +47,10 @@ bool CProfile::InitCurrentDirectory() { try { - // TODO: NDEBUG should be replaced with something like BUILD_TYPE == "DEBUG"/"RELEASE" - #ifdef NDEBUG - bp::ini_parser::read_ini(GetSystemUtils()->GetProfileFileLocation(), m_propertyTree); - #else + #if DEV_BUILD bp::ini_parser::read_ini("colobot.ini", m_propertyTree); + #else + bp::ini_parser::read_ini(GetSystemUtils()->GetProfileFileLocation(), m_propertyTree); #endif } catch (std::exception & e) @@ -68,10 +67,10 @@ bool CProfile::SaveCurrentDirectory() { try { - #ifdef NDEBUG - bp::ini_parser::write_ini(GetSystemUtils()->GetProfileFileLocation(), m_propertyTree); - #else + #if DEV_BUILD bp::ini_parser::write_ini("colobot.ini", m_propertyTree); + #else + bp::ini_parser::write_ini(GetSystemUtils()->GetProfileFileLocation(), m_propertyTree); #endif } catch (std::exception & e) |