diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-06-22 01:11:37 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-06-22 01:17:19 +0200 |
| commit | bfcce26f8949f4ba42cc1bd8203dff51884aa0da (patch) | |
| tree | d53c83fa8079952a9226589caf98075cd0623958 /src/common | |
| parent | 1377e48910c1bef1829c67740360b0a8309239a1 (diff) | |
| download | colobot-bfcce26f8949f4ba42cc1bd8203dff51884aa0da.tar.gz colobot-bfcce26f8949f4ba42cc1bd8203dff51884aa0da.tar.bz2 colobot-bfcce26f8949f4ba42cc1bd8203dff51884aa0da.zip | |
Changes in build organization
* targets are now created in top-level build directory
* more things are now configured through CMake options
* changed debug build detection from NDEBUG to DEV_BUILD
* moved po and desktop directories
* moved last unit test out of src directory
Diffstat (limited to 'src/common')
| -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) |