[Scummvm-git-logs] scummvm master -> f3e00fb6a491c185cedc4a55acfc394c19d3a1f6

[lephilousophe]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0415a9da2a IPHONE: Update defines for iPhone 7
7c92081aa0 IPHONE: Don't link with SDL if it's unavailable
f3e00fb6a4 IPHONE: Link with Security framework when using curl


Commit: 0415a9da2a41f56a4309dbb1f50bfddefb5079cb
    https://github.com/scummvm/scummvm/commit/0415a9da2a41f56a4309dbb1f50bfddefb5079cb
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2020-11-01T10:11:06+01:00

Commit Message:
IPHONE: Update defines for iPhone 7

It's what is used in Xcode project files generated by create_project

Changed paths:
    configure


diff --git a/configure b/configure
index 16ee81c32e..dff7ed36b3 100755
--- a/configure
+++ b/configure
@@ -3482,7 +3482,7 @@ if test -n "$_host"; then
 			_timidity=no
 			;;
 		ios7)
-			append_var DEFINES "-DIPHONE"
+			append_var DEFINES "-DIPHONE -DIPHONE_IOS7 -DIPHONE_SANDBOXED"
 			_backend="ios7"
 			_seq_midi=no
 			_timidity=no


Commit: 7c92081aa08130f17372b77f39f9618430727140
    https://github.com/scummvm/scummvm/commit/7c92081aa08130f17372b77f39f9618430727140
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2020-11-01T10:11:06+01:00

Commit Message:
IPHONE: Don't link with SDL if it's unavailable

SDL_Net can be compiled without the need of SDL so avoid linking with
it.
Define WITHOUT_SDL as it's done (for nothing) in create_project

Changed paths:
    configure
    ports.mk


diff --git a/configure b/configure
index dff7ed36b3..020a3f97c5 100755
--- a/configure
+++ b/configure
@@ -3909,14 +3909,18 @@ EOF
 	if test "$_sdlnet" = yes ; then
 		set_var SDL_NET_LIBS   "$SDL2_NET_LIBS"
 		set_var SDL_NET_CFLAGS "$SDL2_NET_CFLAGS"
+		add_line_to_config_mk "SDL_NET_MAJOR = 2"
 	else
 		cat > $TMPC << EOF
 #include "SDL_net.h"
 int main(int argc, char *argv[]) { SDLNet_Init(); return 0; }
 EOF
 		cc_check $SDL1_NET_LIBS $LIBS $INCLUDES $SDL1_NET_CFLAGS && _sdlnet=yes
-		set_var SDL_NET_LIBS   "$SDL1_NET_LIBS"
-		set_var SDL_NET_CFLAGS "$SDL1_NET_CFLAGS"
+		if test "$_sdlnet" = yes ; then
+			set_var SDL_NET_LIBS   "$SDL1_NET_LIBS"
+			set_var SDL_NET_CFLAGS "$SDL1_NET_CFLAGS"
+			add_line_to_config_mk "SDL_NET_MAJOR = 1"
+		fi
 	fi
 
 	if test "$_sdlnet" = yes ; then
@@ -3924,6 +3928,7 @@ EOF
 		prepend_var LIBS "$SDL_NET_LIBS"
 		append_var INCLUDES "$SDL_NET_CFLAGS"
 	fi
+	define_in_config_if_no "$_sdl" 'WITHOUT_SDL'
 	define_in_config_if_yes "$_sdlnet" 'USE_SDL_NET'
 	echo "$_sdlnet"
 fi
diff --git a/ports.mk b/ports.mk
index 29d4af972a..07f9aa5683 100644
--- a/ports.mk
+++ b/ports.mk
@@ -322,22 +322,32 @@ endif
 	cp $(srcdir)/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2208x1242.png $(bundle_name)/LaunchImage-800-Landscape-736h at 3x.png
 	cp $(srcdir)/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-750x1334.png $(bundle_name)/LaunchImage-800-667h at 2x.png
 
-# Location of static libs for the iPhone
-ifneq ($(BACKEND), iphone)
-ifneq ($(BACKEND), ios7)
-# Static libaries, used for the scummvm-static and iphone targets
-OSX_STATIC_LIBS := `$(SDLCONFIG) --prefix=$(STATICLIBPATH) --static-libs`
+# Special SDL_Net library without SDL (iPhone)
 ifdef USE_SDL_NET
+ifdef WITHOUT_SDL
+
+ifeq ($(SDL_NET_MAJOR),1)
+OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libSDL_net.a
+else
+ifeq ($(SDL_NET_MAJOR),2)
+OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libSDL2_net.a
+endif
+endif
+
+else # WITHOUT_SDL
+
+# Static libaries, used for the scummvm-static target
+OSX_STATIC_LIBS := `$(SDLCONFIG) --prefix=$(STATICLIBPATH) --static-libs`
 ifdef USE_SDL2
 OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libSDL2_net.a
 else
 OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libSDL_net.a
 endif
-endif
 # With sdl2-config we don't always get the OpenGL framework
 OSX_STATIC_LIBS += -framework OpenGL
-endif
-endif
+
+endif # WITHOUT_SDL
+endif # USE_SDL_NET
 
 ifdef USE_LIBCURL
 OSX_STATIC_LIBS += -lcurl


Commit: f3e00fb6a491c185cedc4a55acfc394c19d3a1f6
    https://github.com/scummvm/scummvm/commit/f3e00fb6a491c185cedc4a55acfc394c19d3a1f6
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2020-11-01T10:11:06+01:00

Commit Message:
IPHONE: Link with Security framework when using curl

That lets static curl libraries make use of DarwinSSL instead of OpenSSL

Changed paths:
    ports.mk


diff --git a/ports.mk b/ports.mk
index 07f9aa5683..29f98dc297 100644
--- a/ports.mk
+++ b/ports.mk
@@ -350,7 +350,7 @@ endif # WITHOUT_SDL
 endif # USE_SDL_NET
 
 ifdef USE_LIBCURL
-OSX_STATIC_LIBS += -lcurl
+OSX_STATIC_LIBS += -lcurl -framework Security
 endif
 
 ifdef USE_FREETYPE2