diff options
author | Michał Zieliński <michal@zielinscy.org.pl> | 2012-12-27 12:40:58 +0100 |
---|---|---|
committer | Michał Zieliński <michal@zielinscy.org.pl> | 2012-12-27 12:40:58 +0100 |
commit | fb13c0f219282ef888562fb0fcbbeefd915307d4 (patch) | |
tree | 52816490c878fc5f57a97e3c2357d934cb70e294 /src/common | |
parent | 4e2982d4ddbd4c16793e0adaa96f5bfd6bd9148c (diff) | |
parent | c2ebd5551ff2569f56e3321efd2d9bedaf079955 (diff) | |
download | colobot-fb13c0f219282ef888562fb0fcbbeefd915307d4.tar.gz colobot-fb13c0f219282ef888562fb0fcbbeefd915307d4.tar.bz2 colobot-fb13c0f219282ef888562fb0fcbbeefd915307d4.zip |
Merge branch 'dev-desktop-file' of git://github.com/OdyX/colobot
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/config.h.cmake | 7 | ||||
-rw-r--r-- | src/common/global.h | 1 | ||||
-rw-r--r-- | src/common/test/CMakeLists.txt | 7 |
3 files changed, 11 insertions, 4 deletions
diff --git a/src/common/config.h.cmake b/src/common/config.h.cmake index 8c85df1..dd280a3 100644 --- a/src/common/config.h.cmake +++ b/src/common/config.h.cmake @@ -6,4 +6,9 @@ #cmakedefine PLATFORM_OTHER @PLATFORM_OTHER@ #cmakedefine USE_GLEW @USE_GLEW@ -#cmakedefine GLEW_STATIC
\ No newline at end of file +#cmakedefine GLEW_STATIC + +#define COLOBOT_DEFAULT_DATADIR "@COLOBOT_INSTALL_DATA_DIR@" +#define COLOBOT_I18N_DIR "@COLOBOT_INSTALL_I18N_DIR@" + +#cmakedefine OPENAL_SOUND diff --git a/src/common/global.h b/src/common/global.h index 2d57ee0..0b2d8ec 100644 --- a/src/common/global.h +++ b/src/common/global.h @@ -181,7 +181,6 @@ enum DataDir DIR_AI, //! < ai scripts DIR_FONT, //! < fonts DIR_HELP, //! < help files - DIR_I18N, //! < translations DIR_ICON, //! < icons & images DIR_LEVEL, //! < levels DIR_MODEL, //! < models diff --git a/src/common/test/CMakeLists.txt b/src/common/test/CMakeLists.txt index 08efdb3..26a31c9 100644 --- a/src/common/test/CMakeLists.txt +++ b/src/common/test/CMakeLists.txt @@ -1,7 +1,10 @@ cmake_minimum_required(VERSION 2.8) -set(CMAKE_BUILD_TYPE debug) -set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -Wold-style-cast -std=gnu++0x") +if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE debug) +endif(NOT CMAKE_BUILD_TYPE) +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wold-style-cast -std=gnu++0x") +set(CMAKE_CXX_FLAGS_DEBUG "-g -O0") include_directories( . |