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

[criezy]

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

Summary:
aa8ff8b551 BUILD: Fix missing SDL in link for macOS bundle target


Commit: aa8ff8b5518ac319e63623f8188928b5bd1644db
    https://github.com/scummvm/scummvm/commit/aa8ff8b5518ac319e63623f8188928b5bd1644db
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2020-11-02T19:03:34Z

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 741e56c61a..31101f3dc3 100644
--- a/ports.mk
+++ b/ports.mk
@@ -344,33 +344,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