libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-22 01:57:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

IPHONE: Don't link with SDL if it's unavailable

Browse Source 
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
This commit is contained in:
Le Philousophe 2020-10-30 19:35:20 +01:00
parent 0415a9da2a
commit 7c92081aa0
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@ -3909,14 +3909,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
@ -3924,6 +3928,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

26
ports.mk
View File

@ -322,22 +322,32 @@ 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
# 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