[Scummvm-git-logs] scummvm branch-2-2 -> 81f7f0086f0eaddff01ed30f4b18930dfcf4f99e
aquadran
aquadran at gmail.com
Sat Mar 13 11:11:51 UTC 2021
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:
b64e23303c IPHONE: Don't link with SDL if it's unavailable
0d9b6bbd71 IPHONE: Link with Security framework when using curl
8c94234adf BUILD: Fix missing SDL in link for macOS bundle target
81f7f0086f CONFIGURE: Fix TTS detection with Mingw
Commit: b64e23303c388eeb123e3a5e31dfa6ec3184ca0f
https://github.com/scummvm/scummvm/commit/b64e23303c388eeb123e3a5e31dfa6ec3184ca0f
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-03-13T12:11:45+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 b11e938091..b47cb2d729 100755
--- a/configure
+++ b/configure
@@ -3829,14 +3829,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
@@ -3844,6 +3848,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 f8d48c374a..b7331bc245 100644
--- a/ports.mk
+++ b/ports.mk
@@ -329,22 +329,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: 0d9b6bbd7131036b93a48953ea04cf5a4e9ec0a2
https://github.com/scummvm/scummvm/commit/0d9b6bbd7131036b93a48953ea04cf5a4e9ec0a2
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-03-13T12:11:45+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 b7331bc245..1faa2a216c 100644
--- a/ports.mk
+++ b/ports.mk
@@ -357,7 +357,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
Commit: 8c94234adf9b64e73385409a4c2df706f0780e50
https://github.com/scummvm/scummvm/commit/8c94234adf9b64e73385409a4c2df706f0780e50
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-03-13T12:11:45+01:00
Commit Message:
BUILD: Fix missing SDL in link for macOS bundle target
When SDL_net is not available, or is explicitely disabled, it
was missing the SDL library in the link command for scummvm-static
target used when building a bundle.
Changed paths:
ports.mk
diff --git a/ports.mk b/ports.mk
index 1faa2a216c..c409a045f7 100644
--- a/ports.mk
+++ b/ports.mk
@@ -329,33 +329,36 @@ 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
-# 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
+ifndef WITHOUT_SDL
OSX_STATIC_LIBS := `$(SDLCONFIG) --prefix=$(STATICLIBPATH) --static-libs`
+
+ifdef USE_SDL_NET
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 # WITHOUT_SDL
+else # WITHOUT_SDL
+
+# Special SDL_Net library without SDL (iPhone)
+ifdef USE_SDL_NET
+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
endif # USE_SDL_NET
+endif # WITHOUT_SDL
+
ifdef USE_LIBCURL
OSX_STATIC_LIBS += -lcurl -framework Security
endif
Commit: 81f7f0086f0eaddff01ed30f4b18930dfcf4f99e
https://github.com/scummvm/scummvm/commit/81f7f0086f0eaddff01ed30f4b18930dfcf4f99e
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-03-13T12:11:45+01:00
Commit Message:
CONFIGURE: Fix TTS detection with Mingw
This matches commit da77bfd7928f47438063e5e2d7ffffdc40e0c7d2 in real
code
Changed paths:
configure
diff --git a/configure b/configure
index b47cb2d729..c9d20b25c5 100755
--- a/configure
+++ b/configure
@@ -4259,7 +4259,7 @@ if test "$_tts" = auto ; then
mingw*)
cat > $TMPC << EOF
#include <windows.h>
-#include <Servprov.h>
+#include <servprov.h>
#include <sapi.h>
int main(void) { return 0; }
EOF
More information about the Scummvm-git-logs
mailing list