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

added switch for compilation [W]ithout wxWidgets; updated list of deps related with curl

Browse Source
This commit is contained in:
filux
2016-01-18 20:59:21 +01:00
parent c6c9eb1c02
commit 1125a2b405
6 changed files with 62 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mk/cmake/Modules/FindFontConfig.cmake
View File

@@ -10,7 +10,7 @@ FIND_PATH( FONTCONFIG_INCLUDE_DIR NAMES fontconfig/fontconfig.h
DOC "Path in which the file fontconfig/fontconfig.h is located." ) DOC "Path in which the file fontconfig/fontconfig.h is located." )
MARK_AS_ADVANCED(FONTCONFIG_INCLUDE_DIR) MARK_AS_ADVANCED(FONTCONFIG_INCLUDE_DIR)
IF(STATIC_FONTCONFIG) IF(STATIC_FontConfig)
FIND_LIBRARY( FONTCONFIG_LIBRARY NAMES libfontconfig.a fontconfig.a fontconfig FIND_LIBRARY( FONTCONFIG_LIBRARY NAMES libfontconfig.a fontconfig.a fontconfig
DOC "Path to fontconfig library." ) DOC "Path to fontconfig library." )
ELSE() ELSE()

23
mk/linux/build-mg.sh
View File

@@ -22,9 +22,10 @@ WANT_STATIC_LIBS="-DWANT_STATIC_LIBS=ON"
FORCE_EMBEDDED_LIBS=0 FORCE_EMBEDDED_LIBS=0
LUA_FORCED_VERSION=0 LUA_FORCED_VERSION=0
FORCE_32BIT_CROSS_COMPILE=0 FORCE_32BIT_CROSS_COMPILE=0
COMPILATION_WITHOUT=0
BUILD_MEGAGLEST_TESTS="ON" BUILD_MEGAGLEST_TESTS="ON"
while getopts "c:defhl:mnx" option; do while getopts "c:defhl:mnwx" option; do
case "${option}" in case "${option}" in
c) c)
CPU_COUNT=${OPTARG} CPU_COUNT=${OPTARG}
@@ -44,7 +45,7 @@ while getopts "c:defhl:mnx" option; do
;; ;;
h) h)
echo "Usage: $0 <option>" echo "Usage: $0 <option>"
echo " where <option> can be: -c x, -d, -e, -f, -m, -n, -h, -l x, -x" echo " where <option> can be: -c x, -d, -e, -f, -m, -n, -h, -l x, -w, -x"
echo " option descriptions:" echo " option descriptions:"
echo " -c x : Force the cpu / cores count to x - example: -c 4" echo " -c x : Force the cpu / cores count to x - example: -c 4"
echo " -d : Force DYNAMIC compile (do not want static libs)" echo " -d : Force DYNAMIC compile (do not want static libs)"
@@ -53,6 +54,7 @@ while getopts "c:defhl:mnx" option; do
echo " -l x : Force using LUA version x - example: -l 5.3" echo " -l x : Force using LUA version x - example: -l 5.3"
echo " -m : Force running CMAKE only to create Make files (do not compile)" echo " -m : Force running CMAKE only to create Make files (do not compile)"
echo " -n : Force running MAKE only to compile (assume CMAKE already built make files)" echo " -n : Force running MAKE only to compile (assume CMAKE already built make files)"
echo " -w : Force compilation 'Without using wxWidgets'"
echo " -x : Force cross compiling on x64 linux to produce an x86 32 bit binary" echo " -x : Force cross compiling on x64 linux to produce an x86 32 bit binary"
echo " -h : Display this help usage" echo " -h : Display this help usage"
@@ -69,6 +71,10 @@ while getopts "c:defhl:mnx" option; do
;; ;;
n) n)
MAKE_ONLY=1 MAKE_ONLY=1
# echo "${option} value: ${OPTARG}"
;;
w)
COMPILATION_WITHOUT=1
# echo "${option} value: ${OPTARG}" # echo "${option} value: ${OPTARG}"
;; ;;
x) x)
@@ -151,7 +157,7 @@ if [ "$release" = "rolling" ] && [ "$WANT_STATIC_LIBS" = "-DWANT_STATIC_LIBS=ON"
fi fi
if [ "$WANT_STATIC_LIBS" = "-DWANT_STATIC_LIBS=ON" ]; then if [ "$WANT_STATIC_LIBS" = "-DWANT_STATIC_LIBS=ON" ]; then
EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DSTATIC_FONTCONFIG=OFF" EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DSTATIC_FontConfig=OFF"
fi fi
case $distribution in case $distribution in
@@ -162,6 +168,7 @@ case $distribution in
if [ "$WANT_STATIC_LIBS" = "-DWANT_STATIC_LIBS=ON" ]; then if [ "$WANT_STATIC_LIBS" = "-DWANT_STATIC_LIBS=ON" ]; then
echo 'Turning ON dynamic FTGL, LUA, JPEG, PNG ... and forcing use the embedded IRCCLIENT' echo 'Turning ON dynamic FTGL, LUA, JPEG, PNG ... and forcing use the embedded IRCCLIENT'
EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DSTATIC_FTGL=OFF -DSTATIC_LUA=OFF -DSTATIC_JPEG=OFF -DSTATIC_PNG=OFF -DSTATIC_OGG=OFF -DFORCE_USE_EMBEDDED_Ircclient=ON" EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DSTATIC_FTGL=OFF -DSTATIC_LUA=OFF -DSTATIC_JPEG=OFF -DSTATIC_PNG=OFF -DSTATIC_OGG=OFF -DFORCE_USE_EMBEDDED_Ircclient=ON"
# ^ static jpeg seems to work again, debian testing 18.01.2016
fi fi
if [ $CLANG_FORCED = 1 ]; then BUILD_MEGAGLEST_TESTS="OFF"; fi if [ $CLANG_FORCED = 1 ]; then BUILD_MEGAGLEST_TESTS="OFF"; fi
;; ;;
@@ -252,11 +259,13 @@ if [ "$FORCE_EMBEDDED_LIBS" != "0" ] && [ "$FORCE_EMBEDDED_LIBS" != "" ]; then
fi fi
if [ $FORCE_32BIT_CROSS_COMPILE != 0 ]; then if [ $FORCE_32BIT_CROSS_COMPILE != 0 ]; then
EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DCMAKE_TOOLCHAIN_FILE=../mk/cmake/Modules/Toolchain-linux32.cmake" EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DCMAKE_TOOLCHAIN_FILE=../mk/cmake/Modules/Toolchain-linux32.cmake"
#LIBDIR_32bit='/usr/lib32/'
#LIBDIR_32bit='/usr/lib32/' #export LD_LIBRARY_PATH="${LIBDIR_32bit}:${LD_LIBRARY_PATH}"
#export LD_LIBRARY_PATH="${LIBDIR_32bit}:${LD_LIBRARY_PATH}" fi
if [ "$COMPILATION_WITHOUT" != "0" ] && [ "$COMPILATION_WITHOUT" != "" ]; then
EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DBUILD_MEGAGLEST_MAP_EDITOR=OFF -DBUILD_MEGAGLEST_MODEL_VIEWER=OFF"
fi fi
if [ $MAKE_ONLY = 0 ]; then if [ $MAKE_ONLY = 0 ]; then

2
mk/linux/makedeps_folder.sh
View File

@@ -22,7 +22,7 @@ sync_support_libs(){
local _cp="/bin/cp" local _cp="/bin/cp"
#local skip_deps="libm.so libpthread.so libstdc++.so libgcc_s.so libc.so libdl.so libX11.so libpulse libfusion libdirect libnvidia libXext librt libxcb libICE libSM libXtst libwrap libdbus libXau libXdmcp libnsl libFLAC libGL" #local skip_deps="libm.so libpthread.so libstdc++.so libgcc_s.so libc.so libdl.so libX11.so libpulse libfusion libdirect libnvidia libXext librt libxcb libICE libSM libXtst libwrap libdbus libXau libXdmcp libnsl libFLAC libGL"
local skip_deps="" local skip_deps=""
local keep_deps="libcurl libgnu libgcrypt libicu liblua libjpeg libpng libwx libgtk libgdk libftgl libfreetype libvlc" local keep_deps="libcurl libgnu libgcrypt libnghttp libidn librtmp libssh libnettle libicu liblua libjpeg libpng libwx libgtk libgdk libftgl libfreetype libvlc"
local scan_via_skiplist=1 local scan_via_skiplist=1

16
mk/macosx/build-mg.sh
View File

@@ -18,15 +18,16 @@ GCC_FORCED=0
WANT_STATIC_LIBS="-DWANT_STATIC_LIBS=ON" WANT_STATIC_LIBS="-DWANT_STATIC_LIBS=ON"
FORCE_EMBEDDED_LIBS=0 FORCE_EMBEDDED_LIBS=0
LUA_FORCED_VERSION=0 LUA_FORCED_VERSION=0
COMPILATION_WITHOUT=0
while getopts "c:defhl:mnxb" option; do while getopts "c:defhl:mnwxb" option; do
case "${option}" in case "${option}" in
c) CPU_COUNT=${OPTARG};; c) CPU_COUNT=${OPTARG};;
d) WANT_STATIC_LIBS="-DWANT_STATIC_LIBS=OFF";; d) WANT_STATIC_LIBS="-DWANT_STATIC_LIBS=OFF";;
e) FORCE_EMBEDDED_LIBS=1;; e) FORCE_EMBEDDED_LIBS=1;;
f) GCC_FORCED=1;; f) GCC_FORCED=1;;
h) echo "Usage: $0 <option>" h) echo "Usage: $0 <option>"
echo " where <option> can be: -b, -c x, -d, -e, -f, -m, -n, -h, -l x, -x" echo " where <option> can be: -b, -c x, -d, -e, -f, -m, -n, -h, -l x, -w, -x"
echo " option descriptions:" echo " option descriptions:"
echo " -b : Force default configuration designed for bundle/release." echo " -b : Force default configuration designed for bundle/release."
echo " -c x : Force the cpu / cores count to x - example: -c 4" echo " -c x : Force the cpu / cores count to x - example: -c 4"
@@ -36,12 +37,14 @@ while getopts "c:defhl:mnxb" option; do
echo " -l x : Force using LUA version x - example: -l 5.3" echo " -l x : Force using LUA version x - example: -l 5.3"
echo " -m : Force running CMAKE only to create Make files (do not compile)" echo " -m : Force running CMAKE only to create Make files (do not compile)"
echo " -n : Force running MAKE only to compile (assume CMAKE already built make files)" echo " -n : Force running MAKE only to compile (assume CMAKE already built make files)"
echo " -w : Force compilation 'Without using wxWidgets'"
echo " -x : Force usage of Xcode and xcodebuild" echo " -x : Force usage of Xcode and xcodebuild"
echo " -h : Display this help usage" echo " -h : Display this help usage"
exit 0;; exit 0;;
l) LUA_FORCED_VERSION=${OPTARG};; l) LUA_FORCED_VERSION=${OPTARG};;
m) CMAKE_ONLY=1;; m) CMAKE_ONLY=1;;
n) MAKE_ONLY=1;; n) MAKE_ONLY=1;;
w) COMPILATION_WITHOUT=1;;
x) USE_XCODE=1;; x) USE_XCODE=1;;
b) BUILD_BUNDLE=1 b) BUILD_BUNDLE=1
#CPU_COUNT=-1 #CPU_COUNT=-1
@@ -50,7 +53,8 @@ while getopts "c:defhl:mnxb" option; do
USE_XCODE=0 USE_XCODE=0
GCC_FORCED=0 GCC_FORCED=0
WANT_STATIC_LIBS="-DWANT_STATIC_LIBS=ON" WANT_STATIC_LIBS="-DWANT_STATIC_LIBS=ON"
LUA_FORCED_VERSION=0;; LUA_FORCED_VERSION=0
COMPILATION_WITHOUT=1;;
\?) \?)
echo "Script Invalid option: -$OPTARG" >&2 echo "Script Invalid option: -$OPTARG" >&2
exit 1;; exit 1;;
@@ -183,6 +187,10 @@ if [ "$FORCE_EMBEDDED_LIBS" != "0" ] && [ "$FORCE_EMBEDDED_LIBS" != "" ]; then
EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DFORCE_EMBEDDED_LIBS=ON" EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DFORCE_EMBEDDED_LIBS=ON"
fi fi
if [ "$COMPILATION_WITHOUT" != "0" ] && [ "$COMPILATION_WITHOUT" != "" ]; then
EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DBUILD_MEGAGLEST_MAP_EDITOR=OFF -DBUILD_MEGAGLEST_MODEL_VIEWER=OFF"
fi
if [ "$MAKE_ONLY" -eq "0" ]; then if [ "$MAKE_ONLY" -eq "0" ]; then
EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DWANT_DEV_OUTPATH=ON $WANT_STATIC_LIBS -DBREAKPAD_ROOT=$BREAKPAD_ROOT" EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DWANT_DEV_OUTPATH=ON $WANT_STATIC_LIBS -DBREAKPAD_ROOT=$BREAKPAD_ROOT"
if [ "$BUILD_BUNDLE" -ne "1" ]; then if [ "$BUILD_BUNDLE" -ne "1" ]; then
@@ -195,7 +203,7 @@ if [ "$MAKE_ONLY" -eq "0" ]; then
fi fi
rm -f ../MegaGlest*.dmg rm -f ../MegaGlest*.dmg
else else
EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DCPACK_GENERATOR=Bundle -DWANT_SINGLE_INSTALL_DIRECTORY=ON -DBUILD_MEGAGLEST_MAP_EDITOR=OFF -DBUILD_MEGAGLEST_MODEL_VIEWER=OFF" EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DCPACK_GENERATOR=Bundle -DWANT_SINGLE_INSTALL_DIRECTORY=ON"
rm -f ../megaglest_editor ../megaglest_g3dviewer ../megaglest_tests rm -f ../megaglest_editor ../megaglest_g3dviewer ../megaglest_tests
fi fi
echo "Calling cmake with EXTRA_CMAKE_OPTIONS = ${EXTRA_CMAKE_OPTIONS}" echo "Calling cmake with EXTRA_CMAKE_OPTIONS = ${EXTRA_CMAKE_OPTIONS}"

30
source/glest_game/CMakeLists.txt
View File

@@ -115,25 +115,29 @@ IF(BUILD_MEGAGLEST)
ELSE() ELSE()
SET(LIBVLC_MIN_VERSION "1.1.0") SET(LIBVLC_MIN_VERSION "1.1.0")
ENDIF() ENDIF()
FIND_PACKAGE(LIBVLC) IF(WANT_USE_VLC)
FIND_PACKAGE(LIBVLC)
IF(LIBVLC_FOUND AND NOT LIBVLC_VERSION STRLESS "${LIBVLC_MIN_VERSION}") ENDIF()
MESSAGE(STATUS "**NOTE: LIBVLC found so intro videos are supported.") IF(LIBVLC_FOUND AND NOT LIBVLC_VERSION STRLESS "${LIBVLC_MIN_VERSION}")
INCLUDE_DIRECTORIES(${LIBVLC_INCLUDE_DIR}) MESSAGE(STATUS "**NOTE: LIBVLC found so intro videos are supported.")
IF(UNIX) INCLUDE_DIRECTORIES(${LIBVLC_INCLUDE_DIR})
SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${LIBVLCCORE_LIBRARY} ${LIBVLC_LIBRARY}) IF(UNIX)
ADD_DEFINITIONS(-DHAS_LIBVLC) SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${LIBVLCCORE_LIBRARY} ${LIBVLC_LIBRARY})
ENDIF() ADD_DEFINITIONS(-DHAS_LIBVLC)
ENDIF()
IF(LIBVLC_VERSION_PRE_V2) IF(LIBVLC_VERSION_PRE_V2)
ADD_DEFINITIONS(-DLIBVLC_VERSION_PRE_2) ADD_DEFINITIONS(-DLIBVLC_VERSION_PRE_2)
ENDIF() ENDIF()
IF(LIBVLC_VERSION_PRE_1_1_13) IF(LIBVLC_VERSION_PRE_1_1_13)
ADD_DEFINITIONS(-DLIBVLC_VERSION_PRE_1_1_13) ADD_DEFINITIONS(-DLIBVLC_VERSION_PRE_1_1_13)
ENDIF() ENDIF()
ELSE()
ELSE() IF(WANT_USE_VLC)
MESSAGE(STATUS "**WARNING: LIBVLC NOT found so intro videos are NOT supported.") MESSAGE(STATUS "**WARNING: LIBVLC NOT found so videos are NOT supported.")
ENDIF() ELSE()
MESSAGE(STATUS "LIBVLC disabled so videos are NOT supported.")
ENDIF()
ENDIF()
######################################################################################### #########################################################################################
# megaglest game # megaglest game

30
source/shared_lib/CMakeLists.txt
View File

@@ -173,30 +173,30 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
ELSE() ELSE()
SET(LIBVLC_MIN_VERSION "1.1.0") SET(LIBVLC_MIN_VERSION "1.1.0")
ENDIF() ENDIF()
FIND_PACKAGE(LIBVLC) IF(WANT_USE_VLC)
MESSAGE(STATUS "LIBVLC version: ${LIBVLC_VERSION} WANT_USE_VLC macro: ${WANT_USE_VLC}") FIND_PACKAGE(LIBVLC)
MESSAGE(STATUS "LIBVLC version: ${LIBVLC_VERSION}")
IF(LIBVLC_FOUND AND WANT_USE_VLC AND NOT LIBVLC_VERSION STRLESS "${LIBVLC_MIN_VERSION}") ENDIF()
MESSAGE(STATUS "**NOTE: LIBVLC found so videos are supported.") IF(LIBVLC_FOUND AND NOT LIBVLC_VERSION STRLESS "${LIBVLC_MIN_VERSION}")
INCLUDE_DIRECTORIES(${LIBVLC_INCLUDE_DIR}) MESSAGE(STATUS "**NOTE: LIBVLC found so videos are supported.")
IF(UNIX) INCLUDE_DIRECTORIES(${LIBVLC_INCLUDE_DIR})
SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${LIBVLCCORE_LIBRARY} ${LIBVLC_LIBRARY}) IF(UNIX)
ADD_DEFINITIONS(-DHAS_LIBVLC) SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${LIBVLCCORE_LIBRARY} ${LIBVLC_LIBRARY})
ENDIF() ADD_DEFINITIONS(-DHAS_LIBVLC)
ENDIF()
IF(LIBVLC_VERSION_PRE_V2) IF(LIBVLC_VERSION_PRE_V2)
ADD_DEFINITIONS(-DLIBVLC_VERSION_PRE_2) ADD_DEFINITIONS(-DLIBVLC_VERSION_PRE_2)
ENDIF() ENDIF()
IF(LIBVLC_VERSION_PRE_1_1_13) IF(LIBVLC_VERSION_PRE_1_1_13)
ADD_DEFINITIONS(-DLIBVLC_VERSION_PRE_1_1_13) ADD_DEFINITIONS(-DLIBVLC_VERSION_PRE_1_1_13)
ENDIF() ENDIF()
ELSE()
ELSE() IF(WANT_USE_VLC)
IF(WANT_USE_VLC) MESSAGE(STATUS "**WARNING: LIBVLC NOT found so videos are NOT supported.")
MESSAGE(STATUS "**WARNING: LIBVLC NOT found so videos are NOT supported.")
ELSE() ELSE()
MESSAGE(STATUS "LIBVLC disabled so videos are NOT supported.") MESSAGE(STATUS "LIBVLC disabled so videos are NOT supported.")
ENDIF() ENDIF()
ENDIF() ENDIF()
if(WANT_USE_FriBiDi) if(WANT_USE_FriBiDi)
find_package( FriBiDi ) find_package( FriBiDi )