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

map editor and g3d viewer default to on

Browse Source
This commit is contained in:
andy5995
2018-10-04 12:55:39 -05:00
parent 171415cc11
commit c67286636f
5 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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_ZETAGLEST_TESTS=ON; cmake .. -DCMAKE_INSTALL_PREFIX=$PWD/local -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_ZETAGLEST_TESTS=ON; cmake .. -DCMAKE_INSTALL_PREFIX=$PWD/local -DBUILD_ZETAGLEST_TESTS=ON;
make && make install; make && make install;
echo 'Dependencies:'; echo 'Dependencies:';
otool -L zetaglest; otool -L zetaglest;

21
BUILD.md
View File

@@ -60,20 +60,6 @@ you can't juse use **_merge_**).
Most people will never have to change the options when running `cmake`. 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. To view all available options, use `cmake .. -LH` while in the build directory.
## Dependencies ## 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; (These may vary based on your operating system or Linux distribution;
we will attempt to document dependencies in more detail) we will attempt to document dependencies in more detail)
Below is a list of most dependencies you will need. This document needs Below is a list of most dependencies you will need.
to indicate better which are optional and which are required.
gcc g++ cmake libsdl2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev 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 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 libglew-dev libftgl-dev libfribidi-dev libcppunit-dev libminiupnpc-dev libfreetype6-dev
libgnutls28-dev libkrb5-dev libkrb5-dev libnghttp2-dev libopenal-dev libldap2-dev libgnutls28-dev libkrb5-dev libkrb5-dev libnghttp2-dev libopenal-dev libldap2-dev
librtmp-dev librtmp-dev libwxgtk3.0-dev libwxgtk3.0-dev (wxWidgets)
[Current Status](https://github.com/ZetaGlest/zetaglest-source/issues/25)
### Mac OS ### Mac OS

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

@@ -92,9 +92,7 @@ cd -
cd $PRGNAM-$VERSION cd $PRGNAM-$VERSION
cmake .. \ cmake .. \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr
-DBUILD_MODEL_VIEWER=ON \
-DBUILD_MAP_EDITOR=ON
make install DESTDIR=$PKG make install DESTDIR=$PKG
cd - cd -

2
source/g3d_viewer/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
# common libraries # common libraries
OPTION(BUILD_MODEL_VIEWER "Build model viewer" OFF) OPTION(BUILD_MODEL_VIEWER "Build model viewer" ON)
SET(TARGET_NAME "zetaglest_g3dviewer") SET(TARGET_NAME "zetaglest_g3dviewer")
MESSAGE(STATUS "Build ${TARGET_NAME} = ${BUILD_MODEL_VIEWER}") MESSAGE(STATUS "Build ${TARGET_NAME} = ${BUILD_MODEL_VIEWER}")

2
source/glest_map_editor/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
# common libraries # common libraries
OPTION(BUILD_MAP_EDITOR "Build map editor" OFF) OPTION(BUILD_MAP_EDITOR "Build map editor" ON)
SET(TARGET_NAME "zetaglest_editor") SET(TARGET_NAME "zetaglest_editor")
MESSAGE(STATUS "Build ${TARGET_NAME} = ${BUILD_MAP_EDITOR}") MESSAGE(STATUS "Build ${TARGET_NAME} = ${BUILD_MAP_EDITOR}")