mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-22 07:52:51 +02:00
Code Issues Projects Releases Wiki Activity

gl2xml:remove deprecated build options

Browse Source
This commit is contained in:
andy5995
2018-09-29 22:35:14 -05:00
parent 82acf58875
commit aadf4c5e41
5 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@@ -98,12 +98,9 @@ unsuccessfulbuild
/mk/windows/dependencies/src /mk/windows/dependencies/src
/mk/windows/bin /mk/windows/bin
/data /data
#
source/masterserver
mk/linux/tools-for-standalone-client/installer/mojosetup
# add build directories # 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. # should be ignored by git.
# #
# The ZetaGlest project recommends using a separate build directory. # The ZetaGlest project recommends using a separate build directory.

4
.travis.yml
View File

@@ -62,7 +62,7 @@ script:
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$(echo "$CC" | grep 'clang')" = "" ]; then - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$(echo "$CC" | grep 'clang')" = "" ]; then
mkdir build; mkdir build;
cd 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; make && make install;
fi fi
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$(echo "$CC" | grep 'clang')" != "" ]; then - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$(echo "$CC" | grep 'clang')" != "" ]; then
@@ -74,7 +74,7 @@ script:
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
mkdir build; mkdir build;
cd 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; make && make install;
echo 'Dependencies:'; echo 'Dependencies:';
otool -L zetaglest; otool -L zetaglest;

4
BUILD.md
View File

@@ -70,10 +70,6 @@ To edit maps:
BUILD_MAP_EDITOR=ON (off by default) 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* The **wxWidgets (libwxgtk3.0-dev on some systems)** and **libxml2-dev*
dependencies (mentioned below) is only required if you enable those dependencies (mentioned below) is only required if you enable those
options. options.

7
packaging/Slackbuild/zetaglest/zetaglest.SlackBuild
View File

@@ -78,7 +78,7 @@ find -L . \
mkdir build mkdir build
cd build cd build
cmake -G "Unix Makefiles" \ cmake -G "Unix Makefiles" \
-DCMAKE_INSTALL_PREFIX:PATH=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DWANT_USE_XercesC:BOOL=ON \ -DWANT_USE_XercesC:BOOL=ON \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
@@ -90,11 +90,10 @@ cd -
# Now install the game data # Now install the game data
cd $PRGNAM-$VERSION cd $PRGNAM-$VERSION
cmake -G "Unix Makefiles" \ cmake .. \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release .
-DBUILD_MODEL_VIEWER=ON \ -DBUILD_MODEL_VIEWER=ON \
-DBUILD_MODEL_IMPORT_EXPORT_TOOLS=ON \
-DBUILD_MAP_EDITOR=ON -DBUILD_MAP_EDITOR=ON
make install DESTDIR=$PKG make install DESTDIR=$PKG

4
packaging/debian/rules
View File

@@ -9,7 +9,9 @@ export DEB_CPPFLAGS_MAINT_APPEND = -DNDEBUG
override_dh_auto_configure: override_dh_auto_configure:
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: override_dh_installchangelogs:
dh_installchangelogs docs/CHANGELOG.txt dh_installchangelogs docs/CHANGELOG.txt