diff options
| author | Didier Raboud <odyx@debian.org> | 2012-12-16 22:26:29 +0100 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2012-12-16 22:26:29 +0100 |
| commit | 4827440e737248aff2c756444108a4be0b0d63e6 (patch) | |
| tree | 68b48c2c64746bf9ee38d18ad9d9c973b8d23ea3 /src | |
| parent | a266692615e146246fd547c5b132a1fcc98b6a10 (diff) | |
| parent | 6bd37341dfe2eb382d654f34a2b89db7fa30d8c2 (diff) | |
| download | colobot-4827440e737248aff2c756444108a4be0b0d63e6.tar.gz colobot-4827440e737248aff2c756444108a4be0b0d63e6.tar.bz2 colobot-4827440e737248aff2c756444108a4be0b0d63e6.zip | |
Merge branch 'dev' into dev-use-installed-i18n
Conflicts:
src/common/config.h.cmake
Diffstat (limited to 'src')
| -rw-r--r-- | src/app/app.cpp | 3 | ||||
| -rw-r--r-- | src/common/config.h.cmake | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/app/app.cpp b/src/app/app.cpp index 79c0e13..04f8d2a 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -15,6 +15,7 @@ // * You should have received a copy of the GNU General Public License // * along with this program. If not, see http://www.gnu.org/licenses/. +#include "common/config.h" #include "app/app.h" @@ -130,7 +131,7 @@ CApplication::CApplication() m_mouseButtonsState = 0; m_trackedKeys = 0; - m_dataPath = "./data"; + m_dataPath = CBOT_DEFAULT_DATADIR; m_language = LANGUAGE_ENV; diff --git a/src/common/config.h.cmake b/src/common/config.h.cmake index f76a780..23b6de8 100644 --- a/src/common/config.h.cmake +++ b/src/common/config.h.cmake @@ -8,4 +8,5 @@ #cmakedefine USE_GLEW @USE_GLEW@ #cmakedefine GLEW_STATIC +#define CBOT_DEFAULT_DATADIR "@COLOBOT_DATA_DIR@" #define CBOT_I18N_DIR "@CMAKE_INSTALL_PREFIX@/share/locale/" |