Merge pull request #1524 from heuripedes/master

Win32 fixes
This commit is contained in:
Twinaphex 2015-03-21 00:03:50 +01:00
commit 4ecbc9bc66
3 changed files with 12 additions and 6 deletions

View File

@ -23,6 +23,7 @@
#include <boolean.h>
#include <retro_inline.h>
#include <stdint.h>
#if defined(_WIN32) && !defined(_XBOX)
#ifndef _WIN32_WINNT

View File

@ -175,7 +175,6 @@ bool network_init(void)
network_deinit();
return false;
}
RARCH_LOG("WSA Initialized.\n");
#elif defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
cellSysmoduleLoadModule(CELL_SYSMODULE_NET);
sys_net_initialize_network();

View File

@ -145,13 +145,19 @@ check_lib NETWORKING "$SOCKETLIB" socket "" "$SOCKETHEADER"
if [ "$HAVE_NETWORKING" = 'yes' ]; then
HAVE_GETADDRINFO=auto
check_lib GETADDRINFO "$SOCKETLIB" getaddrinfo
if [ "$HAVE_GETADDRINFO" = 'yes' ]; then
HAVE_SOCKET_LEGACY='no'
HAVE_SOCKET_LEGACY=no
# WinXP+ implements getaddrinfo()
if [ "$OS" = 'Win32' ]; then
HAVE_GETADDRINFO=yes
else
HAVE_SOCKET_LEGACY='yes'
check_lib GETADDRINFO "$SOCKETLIB" getaddrinfo
if [ "$HAVE_GETADDRINFO" != 'yes' ]; then
HAVE_SOCKET_LEGACY=yes
echo "Notice: RetroArch will use legacy socket support"
fi
fi
HAVE_NETWORK_CMD='yes'
HAVE_NETWORK_CMD=yes
[ "$HAVE_NETPLAY" != 'no' ] && HAVE_NETPLAY='yes'
else