[Scummvm-git-logs] scummvm master -> 4c16ecb47f3c91037c03fd4553d8b55dc0ebc426

[criezy]

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

Summary:
cd57bd6e09 BUILD: Fix case-sensitivity issues with macOS ScummVMDockTilePlugin
943b64ad16 BUILD: Fix wrong library path from sdl2-config when bundling for macOS
248b96c36b BUILD: Fix builds using WinSparkle
4c16ecb47f BUILD: Fix missing frameworks for iOS static builds


Commit: cd57bd6e0975f7235b62bf3bbb79b9168b89982d
    https://github.com/scummvm/scummvm/commit/cd57bd6e0975f7235b62bf3bbb79b9168b89982d
Author: Colin Snover (github.com at zetafleet.com)
Date: 2019-08-04T22:12:29+01:00

Commit Message:
BUILD: Fix case-sensitivity issues with macOS ScummVMDockTilePlugin

This happened to work on case-insensitive filesystems only.

Changed paths:
    ports.mk


diff --git a/ports.mk b/ports.mk
index b10ecce..3a13dc1 100644
--- a/ports.mk
+++ b/ports.mk
@@ -88,8 +88,8 @@ scummvm.docktileplugin: ScummVMDockTilePlugin
 	mkdir -p scummvm.docktileplugin/Contents
 	cp $(srcdir)/dists/macosx/dockplugin/Info.plist scummvm.docktileplugin/Contents
 	mkdir -p scummvm.docktileplugin/Contents/MacOS
-	cp ScummVMDockTilePlugIn scummvm.docktileplugin/Contents/MacOS/
-	chmod 644 scummvm.docktileplugin/Contents/MacOS/ScummVMDockTilePlugIn
+	cp ScummVMDockTilePlugin scummvm.docktileplugin/Contents/MacOS/
+	chmod 644 scummvm.docktileplugin/Contents/MacOS/ScummVMDockTilePlugin
 
 endif
 


Commit: 943b64ad164882da2cf8f67adfa22cfa402f75fd
    https://github.com/scummvm/scummvm/commit/943b64ad164882da2cf8f67adfa22cfa402f75fd
Author: Colin Snover (github.com at zetafleet.com)
Date: 2019-08-04T22:12:29+01:00

Commit Message:
BUILD: Fix wrong library path from sdl2-config when bundling for macOS

Changed paths:
    ports.mk


diff --git a/ports.mk b/ports.mk
index 3a13dc1..ce131f0 100644
--- a/ports.mk
+++ b/ports.mk
@@ -295,7 +295,7 @@ endif
 ifneq ($(BACKEND), iphone)
 ifneq ($(BACKEND), ios7)
 # Static libaries, used for the scummvm-static and iphone targets
-OSX_STATIC_LIBS := `$(SDLCONFIG) --static-libs`
+OSX_STATIC_LIBS := `$(SDLCONFIG) --prefix=$(STATICLIBPATH) --static-libs`
 ifdef USE_SDL_NET
 ifdef USE_SDL2
 OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libSDL2_net.a


Commit: 248b96c36bc38cf96f6b0117817db5c21fbefe1a
    https://github.com/scummvm/scummvm/commit/248b96c36bc38cf96f6b0117817db5c21fbefe1a
Author: Colin Snover (github.com at zetafleet.com)
Date: 2019-08-04T22:12:29+01:00

Commit Message:
BUILD: Fix builds using WinSparkle

Changed paths:
    ports.mk


diff --git a/ports.mk b/ports.mk
index ce131f0..b1a3f61 100644
--- a/ports.mk
+++ b/ports.mk
@@ -381,11 +381,13 @@ OSX_ZLIB ?= $(STATICLIBPATH)/lib/libz.a
 endif
 
 ifdef USE_SPARKLE
+ifdef MACOSX
 ifneq ($(SPARKLEPATH),)
 OSX_STATIC_LIBS += -F$(SPARKLEPATH)
 endif
 OSX_STATIC_LIBS += -framework Sparkle -Wl,-rpath, at loader_path/../Frameworks
 endif
+endif
 
 # Special target to create a static linked binary for Mac OS X.
 # We use -force_cpusubtype_ALL to ensure the binary runs on every


Commit: 4c16ecb47f3c91037c03fd4553d8b55dc0ebc426
    https://github.com/scummvm/scummvm/commit/4c16ecb47f3c91037c03fd4553d8b55dc0ebc426
Author: Colin Snover (github.com at zetafleet.com)
Date: 2019-08-04T22:12:29+01:00

Commit Message:
BUILD: Fix missing frameworks for iOS static builds

Changed paths:
    configure


diff --git a/configure b/configure
index 958b4ad..7885fa7 100755
--- a/configure
+++ b/configure
@@ -4654,7 +4654,11 @@ if test "$_libcurl" != "no"; then
 	if test -z "$_libcurlconfig"; then
 		_libcurl=no
 	else
-		LIBCURL_LIBS=`$_libcurlconfig --libs`
+		if test -n "$_staticlibpath"; then
+			LIBCURL_LIBS=`$_libcurlconfig --static-libs`
+		else
+			LIBCURL_LIBS=`$_libcurlconfig --libs`
+		fi
 		LIBCURL_CFLAGS=`$_libcurlconfig --cflags`
 
 		case $_host_os in