From 1125a2b40599b6cda09ca71232b1661fbdb2a50b Mon Sep 17 00:00:00 2001
From: filux <smartadminpl@gmail.com>
Date: Mon, 18 Jan 2016 20:59:21 +0100
Subject: [PATCH] added switch for compilation [W]ithout wxWidgets; updated
 list of deps related with curl

---
 mk/cmake/Modules/FindFontConfig.cmake |  2 +-
 mk/linux/build-mg.sh                  | 23 +++++++++++++-------
 mk/linux/makedeps_folder.sh           |  2 +-
 mk/macosx/build-mg.sh                 | 16 ++++++++++----
 source/glest_game/CMakeLists.txt      | 30 +++++++++++++++------------
 source/shared_lib/CMakeLists.txt      | 30 +++++++++++++--------------
 6 files changed, 62 insertions(+), 41 deletions(-)

diff --git a/mk/cmake/Modules/FindFontConfig.cmake b/mk/cmake/Modules/FindFontConfig.cmake
index db05f717d..6d2d612de 100644
--- a/mk/cmake/Modules/FindFontConfig.cmake
+++ b/mk/cmake/Modules/FindFontConfig.cmake
@@ -10,7 +10,7 @@ FIND_PATH( FONTCONFIG_INCLUDE_DIR NAMES fontconfig/fontconfig.h
                                   DOC "Path in which the file fontconfig/fontconfig.h is located." )
 MARK_AS_ADVANCED(FONTCONFIG_INCLUDE_DIR)
 
-IF(STATIC_FONTCONFIG)
+IF(STATIC_FontConfig)
 	FIND_LIBRARY( FONTCONFIG_LIBRARY NAMES libfontconfig.a fontconfig.a fontconfig
 					DOC "Path to fontconfig library." )
 ELSE()
diff --git a/mk/linux/build-mg.sh b/mk/linux/build-mg.sh
index 01134abe6..867d0a7d4 100755
--- a/mk/linux/build-mg.sh
+++ b/mk/linux/build-mg.sh
@@ -22,9 +22,10 @@ WANT_STATIC_LIBS="-DWANT_STATIC_LIBS=ON"
 FORCE_EMBEDDED_LIBS=0
 LUA_FORCED_VERSION=0
 FORCE_32BIT_CROSS_COMPILE=0
+COMPILATION_WITHOUT=0
 BUILD_MEGAGLEST_TESTS="ON"
 
-while getopts "c:defhl:mnx" option; do
+while getopts "c:defhl:mnwx" option; do
    case "${option}" in
         c)
            CPU_COUNT=${OPTARG}
@@ -44,7 +45,7 @@ while getopts "c:defhl:mnx" option; do
         ;;
         h)
                 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 "       -c x : Force the cpu / cores count to x - example: -c 4"
                 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 "       -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 "       -w   : Force compilation 'Without using wxWidgets'"
                 echo "       -x   : Force cross compiling on x64 linux to produce an x86 32 bit binary"
 
                 echo "       -h   : Display this help usage"
@@ -69,6 +71,10 @@ while getopts "c:defhl:mnx" option; do
         ;;
         n)
            MAKE_ONLY=1
+#           echo "${option} value: ${OPTARG}"
+        ;;
+        w)
+           COMPILATION_WITHOUT=1
 #           echo "${option} value: ${OPTARG}"
         ;;
         x)
@@ -151,7 +157,7 @@ if [ "$release" = "rolling" ] && [ "$WANT_STATIC_LIBS" = "-DWANT_STATIC_LIBS=ON"
 fi
 
 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
 
 case $distribution in
@@ -162,6 +168,7 @@ case $distribution in
 				if [ "$WANT_STATIC_LIBS" = "-DWANT_STATIC_LIBS=ON" ]; then
 					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"
+					# ^ static jpeg seems to work again, debian testing 18.01.2016
 				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
 
 if [ $FORCE_32BIT_CROSS_COMPILE != 0 ]; then
-        EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DCMAKE_TOOLCHAIN_FILE=../mk/cmake/Modules/Toolchain-linux32.cmake"
-
-#LIBDIR_32bit='/usr/lib32/'
-#export LD_LIBRARY_PATH="${LIBDIR_32bit}:${LD_LIBRARY_PATH}"
+	EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DCMAKE_TOOLCHAIN_FILE=../mk/cmake/Modules/Toolchain-linux32.cmake"
+	#LIBDIR_32bit='/usr/lib32/'
+	#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
 
 if [ $MAKE_ONLY = 0 ]; then
diff --git a/mk/linux/makedeps_folder.sh b/mk/linux/makedeps_folder.sh
index 9e9e27a31..dbb39d4dc 100755
--- a/mk/linux/makedeps_folder.sh
+++ b/mk/linux/makedeps_folder.sh
@@ -22,7 +22,7 @@ sync_support_libs(){
 	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=""
-	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
 
diff --git a/mk/macosx/build-mg.sh b/mk/macosx/build-mg.sh
index a0e4eaf67..d024c01d8 100755
--- a/mk/macosx/build-mg.sh
+++ b/mk/macosx/build-mg.sh
@@ -18,15 +18,16 @@ GCC_FORCED=0
 WANT_STATIC_LIBS="-DWANT_STATIC_LIBS=ON"
 FORCE_EMBEDDED_LIBS=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
 		c) CPU_COUNT=${OPTARG};;
 		d) WANT_STATIC_LIBS="-DWANT_STATIC_LIBS=OFF";;
 		e) FORCE_EMBEDDED_LIBS=1;;
 		f) GCC_FORCED=1;;
 		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 "       -b   : Force default configuration designed for bundle/release."
 			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 "       -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 "       -w   : Force compilation 'Without using wxWidgets'"
 			echo "       -x   : Force usage of Xcode and xcodebuild"
 			echo "       -h   : Display this help usage"
 			exit 0;;
 		l) LUA_FORCED_VERSION=${OPTARG};;
 		m) CMAKE_ONLY=1;;
 		n) MAKE_ONLY=1;;
+		w) COMPILATION_WITHOUT=1;;
 		x) USE_XCODE=1;;
 		b)	BUILD_BUNDLE=1
 			#CPU_COUNT=-1
@@ -50,7 +53,8 @@ while getopts "c:defhl:mnxb" option; do
 			USE_XCODE=0
 			GCC_FORCED=0
 			WANT_STATIC_LIBS="-DWANT_STATIC_LIBS=ON"
-			LUA_FORCED_VERSION=0;;
+			LUA_FORCED_VERSION=0
+			COMPILATION_WITHOUT=1;;
 		\?)
 			echo "Script Invalid option: -$OPTARG" >&2
 			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"
 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
 	EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DWANT_DEV_OUTPATH=ON $WANT_STATIC_LIBS -DBREAKPAD_ROOT=$BREAKPAD_ROOT"
 	if [ "$BUILD_BUNDLE" -ne "1" ]; then
@@ -195,7 +203,7 @@ if [ "$MAKE_ONLY" -eq "0" ]; then
 		fi
 		rm -f ../MegaGlest*.dmg
 	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
 	fi
 	echo "Calling cmake with EXTRA_CMAKE_OPTIONS = ${EXTRA_CMAKE_OPTIONS}"
diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt
index a91fbbf64..ea51292eb 100644
--- a/source/glest_game/CMakeLists.txt
+++ b/source/glest_game/CMakeLists.txt
@@ -115,25 +115,29 @@ IF(BUILD_MEGAGLEST)
 	ELSE()
 		SET(LIBVLC_MIN_VERSION "1.1.0")
 	ENDIF()
-	FIND_PACKAGE(LIBVLC)
-
-        IF(LIBVLC_FOUND AND NOT LIBVLC_VERSION STRLESS "${LIBVLC_MIN_VERSION}")
-                MESSAGE(STATUS "**NOTE: LIBVLC found so intro videos are supported.")
-	        INCLUDE_DIRECTORIES(${LIBVLC_INCLUDE_DIR})
-	        IF(UNIX)
-		        SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${LIBVLCCORE_LIBRARY} ${LIBVLC_LIBRARY})
-                        ADD_DEFINITIONS(-DHAS_LIBVLC)
-	        ENDIF()
+	IF(WANT_USE_VLC)
+		FIND_PACKAGE(LIBVLC)
+	ENDIF()
+	IF(LIBVLC_FOUND AND NOT LIBVLC_VERSION STRLESS "${LIBVLC_MIN_VERSION}")
+		MESSAGE(STATUS "**NOTE: LIBVLC found so intro videos are supported.")
+		INCLUDE_DIRECTORIES(${LIBVLC_INCLUDE_DIR})
+		IF(UNIX)
+			SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${LIBVLCCORE_LIBRARY} ${LIBVLC_LIBRARY})
+			ADD_DEFINITIONS(-DHAS_LIBVLC)
+		ENDIF()
 		IF(LIBVLC_VERSION_PRE_V2)
 			ADD_DEFINITIONS(-DLIBVLC_VERSION_PRE_2)
 		ENDIF()
 		IF(LIBVLC_VERSION_PRE_1_1_13)
 			ADD_DEFINITIONS(-DLIBVLC_VERSION_PRE_1_1_13)
 		ENDIF()
-		
-        ELSE()
-                MESSAGE(STATUS "**WARNING: LIBVLC NOT found so intro videos are NOT supported.")
-        ENDIF()
+	ELSE()
+		IF(WANT_USE_VLC)
+			MESSAGE(STATUS "**WARNING: LIBVLC NOT found so videos are NOT supported.")
+		ELSE()
+			MESSAGE(STATUS "LIBVLC disabled so videos are NOT supported.")
+		ENDIF()
+	ENDIF()
 
 	#########################################################################################
 	# megaglest game
diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt
index 6df96b584..6151feac0 100644
--- a/source/shared_lib/CMakeLists.txt
+++ b/source/shared_lib/CMakeLists.txt
@@ -173,30 +173,30 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
 	ELSE()
 		SET(LIBVLC_MIN_VERSION "1.1.0")
 	ENDIF()
-	FIND_PACKAGE(LIBVLC)
-        MESSAGE(STATUS "LIBVLC version: ${LIBVLC_VERSION} WANT_USE_VLC macro: ${WANT_USE_VLC}")
-
-        IF(LIBVLC_FOUND AND WANT_USE_VLC AND NOT LIBVLC_VERSION STRLESS "${LIBVLC_MIN_VERSION}")
-                MESSAGE(STATUS "**NOTE: LIBVLC found so videos are supported.")
-	        INCLUDE_DIRECTORIES(${LIBVLC_INCLUDE_DIR})
-	        IF(UNIX)
-		        SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${LIBVLCCORE_LIBRARY} ${LIBVLC_LIBRARY})
-                        ADD_DEFINITIONS(-DHAS_LIBVLC)
-	        ENDIF()
+	IF(WANT_USE_VLC)
+		FIND_PACKAGE(LIBVLC)
+		MESSAGE(STATUS "LIBVLC version: ${LIBVLC_VERSION}")
+	ENDIF()
+	IF(LIBVLC_FOUND AND NOT LIBVLC_VERSION STRLESS "${LIBVLC_MIN_VERSION}")
+		MESSAGE(STATUS "**NOTE: LIBVLC found so videos are supported.")
+		INCLUDE_DIRECTORIES(${LIBVLC_INCLUDE_DIR})
+		IF(UNIX)
+			SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${LIBVLCCORE_LIBRARY} ${LIBVLC_LIBRARY})
+			ADD_DEFINITIONS(-DHAS_LIBVLC)
+		ENDIF()
 		IF(LIBVLC_VERSION_PRE_V2)
 			ADD_DEFINITIONS(-DLIBVLC_VERSION_PRE_2)
 		ENDIF()
 		IF(LIBVLC_VERSION_PRE_1_1_13)
 			ADD_DEFINITIONS(-DLIBVLC_VERSION_PRE_1_1_13)
 		ENDIF()
-		
-        ELSE()
-                IF(WANT_USE_VLC)
-	                MESSAGE(STATUS "**WARNING: LIBVLC NOT found so videos are NOT supported.")
+	ELSE()
+		IF(WANT_USE_VLC)
+			MESSAGE(STATUS "**WARNING: LIBVLC NOT found so videos are NOT supported.")
 		ELSE()
 			MESSAGE(STATUS "LIBVLC disabled so videos are NOT supported.")
 		ENDIF()
-        ENDIF()
+	ENDIF()
 
         if(WANT_USE_FriBiDi)
 		find_package( FriBiDi )