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

only add cheevos to the build when HAVE_NETWORKING is enabled

Browse Source
This commit is contained in:
Andre Leiradella 2015-10-19 13:15:23 -02:00
parent 08f773777c
commit 10ca5833a3
2 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile.common
View File

@ -820,13 +820,6 @@ ifeq ($(HAVE_ZLIB_DEFLATE),1)
DEFINES += -DHAVE_ZLIB_DEFLATE DEFINES += -DHAVE_ZLIB_DEFLATE
endif endif
# Retro Achievements
ifeq ($(HAVE_CHEEVOS), 1)
OBJ += cheevos.o libretro-common/utils/md5.o
DEFINES += -DHAVE_CHEEVOS
endif
# Camera # Camera
ifeq ($(HAVE_V4L2),1) ifeq ($(HAVE_V4L2),1)
@ -834,7 +827,7 @@ ifeq ($(HAVE_V4L2),1)
DEFINES += -DHAVE_V4L2 DEFINES += -DHAVE_V4L2
endif endif
# Netplay # Things that depend on network availability
ifeq ($(HAVE_NETWORKING), 1) ifeq ($(HAVE_NETWORKING), 1)
DEFINES += -DHAVE_NETWORKING DEFINES += -DHAVE_NETWORKING
@ -846,10 +839,19 @@ ifeq ($(HAVE_NETWORKING), 1)
LIBS += -lws2_32 LIBS += -lws2_32
endif endif
# Netplay
ifeq ($(HAVE_NETPLAY), 1) ifeq ($(HAVE_NETPLAY), 1)
DEFINES += -DHAVE_NETPLAY -DHAVE_NETWORK_CMD DEFINES += -DHAVE_NETPLAY -DHAVE_NETWORK_CMD
OBJ += netplay.o OBJ += netplay.o
endif endif
# Retro Achievements
ifeq ($(HAVE_CHEEVOS), 1)
DEFINES += -DHAVE_CHEEVOS
OBJ += cheevos.o libretro-common/utils/md5.o
endif
endif endif
ifneq ($(findstring Win32,$(OS)),) ifneq ($(findstring Win32,$(OS)),)

16
cheevos.c
View File

@ -1132,8 +1132,6 @@ Load achievements from retroachievements.org.
static const char* cheevos_http_get( const char* url, size_t* size ) static const char* cheevos_http_get( const char* url, size_t* size )
{ {
#ifdef HAVE_NETWORKING
struct http_connection_t* conn; struct http_connection_t* conn;
struct http_t* http; struct http_t* http;
uint8_t* data; uint8_t* data;
@ -1196,20 +1194,6 @@ error1:
} }
return (char*)result; return (char*)result;
#else /* HAVE_NETWORKING */
RARCH_LOG( "CHEEVOS http get %s\n", url );
RARCH_ERROR( "CHEEVOS Network unavailable\n" );
if ( size )
{
*size = 0;
}
return NULL;
#endif /* HAVE_NETWORKING */
} }
typedef struct typedef struct