From 52240c68c7301b941f51ea315994ee7e4665707b Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Wed, 11 May 2016 15:52:20 +0200 Subject: CONFIGURE: Added detection for SDL_net --- configure | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'configure') diff --git a/configure b/configure index e77351a99d..b663701562 100755 --- a/configure +++ b/configure @@ -117,6 +117,7 @@ done # # Default lib behavior yes/no/auto _vorbis=auto +_sdlnet=auto _tremor=auto _tremolo=no _flac=auto @@ -3676,6 +3677,24 @@ int main(void) { return 0; } EOF cc_check -lm && append_var LIBS "-lm" +# +# Check for SDL_Net +# +echocheck "SDL_Net" +if test "$_sdlnet" = auto ; then + _sdlnet=no + cat > $TMPC << EOF +#include "SDL/SDL_net.h" +int main(int argc, char *argv[]) { SDLNet_Init(); return 0; } +EOF + cc_check $LIBS $INCLUDES -lSDL_net && _sdlnet=yes +fi +if test "$_sdlnet" = yes ; then + LIBS="$LIBS -lSDL_net" +fi +define_in_config_if_yes "$_sdlnet" 'USE_SDL_NET' +echo "$_sdlnet" + # # Check for Ogg Vorbis # -- cgit v1.2.3 From 6c83930126a2dcb9af4fa631fc7226db1756f801 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Wed, 11 May 2016 17:40:55 +0200 Subject: CONFIGURE: Added libcurl detection --- configure | 136 +++++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 118 insertions(+), 18 deletions(-) (limited to 'configure') diff --git a/configure b/configure index b663701562..9c3da0a214 100755 --- a/configure +++ b/configure @@ -118,6 +118,7 @@ done # Default lib behavior yes/no/auto _vorbis=auto _sdlnet=auto +_libcurl=auto _tremor=auto _tremolo=no _flac=auto @@ -186,9 +187,11 @@ _staticlibpath= _xcodetoolspath= _sparklepath= _sdlconfig=sdl2-config +_libcurlconfig=curl-config _freetypeconfig=freetype-config _sdlpath="$PATH" _freetypepath="$PATH" +_libcurlpath="$PATH" _nasmpath="$PATH" NASMFLAGS="" NASM="" @@ -202,6 +205,7 @@ _have_x86=no # Add (virtual) features add_feature 16bit "16bit color" "_16bit" +add_feature cloud "cloud" "_cloud" add_feature faad "libfaad" "_faad" add_feature flac "FLAC" "_flac" add_feature freetype2 "FreeType2" "_freetype2" @@ -433,6 +437,41 @@ find_freetypeconfig() { fi } +# +# Determine curl-config +# +find_libcurlconfig() { + echo_n "Looking for curl-config... " + libcurlconfigs="$_libcurlconfig" + _libcurlconfig= + + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$SEPARATOR" + for path_dir in $_libcurlpath; do + #reset separator to parse sdlconfigs + IFS=":" + for libcurlconfig in $libcurlconfigs; do + if test -f "$path_dir/$libcurlconfig" ; then + _libcurlconfig="$path_dir/$libcurlconfig" + echo $_libcurlconfig + # Save the prefix + _libcurlpath=$path_dir + if test `basename $path_dir` = bin ; then + _sdlpath=`dirname $path_dir` + fi + # break at first sdl-config found in path + break 2 + fi + done + done + + IFS="$ac_save_ifs" + + if test -z "$_libcurlconfig"; then + echo "none found!" + exit 1 + fi +} + # # Determine extension used for executables # @@ -3677,24 +3716,6 @@ int main(void) { return 0; } EOF cc_check -lm && append_var LIBS "-lm" -# -# Check for SDL_Net -# -echocheck "SDL_Net" -if test "$_sdlnet" = auto ; then - _sdlnet=no - cat > $TMPC << EOF -#include "SDL/SDL_net.h" -int main(int argc, char *argv[]) { SDLNet_Init(); return 0; } -EOF - cc_check $LIBS $INCLUDES -lSDL_net && _sdlnet=yes -fi -if test "$_sdlnet" = yes ; then - LIBS="$LIBS -lSDL_net" -fi -define_in_config_if_yes "$_sdlnet" 'USE_SDL_NET' -echo "$_sdlnet" - # # Check for Ogg Vorbis # @@ -4090,6 +4111,85 @@ EOF ;; esac +# +# Check for SDL_Net +# +echocheck "SDL_Net" +if test "$_sdlnet" = auto ; then + _sdlnet=no + cat > $TMPC << EOF +#include "SDL/SDL_net.h" +int main(int argc, char *argv[]) { SDLNet_Init(); return 0; } +EOF + cc_check $LIBS $INCLUDES -lSDL_net && _sdlnet=yes +fi +if test "$_sdlnet" = yes ; then + LIBS="$LIBS -lSDL_net" +fi +define_in_config_if_yes "$_sdlnet" 'USE_SDL_NET' +echo "$_sdlnet" + +# +# Check for libcurl to be present +# +if test "$_libcurl" != "no"; then + + # Look for the curl-config script + find_libcurlconfig + + if test -z "$_libcurlconfig"; then + _libcurl=no + else + LIBCURL_LIBS=`$_libcurlconfig --libs` + LIBCURL_CFLAGS=`$_libcurlconfig --cflags` + + if test "$_libcurl" = "auto"; then + _libcurl=no + + cat > $TMPC << EOF + #include + int main(int argc, char *argv[]) { + int x; + curl_easy_setopt(NULL,CURLOPT_URL,NULL); + x=CURL_ERROR_SIZE; + x=CURLOPT_WRITEFUNCTION; + x=CURLOPT_WRITEDATA; + x=CURLOPT_ERRORBUFFER; + x=CURLOPT_STDERR; + x=CURLOPT_VERBOSE; + + curl_version_info_data *data = curl_version_info(CURLVERSION_NOW); + if (data->features & CURL_VERSION_SSL) + return 0; + return 1; + } +EOF + + cc_check_no_clean $LIBCURL_CFLAGS $LIBCURL_LIBS + if test "$?" -eq 0; then + $TMPO$HOSTEXEEXT + if test "$?" -eq 0; then + _libcurl=yes + else + _libcurl="no SSL support" + fi + fi + cc_check_clean + fi + + if test "$_libcurl" = "yes"; then + append_var LIBS "$LIBCURL_LIBS" + append_var INCLUDES "$LIBCURL_CFLAGS" + fi + fi + +fi + +echocheck "libcurl" +echo "$_libcurl" + +define_in_config_if_yes "$_libcurl" "USE_LIBCURL" + # # Check is NSDockTilePlugIn protocol is supported # -- cgit v1.2.3 From fade746f374cc801870e68934f1dbb3e9c726198 Mon Sep 17 00:00:00 2001 From: Alexander Tkachev Date: Wed, 11 May 2016 22:52:14 +0600 Subject: CLOUD: Add USE_CLOUD feature Adds USE_CLOUD in both configure and create_project. --- configure | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'configure') diff --git a/configure b/configure index 9c3da0a214..8b6068b44a 100755 --- a/configure +++ b/configure @@ -4190,6 +4190,28 @@ echo "$_libcurl" define_in_config_if_yes "$_libcurl" "USE_LIBCURL" +# +# Check whether to build cloud integration support +# +echo_n "Cloud integration" +if test "$_cloud" = "no"; then + echo "no" +else + if test "_sdl_net" = "yes" -or "_libcurl" = "yes"; then + _cloud=yes + if test "_sdl_net" = "yes"; then + echo "local" + fi + if test "_libcurl" = "yes"; then + echo "servers" + fi + else + _cloud=no + echo "no" + fi +fi +define_in_config_if_yes $_cloud 'USE_CLOUD' + # # Check is NSDockTilePlugIn protocol is supported # -- cgit v1.2.3 From 14785b12d35882f5de0aa197213ae7eda505a463 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Thu, 12 May 2016 14:29:27 +0200 Subject: CONFIGURE: Fix cloud support detection --- configure | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 8b6068b44a..de01ca7edc 100755 --- a/configure +++ b/configure @@ -4193,22 +4193,24 @@ define_in_config_if_yes "$_libcurl" "USE_LIBCURL" # # Check whether to build cloud integration support # -echo_n "Cloud integration" +echo_n "Cloud integration..." if test "$_cloud" = "no"; then echo "no" else - if test "_sdl_net" = "yes" -or "_libcurl" = "yes"; then + _cloud=no + if test "$_sdlnet" = "yes"; then _cloud=yes - if test "_sdl_net" = "yes"; then - echo "local" - fi - if test "_libcurl" = "yes"; then - echo "servers" - fi - else - _cloud=no - echo "no" + echo_n "local" + fi + if test "$_libcurl" = "yes"; then + if test "$_cloud" = "yes"; then echo_n ", "; fi + _cloud=yes + echo_n "servers" + fi + if test "$_cloud" = "no"; then + echo_n "no" fi + echo # newline fi define_in_config_if_yes $_cloud 'USE_CLOUD' -- cgit v1.2.3 From bc773835453478c5e56cfc2f653e6d863bc5de95 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 27 May 2016 17:58:36 +0200 Subject: CONFIGURE: Added configure switches for enabling/desabling cloud and net libs --- configure | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index de01ca7edc..448da8ac16 100755 --- a/configure +++ b/configure @@ -155,6 +155,7 @@ _build_hq_scalers=yes _enable_prof=no _global_constructors=no _bink=yes +_cloud=auto # Default vkeybd/keymapper/eventrec options _vkeybd=no _keymapper=no @@ -962,6 +963,7 @@ Optional Features: --disable-hq-scalers exclude HQ2x and HQ3x scalers --disable-translation don't build support for translated messages --disable-taskbar don't build support for taskbar and launcher integration + --disable-cloud don't build cloud support --enable-vkeybd build virtual keyboard support --enable-keymapper build key mapper support --enable-eventrecorder enable event recording functionality @@ -1044,6 +1046,9 @@ Optional Libraries: --with-sndio-prefix=DIR Prefix where sndio is installed (optional) --disable-sndio disable sndio MIDI driver [autodetect] + --disable-sdlnet disable SDL_Net networking library [autodetect] + --disable-libcurl disable libcurl networking library [autodetect] + Some influential environment variables: LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory @@ -1122,6 +1127,12 @@ for ac_option in $@; do --disable-freetype2) _freetype2=no ;; --enable-taskbar) _taskbar=yes ;; --disable-taskbar) _taskbar=no ;; + --enable-sdlnet) _sdlnet=yes ;; + --disable-sdlnet) _sdlnet=no ;; + --enable-libcurl) _libcurl=yes ;; + --disable-libcurl) _libcurl=no ;; + --enable-cloud) _cloud=yes ;; + --disable-cloud) _cloud=no ;; --enable-updates) _updates=yes ;; --disable-updates) _updates=no ;; --enable-libunity) _libunity=yes ;; @@ -4795,7 +4806,11 @@ if test "$_keymapper" = yes ; then fi if test "$_eventrec" = yes ; then - echo ", event recorder" + echo_n ", event recorder" +fi + +if test "$_cloud" = yes ; then + echo ", cloud" else echo fi -- cgit v1.2.3 From e2b3a9366eaad23549ad8be9316872e48a9ac11b Mon Sep 17 00:00:00 2001 From: Alexander Tkachev Date: Wed, 15 Jun 2016 14:49:01 +0600 Subject: CONFIGURE: Add --with-sdlnet-prefix option --- configure | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 448da8ac16..fb24e1ee4f 100755 --- a/configure +++ b/configure @@ -1046,6 +1046,8 @@ Optional Libraries: --with-sndio-prefix=DIR Prefix where sndio is installed (optional) --disable-sndio disable sndio MIDI driver [autodetect] + --with-sdlnet-prefix=DIR Prefix where SDL_Net is + installed (optional) --disable-sdlnet disable SDL_Net networking library [autodetect] --disable-libcurl disable libcurl networking library [autodetect] @@ -1241,6 +1243,11 @@ for ac_option in $@; do LIBUNITY_CFLAGS="-I$arg/include" LIBUNITY_LIBS="-L$arg/lib" ;; + --with-sdlnet-prefix=*) + arg=`echo $ac_option | cut -d '=' -f 2` + SDL_NET_CFLAGS="-I$arg/include" + SDL_NET_LIBS="-L$arg/lib" + ;; --backend=*) _backend=`echo $ac_option | cut -d '=' -f 2` ;; @@ -4132,10 +4139,11 @@ if test "$_sdlnet" = auto ; then #include "SDL/SDL_net.h" int main(int argc, char *argv[]) { SDLNet_Init(); return 0; } EOF - cc_check $LIBS $INCLUDES -lSDL_net && _sdlnet=yes + cc_check $LIBS $INCLUDES $SDL_NET_CFLAGS $SDL_NET_LIBS -lSDL_net && _sdlnet=yes fi -if test "$_sdlnet" = yes ; then - LIBS="$LIBS -lSDL_net" +if test "$_sdlnet" = yes ; then + append_var LIBS "$SDL_NET_LIBS -lSDL_net" + append_var INCLUDES "$SDL_NET_CFLAGS" fi define_in_config_if_yes "$_sdlnet" 'USE_SDL_NET' echo "$_sdlnet" -- cgit v1.2.3