diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 45 |
1 files changed, 26 insertions, 19 deletions
@@ -2604,6 +2604,8 @@ case $_host_os in append_var DEFINES "-DPLAYSTATION3" append_var CXXFLAGS "-mcpu=cell -mminimal-toc -I$PSL1GHT/ppu/include -I$PS3DEV/portlibs/ppu/include" append_var LDFLAGS "-L$PSL1GHT/ppu/lib -L$PS3DEV/portlibs/ppu/lib" + # The network libraries are statically linked and need to be specified in the following order + append_var SDL_NET_LIBS "-lSDL_net -lnet -lsysmodule" add_line_to_config_mk 'PLAYSTATION3 = 1' add_line_to_config_h "#define PREFIX \"${prefix}\"" ;; @@ -2763,6 +2765,10 @@ if test -n "$_host"; then _optimization_level=-O3 # Disable alsa midi to get the port build on OpenDingux toolchain _alsa=no + # Disable cloud and SDL_Net due to outdated toolchain + _cloud=no + _sdlnet=no + _libcurl=no _vkeybd=yes _build_hq_scalers=no _keymapper=no @@ -3349,10 +3355,30 @@ case $_backend in case $_sdlversion in 2.0.*) add_line_to_config_mk "USE_SDL2 = 1" + append_var SDL_NET_LIBS "-lSDL2_net" ;; *) + append_var SDL_NET_LIBS "-lSDL_net" ;; esac + + # Check for SDL_Net + echocheck "SDL_Net" + if test "$_sdlnet" = auto ; then + _sdlnet=no + cat > $TMPC << EOF +#include "SDL_net.h" +int main(int argc, char *argv[]) { SDLNet_Init(); return 0; } +EOF + cc_check $LIBS $INCLUDES $SDL_NET_CFLAGS $SDL_NET_LIBS && _sdlnet=yes + fi + if test "$_sdlnet" = yes ; then + append_var LIBS "$SDL_NET_LIBS" + append_var INCLUDES "$SDL_NET_CFLAGS" + fi + define_in_config_if_yes "$_sdlnet" 'USE_SDL_NET' + echo "$_sdlnet" + ;; esac @@ -4129,25 +4155,6 @@ EOF esac # -# Check for SDL_Net -# -echocheck "SDL_Net" -if test "$_sdlnet" = auto ; then - _sdlnet=no - cat > $TMPC << EOF -#include "SDL/SDL_net.h" -int main(int argc, char *argv[]) { SDLNet_Init(); return 0; } -EOF - cc_check $LIBS $INCLUDES $SDL_NET_CFLAGS $SDL_NET_LIBS -lSDL_net && _sdlnet=yes -fi -if test "$_sdlnet" = yes ; then - append_var LIBS "$SDL_NET_LIBS -lSDL_net" - append_var INCLUDES "$SDL_NET_CFLAGS" -fi -define_in_config_if_yes "$_sdlnet" 'USE_SDL_NET' -echo "$_sdlnet" - -# # Check for libcurl to be present # if test "$_libcurl" != "no"; then |