From c190c3efaec57dcb550a57a56538010ff5e2b532 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Sun, 16 Dec 2012 21:29:13 +0100 Subject: Set a default datadir, in sync with the data installation path. --- src/app/app.cpp | 3 ++- src/common/config.h.cmake | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/app/app.cpp b/src/app/app.cpp index 751ff21..980ecc1 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 8c85df1..7cc2386 100644 --- a/src/common/config.h.cmake +++ b/src/common/config.h.cmake @@ -6,4 +6,6 @@ #cmakedefine PLATFORM_OTHER @PLATFORM_OTHER@ #cmakedefine USE_GLEW @USE_GLEW@ -#cmakedefine GLEW_STATIC \ No newline at end of file +#cmakedefine GLEW_STATIC + +#define CBOT_DEFAULT_DATADIR "@COLOBOT_DATA_DIR@" -- cgit v1.2.3-1-g7c22