From c67286636f3a82fa42ad503495ddfb8c67516965 Mon Sep 17 00:00:00 2001
From: andy5995 <andy400-dev@yahoo.com>
Date: Thu, 4 Oct 2018 12:55:39 -0500
Subject: [PATCH] map editor and g3d viewer default to on

---
 .travis.yml                                   |  4 ++--
 BUILD.md                                      | 21 ++-----------------
 .../Slackbuild/zetaglest/zetaglest.SlackBuild |  4 +---
 source/g3d_viewer/CMakeLists.txt              |  2 +-
 source/glest_map_editor/CMakeLists.txt        |  2 +-
 5 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2c924c7f4..121007f9a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,7 +62,7 @@ script:
   - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$(echo "$CC" | grep 'clang')" = "" ]; then
         mkdir build;
         cd build;
-        cmake ..  -DCMAKE_INSTALL_PREFIX=$PWD/local -DBUILD_MODEL_VIEWER=ON -DBUILD_MAP_EDITOR=ON -DBUILD_ZETAGLEST_TESTS=ON;
+        cmake ..  -DCMAKE_INSTALL_PREFIX=$PWD/local -DBUILD_ZETAGLEST_TESTS=ON;
         make && make install;
     fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$(echo "$CC" | grep 'clang')" != "" ]; then
@@ -74,7 +74,7 @@ script:
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
         mkdir build;
         cd build;
-        cmake .. -DCMAKE_INSTALL_PREFIX=$PWD/local -DBUILD_MODEL_VIEWER=ON -DBUILD_MAP_EDITOR=ON -DBUILD_ZETAGLEST_TESTS=ON;
+        cmake .. -DCMAKE_INSTALL_PREFIX=$PWD/local -DBUILD_ZETAGLEST_TESTS=ON;
         make && make install;
         echo 'Dependencies:';
         otool -L zetaglest;
diff --git a/BUILD.md b/BUILD.md
index 216734e17..0e8b59665 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -60,20 +60,6 @@ you can't juse use **_merge_**).
 
 Most people will never have to change the options when running `cmake`.
 
-Some options you may want to change are:
-
-To view models outside the game:
-
-    BUILD_MODEL_VIEWER=ON (off by default)
-
-To edit maps:
-
-    BUILD_MAP_EDITOR=ON (off by default)
-
-The **wxWidgets (libwxgtk3.0-dev on some systems)** and **libxml2-dev*
-dependencies (mentioned below) is only required if you enable those
-options.
-
 To view all available options, use `cmake .. -LH` while in the build directory.
 
 ## Dependencies
@@ -99,16 +85,13 @@ On Windows simply run `setup.bat` in `\mk\windows`.
 (These may vary based on your operating system or Linux distribution;
 we will attempt to document dependencies in more detail)
 
-Below is a list of most dependencies you will need. This document needs
-to indicate better which are optional and which are required.
+Below is a list of most dependencies you will need.
 
 gcc g++ cmake libsdl2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev
  libx11-dev liblua5.2-dev libjpeg-dev libpng-dev libcurl4-gnutls-dev libircclient-dev
  libglew-dev libftgl-dev libfribidi-dev libcppunit-dev libminiupnpc-dev libfreetype6-dev
  libgnutls28-dev libkrb5-dev libkrb5-dev libnghttp2-dev libopenal-dev libldap2-dev
- librtmp-dev
-
-[Current Status](https://github.com/ZetaGlest/zetaglest-source/issues/25)
+ librtmp-dev libwxgtk3.0-dev libwxgtk3.0-dev (wxWidgets)
 
 ### Mac OS
 
diff --git a/packaging/Slackbuild/zetaglest/zetaglest.SlackBuild b/packaging/Slackbuild/zetaglest/zetaglest.SlackBuild
index 039b982b7..0aa2e26c6 100755
--- a/packaging/Slackbuild/zetaglest/zetaglest.SlackBuild
+++ b/packaging/Slackbuild/zetaglest/zetaglest.SlackBuild
@@ -92,9 +92,7 @@ cd -
 cd $PRGNAM-$VERSION
   cmake ..                      \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_MODEL_VIEWER=ON \
-    -DBUILD_MAP_EDITOR=ON
+    -DCMAKE_INSTALL_PREFIX=/usr
 
   make install DESTDIR=$PKG
 cd -
diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt
index dc3fda6ab..cbb8ac543 100644
--- a/source/g3d_viewer/CMakeLists.txt
+++ b/source/g3d_viewer/CMakeLists.txt
@@ -1,6 +1,6 @@
 # common libraries
 
-OPTION(BUILD_MODEL_VIEWER "Build model viewer" OFF)
+OPTION(BUILD_MODEL_VIEWER "Build model viewer" ON)
 SET(TARGET_NAME "zetaglest_g3dviewer")
 MESSAGE(STATUS "Build ${TARGET_NAME} = ${BUILD_MODEL_VIEWER}")
 
diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt
index 6e1892fb7..5c5ce70a7 100644
--- a/source/glest_map_editor/CMakeLists.txt
+++ b/source/glest_map_editor/CMakeLists.txt
@@ -1,6 +1,6 @@
 # common libraries
 
-OPTION(BUILD_MAP_EDITOR "Build map editor" OFF)
+OPTION(BUILD_MAP_EDITOR "Build map editor" ON)
 SET(TARGET_NAME "zetaglest_editor")
 MESSAGE(STATUS "Build ${TARGET_NAME} = ${BUILD_MAP_EDITOR}")