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

[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:
a47a9bf5c3 BUILD: Fix creation of MacOS X application bundle when using SDL_net and curl


Commit: a47a9bf5c36742a6948adb489eb4b437c2baa414
    https://github.com/scummvm/scummvm/commit/a47a9bf5c36742a6948adb489eb4b437c2baa414
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-09-03T23:31:42+01:00

Commit Message:
BUILD: Fix creation of MacOS X application bundle when using SDL_net and curl

Changed paths:
    ports.mk



diff --git a/ports.mk b/ports.mk
index 286c488..4b5fa6b 100644
--- a/ports.mk
+++ b/ports.mk
@@ -273,11 +273,22 @@ ifneq ($(BACKEND), iphone)
 ifneq ($(BACKEND), ios7)
 # Static libaries, used for the scummvm-static and iphone targets
 OSX_STATIC_LIBS := `$(SDLCONFIG) --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
 endif
 
+ifdef USE_LIBCURL
+OSX_STATIC_LIBS += -lcurl
+endif
+
 ifdef USE_FREETYPE2
 OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libfreetype.a $(STATICLIBPATH)/lib/libbz2.a
 endif