thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BUILD: Fix missing SDL in link for macOS bundle target

Browse source 
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.
This commit is contained in:
Thierry Crozat 2020-11-02 19:03:34 +00:00 • committed by Paweł Kołodziejski
parent 0d9b6bbd71
commit 8c94234adf
1 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

33
ports.mk
View file

@ -329,10 +329,25 @@ endif
cp $(srcdir)/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-2208x1242.png $(bundle_name)/LaunchImage-800-Landscape-736h@3x.png
cp $(srcdir)/dists/ios7/Images.xcassets/LaunchImage.launchimage/ScummVM-splash-750x1334.png $(bundle_name)/LaunchImage-800-667h@2x.png
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
else # WITHOUT_SDL
# 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
@ -340,21 +355,9 @@ 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
# With sdl2-config we don't always get the OpenGL framework
OSX_STATIC_LIBS += -framework OpenGL
endif # USE_SDL_NET
endif # WITHOUT_SDL
endif # USE_SDL_NET
ifdef USE_LIBCURL
OSX_STATIC_LIBS += -lcurl -framework Security