gl2xml:remove deprecated build options

.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.

.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;

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.

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

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