summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-04-09 22:21:06 +0300
committerAndrei Karas <akaras@inbox.ru>2011-04-09 22:21:06 +0300
commit1dd8758a9e46af0b2610ebcc6950dd6a31ef46c3 (patch)
tree240f62c73d45b19af986157878f8c1770220d115
parentb5e7af7c60356a7cd2c777a5b708d9bee02efb8e (diff)
downloadmv-1dd8758a9e46af0b2610ebcc6950dd6a31ef46c3.tar.gz
mv-1dd8758a9e46af0b2610ebcc6950dd6a31ef46c3.tar.bz2
mv-1dd8758a9e46af0b2610ebcc6950dd6a31ef46c3.tar.xz
mv-1dd8758a9e46af0b2610ebcc6950dd6a31ef46c3.zip
Disabling manaserv in cmake builds, it was still enabled by default.
-rw-r--r--CMakeLists.txt2
-rw-r--r--toolchain.cmake2
-rw-r--r--toolchain.nightly2
3 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99d42ffae..91d47c3f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ FIND_PACKAGE(Gettext)
OPTION(WITH_OPENGL "Enable OpenGL support" ON)
OPTION(ENABLE_NLS "Enable building of tranlations" ON)
-OPTION(ENABLE_MANASERV "Enable Manaserv support" ON)
+OPTION(ENABLE_MANASERV "Enable Manaserv support" OFF)
IF (WIN32)
SET(PKG_DATADIR ".")
diff --git a/toolchain.cmake b/toolchain.cmake
index 341a267db..c8493c0c5 100644
--- a/toolchain.cmake
+++ b/toolchain.cmake
@@ -19,7 +19,7 @@ SET(SDLMIXER_INCLUDE_DIR ../mana_win/libs/include/SDL)
SET(SDLNET_INCLUDE_DIR ../mana_win/libs/include/SDL)
SET(SDLTTF_INCLUDE_DIR ../mana_win/libs/include/SDL)
SET(SDL_INCLUDE_DIR ../mana_win/libs/include/SDL)
-# SET(ENABLE_MANASERV ON)
+SET(ENABLE_MANASERV OFF)
# here is the target environment located
SET(CMAKE_FIND_ROOT_PATH /usr/i586-mingw32msvc /../mana_win/libs )
diff --git a/toolchain.nightly b/toolchain.nightly
index 0f1ac8d25..6093a82f8 100644
--- a/toolchain.nightly
+++ b/toolchain.nightly
@@ -19,7 +19,7 @@ SET(SDLMIXER_INCLUDE_DIR ./packaging/windows/libs/include/SDL)
SET(SDLNET_INCLUDE_DIR ./packaging/windows/libs/include/SDL)
SET(SDLTTF_INCLUDE_DIR ./packaging/windows/libs/include/SDL)
SET(SDL_INCLUDE_DIR ./packaging/windows/libs/include/SDL)
-# SET(ENABLE_MANASERV ON)
+SET(ENABLE_MANASERV OFF)
# here is the target environment located
SET(CMAKE_FIND_ROOT_PATH /usr/i586-mingw32msvc ./packaging/windows/ )