Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop

This commit is contained in:
titiger 2016-01-31 02:26:01 +01:00
commit dc52b53ced

View File

@ -166,6 +166,7 @@ cd "$CURRENTDIR"
rm -rf cmake-build rm -rf cmake-build
mkdir cmake-build mkdir cmake-build
cd cmake-build cd cmake-build
# 'MOJOSETUP_GUI_*_STATIC=TRUE' > oddly it is not static after this, but isn't optional anymore so this kills portability
cmake \ cmake \
-DCMAKE_BUILD_TYPE=$BUILDTYPE \ -DCMAKE_BUILD_TYPE=$BUILDTYPE \
-DCMAKE_C_COMPILER=$CC \ -DCMAKE_C_COMPILER=$CC \
@ -178,8 +179,9 @@ cmake \
-DMOJOSETUP_INPUT_XZ=TRUE \ -DMOJOSETUP_INPUT_XZ=TRUE \
-DMOJOSETUP_BUILD_LUAC=TRUE \ -DMOJOSETUP_BUILD_LUAC=TRUE \
-DMOJOSETUP_GUI_GTKPLUS2=TRUE \ -DMOJOSETUP_GUI_GTKPLUS2=TRUE \
-DMOJOSETUP_GUI_GTKPLUS2_STATIC=FALSE \
-DMOJOSETUP_GUI_NCURSES=TRUE \ -DMOJOSETUP_GUI_NCURSES=TRUE \
-DMOJOSETUP_GUI_NCURSES_STATIC=TRUE \ -DMOJOSETUP_GUI_NCURSES_STATIC=FALSE \
-DMOJOSETUP_GUI_STDIO=TRUE \ -DMOJOSETUP_GUI_STDIO=TRUE \
-DMOJOSETUP_GUI_STDIO_STATIC=TRUE \ -DMOJOSETUP_GUI_STDIO_STATIC=TRUE \
-DMOJOSETUP_GUI_WWW=FALSE \ -DMOJOSETUP_GUI_WWW=FALSE \