From aadf4c5e41e52669cad7c71c6e99fcf84049f181 Mon Sep 17 00:00:00 2001
From: andy5995 <andy400-dev@yahoo.com>
Date: Sat, 29 Sep 2018 22:35:14 -0500
Subject: [PATCH] gl2xml:remove deprecated build options

---
 .gitignore                                          | 5 +----
 .travis.yml                                         | 4 ++--
 BUILD.md                                            | 4 ----
 packaging/Slackbuild/zetaglest/zetaglest.SlackBuild | 7 +++----
 packaging/debian/rules                              | 4 +++-
 5 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 40d909039..d79ee8a06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,12 +98,9 @@ unsuccessfulbuild
 /mk/windows/dependencies/src
 /mk/windows/bin
 /data
-#
-source/masterserver
-mk/linux/tools-for-standalone-client/installer/mojosetup
 
 # add build directories
-# Makefile and cmake file are generated when the project is built and
+# Makefile and cmake files are generated when the project is built and
 # should be ignored by git.
 #
 # The ZetaGlest project recommends using a separate build directory.
diff --git a/.travis.yml b/.travis.yml
index a54970dd9..2c924c7f4 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_MODEL_IMPORT_EXPORT_TOOLS=ON -DBUILD_ZETAGLEST_TESTS=ON;
+        cmake ..  -DCMAKE_INSTALL_PREFIX=$PWD/local -DBUILD_MODEL_VIEWER=ON -DBUILD_MAP_EDITOR=ON -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_MODEL_IMPORT_EXPORT_TOOLS=ON -DBUILD_ZETAGLEST_TESTS=ON;
+        cmake .. -DCMAKE_INSTALL_PREFIX=$PWD/local -DBUILD_MODEL_VIEWER=ON -DBUILD_MAP_EDITOR=ON -DBUILD_ZETAGLEST_TESTS=ON;
         make && make install;
         echo 'Dependencies:';
         otool -L zetaglest;
diff --git a/BUILD.md b/BUILD.md
index 380cc0b50..791fb587f 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -70,10 +70,6 @@ To edit maps:
 
     BUILD_MAP_EDITOR=ON (off by default)
 
-Use model import export tools:
-
-    BUILD_MODEL_IMPORT_EXPORT_TOOLS=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.
diff --git a/packaging/Slackbuild/zetaglest/zetaglest.SlackBuild b/packaging/Slackbuild/zetaglest/zetaglest.SlackBuild
index 66900cf9b..039b982b7 100755
--- a/packaging/Slackbuild/zetaglest/zetaglest.SlackBuild
+++ b/packaging/Slackbuild/zetaglest/zetaglest.SlackBuild
@@ -78,7 +78,7 @@ find -L . \
 mkdir build
 cd build
   cmake -G "Unix Makefiles" \
-    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+    -DCMAKE_INSTALL_PREFIX=/usr \
     -DWANT_USE_XercesC:BOOL=ON \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
@@ -90,11 +90,10 @@ cd -
 
 # Now install the game data
 cd $PRGNAM-$VERSION
-  cmake -G "Unix Makefiles" \
+  cmake ..                      \
+    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release .
     -DBUILD_MODEL_VIEWER=ON \
-    -DBUILD_MODEL_IMPORT_EXPORT_TOOLS=ON \
     -DBUILD_MAP_EDITOR=ON
 
   make install DESTDIR=$PKG
diff --git a/packaging/debian/rules b/packaging/debian/rules
index ac383e358..73723d97a 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -9,7 +9,9 @@ export DEB_CPPFLAGS_MAINT_APPEND = -DNDEBUG
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		-DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWANT_USE_XercesC:BOOL=ON \
+    -DCMAKE_BUILD_TYPE=Release ..
 
 override_dh_installchangelogs:
 	dh_installchangelogs docs/CHANGELOG.txt