mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update build for Win32

Browse Source
This commit is contained in:
Themaister 2011-02-13 16:49:18 +01:00
parent 85dbc05ded
commit fd1367e257
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.win32
View File

@ -1,6 +1,6 @@
TARGET = ssnes.exe TARGET = ssnes.exe
JTARGET = ssnes-joyconfig.exe JTARGET = ssnes-joyconfig.exe
OBJ = ssnes.o file.o driver.o conf/config_file.o settings.o dynamic.o message.o rewind.o movie.o OBJ = ssnes.o file.o driver.o conf/config_file.o settings.o dynamic.o message.o rewind.o movie.o autosave.o netplay.o
JOBJ = conf/config_file.o tools/main-stub.o tools/ssnes-joyconfig.o JOBJ = conf/config_file.o tools/main-stub.o tools/ssnes-joyconfig.o
CC = gcc CC = gcc
@ -14,7 +14,7 @@ HAVE_XAUDIO = 1
HAVE_RSOUND = 1 HAVE_RSOUND = 1
libsnes ?= -lsnes libsnes ?= -lsnes
LIBS = LIBS = -lws2_32
DEFINES = -I. -DHAVE_CONFIGFILE DEFINES = -I. -DHAVE_CONFIGFILE
LDFLAGS = -L. -static-libgcc -s LDFLAGS = -L. -static-libgcc -s

12
netplay.c
View File

@ -29,6 +29,7 @@
#include <ws2tcpip.h> #include <ws2tcpip.h>
#define close(x) closesocket(x) #define close(x) closesocket(x)
#define CONST_CAST (const char*) #define CONST_CAST (const char*)
#define NONCONST_CAST (char*)
#else #else
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -37,6 +38,7 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netdb.h> #include <netdb.h>
#define CONST_CAST #define CONST_CAST
#define NONCONST_CAST
#endif #endif
struct netplay struct netplay
@ -141,7 +143,7 @@ static bool init_socket(netplay_t *handle, const char *server, uint16_t port)
freeaddrinfo(res); freeaddrinfo(res);
const int nodelay = 1; const int nodelay = 1;
setsockopt(handle->fd, SOL_SOCKET, TCP_NODELAY, &nodelay, sizeof(int)); setsockopt(handle->fd, SOL_SOCKET, TCP_NODELAY, CONST_CAST &nodelay, sizeof(int));
return true; return true;
} }
@ -149,7 +151,7 @@ static bool init_socket(netplay_t *handle, const char *server, uint16_t port)
static bool send_info(netplay_t *handle) static bool send_info(netplay_t *handle)
{ {
uint32_t header[2] = { htonl(g_extern.cart_crc), htonl(psnes_serialize_size()) }; uint32_t header[2] = { htonl(g_extern.cart_crc), htonl(psnes_serialize_size()) };
if (send(handle->fd, header, sizeof(header), 0) != sizeof(header)) if (send(handle->fd, CONST_CAST header, sizeof(header), 0) != sizeof(header))
return false; return false;
return true; return true;
} }
@ -157,7 +159,7 @@ static bool send_info(netplay_t *handle)
static bool get_info(netplay_t *handle) static bool get_info(netplay_t *handle)
{ {
uint32_t header[2]; uint32_t header[2];
if (recv(handle->fd, header, sizeof(header), 0) != sizeof(header)) if (recv(handle->fd, NONCONST_CAST header, sizeof(header), 0) != sizeof(header))
return false; return false;
if (g_extern.cart_crc != ntohl(header[0])) if (g_extern.cart_crc != ntohl(header[0]))
return false; return false;
@ -227,13 +229,13 @@ bool netplay_poll(netplay_t *handle)
} }
state = htons(state); state = htons(state);
if (send(handle->fd, &state, sizeof(state), 0) != sizeof(state)) if (send(handle->fd, CONST_CAST &state, sizeof(state), 0) != sizeof(state))
{ {
handle->has_connection = false; handle->has_connection = false;
return false; return false;
} }
if (recv(handle->fd, &handle->input_state, sizeof(handle->input_state), 0) != sizeof(handle->input_state)) if (recv(handle->fd, NONCONST_CAST &handle->input_state, sizeof(handle->input_state), 0) != sizeof(handle->input_state))
{ {
handle->has_connection = false; handle->has_connection = false;
return false; return false;