ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1364 from heuripedes/master 

Build improvements
This commit is contained in:
Twinaphex 2015-01-28 01:03:42 +01:00
parent cef42b9356 7aeab17c5e
commit 6e9cacf707
10 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile.common
View File

@ -620,14 +620,19 @@ endif
# Netplay # Netplay
ifeq ($(HAVE_NETPLAY), 1) ifeq ($(HAVE_NETWORKING), 1)
DEFINES += -DHAVE_NETPLAY -DHAVE_NETWORK_CMD DEFINES += -DHAVE_NETWORKING
OBJ += netplay.o \ OBJ += net_compat.o
netplay_compat.o \
net_http.o
ifneq ($(findstring Win32,$(OS)),) ifneq ($(findstring Win32,$(OS)),)
LIBS += -lws2_32 LIBS += -lws2_32
endif endif
ifeq ($(HAVE_NETPLAY), 1)
DEFINES += -DHAVE_NETPLAY -DHAVE_NETWORK_CMD
OBJ += netplay.o \
net_http.o
endif
endif endif
ifneq ($(findstring Win32,$(OS)),) ifneq ($(findstring Win32,$(OS)),)

2
command.c
View File

@ -16,8 +16,8 @@
#include "command.h" #include "command.h"
#include "net_compat.h"
#if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY) #if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY)
#include "netplay_compat.h"
#include "netplay.h" #include "netplay.h"
#endif #endif

2
griffin/griffin.c
View File

@ -661,7 +661,7 @@ NETPLAY
============================================================ */ ============================================================ */
#ifdef HAVE_NETPLAY #ifdef HAVE_NETPLAY
#include "../netplay.c" #include "../netplay.c"
#include "../netplay_compat.c" #include "../net_compat.c"
#include "../net_http.c" #include "../net_http.c"
#endif #endif

2
logger/netlogger/logger.c
View File

@ -35,7 +35,7 @@
#include <string.h> #include <string.h>
#ifndef GEKKO #ifndef GEKKO
#include "../../netplay_compat.h" #include "../../net_compat.h"
#endif #endif
#include "logger.h" #include "logger.h"

2
netplay_compat.c → net_compat.c
View File

@ -14,7 +14,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "netplay_compat.h" #include "net_compat.h"
#include "netplay.h" #include "netplay.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

0
netplay_compat.h → net_compat.h
View File

2
net_http.c
View File

@ -18,7 +18,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>
#include "netplay_compat.h" #include "net_compat.h"
#include <compat/strl.h> #include <compat/strl.h>
enum enum

2
netplay.c
View File

@ -18,7 +18,7 @@
#pragma comment(lib, "ws2_32") #pragma comment(lib, "ws2_32")
#endif #endif
#include "netplay_compat.h" #include "net_compat.h"
#include "netplay.h" #include "netplay.h"
#include "general.h" #include "general.h"
#include "autosave.h" #include "autosave.h"

28
qb/config.libs.sh
View File

@ -55,7 +55,7 @@ if [ "$HAVE_7ZIP" = "yes" ]; then
fi fi
if [ "$HAVE_PRESERVE_DYLIB" = "yes" ]; then if [ "$HAVE_PRESERVE_DYLIB" = "yes" ]; then
echo "Disabling dlclose() of shared objects for Valgrind support." echo "Notice: Disabling dlclose() of shared objects for Valgrind support."
add_define_make HAVE_PRESERVE_DYLIB "1" add_define_make HAVE_PRESERVE_DYLIB "1"
fi fi
@ -111,7 +111,7 @@ if [ "$HAVE_EXYNOS" != "no" ]; then
fi fi
if [ "$LIBRETRO" ]; then if [ "$LIBRETRO" ]; then
echo "Explicit libretro used, disabling dynamic libretro loading ..." echo "Notice: Explicit libretro used, disabling dynamic libretro loading ..."
HAVE_DYNAMIC='no' HAVE_DYNAMIC='no'
else LIBRETRO="-lretro" else LIBRETRO="-lretro"
fi fi
@ -135,9 +135,9 @@ else
check_lib DYLIB "$DYLIB" dlopen check_lib DYLIB "$DYLIB" dlopen
fi fi
check_lib NETPLAY "$SOCKETLIB" socket "" "$SOCKETHEADER" check_lib NETWORKING "$SOCKETLIB" socket "" "$SOCKETHEADER"
if [ "$HAVE_NETPLAY" = 'yes' ]; then if [ "$HAVE_NETWORKING" = 'yes' ]; then
HAVE_GETADDRINFO=auto HAVE_GETADDRINFO=auto
check_lib GETADDRINFO "$SOCKETLIB" getaddrinfo check_lib GETADDRINFO "$SOCKETLIB" getaddrinfo
if [ "$HAVE_GETADDRINFO" = 'yes' ]; then if [ "$HAVE_GETADDRINFO" = 'yes' ]; then
@ -147,7 +147,9 @@ if [ "$HAVE_NETPLAY" = 'yes' ]; then
fi fi
HAVE_NETWORK_CMD='yes' HAVE_NETWORK_CMD='yes'
else else
echo "Warning: All networking features have been disabled."
HAVE_NETWORK_CMD='no' HAVE_NETWORK_CMD='no'
HAVE_NETPLAY='no'
fi fi
check_lib STDIN_CMD "$CLIB" fcntl check_lib STDIN_CMD "$CLIB" fcntl
@ -161,7 +163,7 @@ fi
check_lib GETOPT_LONG "$CLIB" getopt_long check_lib GETOPT_LONG "$CLIB" getopt_long
if [ "$HAVE_DYLIB" = 'no' ] && [ "$HAVE_DYNAMIC" = 'yes' ]; then if [ "$HAVE_DYLIB" = 'no' ] && [ "$HAVE_DYNAMIC" = 'yes' ]; then
echo "Dynamic loading of libretro is enabled, but your platform does not appear to have dlopen(), use --disable-dynamic or --with-libretro=\"-lretro\"". echo "Error: Dynamic loading of libretro is enabled, but your platform does not appear to have dlopen(), use --disable-dynamic or --with-libretro=\"-lretro\"".
exit 1 exit 1
fi fi
@ -189,10 +191,10 @@ check_pkgconf SDL2 sdl2 2.0.0
if [ "$HAVE_SDL2" = 'yes' ]; then if [ "$HAVE_SDL2" = 'yes' ]; then
if [ "$HAVE_SDL2" = 'yes' ] && [ "$HAVE_SDL" = 'yes' ]; then if [ "$HAVE_SDL2" = 'yes' ] && [ "$HAVE_SDL" = 'yes' ]; then
echo "SDL drivers will be replaced by SDL2 ones." echo "Notice: SDL drivers will be replaced by SDL2 ones."
HAVE_SDL=no HAVE_SDL=no
elif [ "$HAVE_SDL2" = 'no' ]; then elif [ "$HAVE_SDL2" = 'no' ]; then
echo "SDL2 not found, skipping." echo "Warning: SDL2 not found, skipping."
HAVE_SDL2=no HAVE_SDL2=no
fi fi
fi fi
@ -227,7 +229,7 @@ if [ "$HAVE_OPENGL" != 'no' ] && [ "$HAVE_GLES" != 'yes' ]; then
# fix undefined variables # fix undefined variables
PKG_CONF_USED="$PKG_CONF_USED CG" PKG_CONF_USED="$PKG_CONF_USED CG"
else else
echo "Ignoring Cg. Desktop OpenGL is not enabled." echo "Notice: Ignoring Cg. Desktop OpenGL is not enabled."
HAVE_CG='no' HAVE_CG='no'
fi fi
@ -243,7 +245,7 @@ if [ "$HAVE_THREADS" != 'no' ]; then
( [ "$HAVE_FFMPEG" = 'auto' ] && ( [ "$HAVE_AVCODEC" = 'no' ] || [ "$HAVE_AVFORMAT" = 'no' ] || [ "$HAVE_AVUTIL" = 'no' ] || [ "$HAVE_SWSCALE" = 'no' ] ) && HAVE_FFMPEG='no' ) || HAVE_FFMPEG='yes' ( [ "$HAVE_FFMPEG" = 'auto' ] && ( [ "$HAVE_AVCODEC" = 'no' ] || [ "$HAVE_AVFORMAT" = 'no' ] || [ "$HAVE_AVUTIL" = 'no' ] || [ "$HAVE_SWSCALE" = 'no' ] ) && HAVE_FFMPEG='no' ) || HAVE_FFMPEG='yes'
fi fi
else else
echo "Not building with threading support. Will skip FFmpeg." echo "Notice: Not building with threading support. Will skip FFmpeg."
HAVE_FFMPEG='no' HAVE_FFMPEG='no'
fi fi
@ -257,7 +259,7 @@ if [ "$HAVE_KMS" != "no" ]; then
if [ "$HAVE_GBM" = "yes" ] && [ "$HAVE_DRM" = "yes" ] && [ "$HAVE_EGL" = "yes" ]; then if [ "$HAVE_GBM" = "yes" ] && [ "$HAVE_DRM" = "yes" ] && [ "$HAVE_EGL" = "yes" ]; then
HAVE_KMS=yes HAVE_KMS=yes
elif [ "$HAVE_KMS" = "yes" ]; then elif [ "$HAVE_KMS" = "yes" ]; then
echo "Cannot find libgbm, libdrm and EGL libraries required for KMS. Compile without --enable-kms." echo "Error: Cannot find libgbm, libdrm and EGL libraries required for KMS. Compile without --enable-kms."
exit 1 exit 1
else else
HAVE_KMS=no HAVE_KMS=no
@ -269,7 +271,7 @@ check_pkgconf LIBXML2 libxml-2.0
if [ "$HAVE_EGL" = "yes" ]; then if [ "$HAVE_EGL" = "yes" ]; then
if [ "$HAVE_GLES" != "no" ]; then if [ "$HAVE_GLES" != "no" ]; then
if [ "$GLES_LIBS" ] || [ "$GLES_CFLAGS" ]; then if [ "$GLES_LIBS" ] || [ "$GLES_CFLAGS" ]; then
echo "Using custom OpenGLES CFLAGS ($GLES_CFLAGS) and LDFLAGS ($GLES_LIBS)." echo "Notice: Using custom OpenGLES CFLAGS ($GLES_CFLAGS) and LDFLAGS ($GLES_LIBS)."
add_define_make GLES_LIBS "$GLES_LIBS" add_define_make GLES_LIBS "$GLES_LIBS"
add_define_make GLES_CFLAGS "$GLES_CFLAGS" add_define_make GLES_CFLAGS "$GLES_CFLAGS"
else else
@ -316,7 +318,7 @@ check_pkgconf XINERAMA xinerama
if [ "$HAVE_X11" = 'yes' ] && [ "$HAVE_XEXT" = 'yes' ] && [ "$HAVE_XF86VM" = 'yes' ]; then if [ "$HAVE_X11" = 'yes' ] && [ "$HAVE_XEXT" = 'yes' ] && [ "$HAVE_XF86VM" = 'yes' ]; then
check_pkgconf XVIDEO xv check_pkgconf XVIDEO xv
else else
echo "X11, Xext or xf86vm not present. Skipping X11 code paths." echo "Notice: X11, Xext or xf86vm not present. Skipping X11 code paths."
HAVE_X11='no' HAVE_X11='no'
HAVE_XVIDEO='no' HAVE_XVIDEO='no'
fi fi
@ -344,6 +346,6 @@ add_define_make OS "$OS"
# Creates config.mk and config.h. # Creates config.mk and config.h.
add_define_make GLOBAL_CONFIG_DIR "$GLOBAL_CONFIG_DIR" add_define_make GLOBAL_CONFIG_DIR "$GLOBAL_CONFIG_DIR"
VARS="RGUI LAKKA GLUI XMB ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO PULSE SDL SDL2 D3D9 DINPUT WINXINPUT DSOUND XAUDIO OPENGL EXYNOS OMAP GLES GLES3 VG EGL KMS GBM DRM DYLIB GETOPT_LONG THREADS CG LIBXML2 ZLIB DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE FREETYPE XKBCOMMON XVIDEO X11 XEXT XF86VM XINERAMA WAYLAND MALI_FBDEV VIVANTE_FBDEV NETPLAY NETWORK_CMD STDIN_CMD COMMAND SOCKET_LEGACY FBO STRL STRCASESTR MMAP PYTHON FFMPEG_ALLOC_CONTEXT3 FFMPEG_AVCODEC_OPEN2 FFMPEG_AVIO_OPEN FFMPEG_AVFORMAT_WRITE_HEADER FFMPEG_AVFORMAT_NEW_STREAM FFMPEG_AVCODEC_ENCODE_AUDIO2 FFMPEG_AVCODEC_ENCODE_VIDEO2 BSV_MOVIE VIDEOCORE NEON FLOATHARD FLOATSOFTFP UDEV V4L2 AV_CHANNEL_LAYOUT 7ZIP PARPORT" VARS="RGUI LAKKA GLUI XMB ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO PULSE SDL SDL2 D3D9 DINPUT WINXINPUT DSOUND XAUDIO OPENGL EXYNOS OMAP GLES GLES3 VG EGL KMS GBM DRM DYLIB GETOPT_LONG THREADS CG LIBXML2 ZLIB DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE FREETYPE XKBCOMMON XVIDEO X11 XEXT XF86VM XINERAMA WAYLAND MALI_FBDEV VIVANTE_FBDEV NETWORKING NETPLAY NETWORK_CMD STDIN_CMD COMMAND SOCKET_LEGACY FBO STRL STRCASESTR MMAP PYTHON FFMPEG_ALLOC_CONTEXT3 FFMPEG_AVCODEC_OPEN2 FFMPEG_AVIO_OPEN FFMPEG_AVFORMAT_WRITE_HEADER FFMPEG_AVFORMAT_NEW_STREAM FFMPEG_AVCODEC_ENCODE_AUDIO2 FFMPEG_AVCODEC_ENCODE_VIDEO2 BSV_MOVIE VIDEOCORE NEON FLOATHARD FLOATSOFTFP UDEV V4L2 AV_CHANNEL_LAYOUT 7ZIP PARPORT"
create_config_make config.mk $VARS create_config_make config.mk $VARS
create_config_header config.h $VARS create_config_header config.h $VARS

3
qb/config.params.sh
View File

@ -12,7 +12,8 @@ HAVE_GLES_CFLAGS= # C-flags for custom GLES library
HAVE_THREADS=auto # Threading support HAVE_THREADS=auto # Threading support
HAVE_FFMPEG=auto # Enable FFmpeg recording support HAVE_FFMPEG=auto # Enable FFmpeg recording support
HAVE_DYLIB=auto # Enable dynamic loading support HAVE_DYLIB=auto # Enable dynamic loading support
HAVE_NETPLAY=auto # Enable netplay support HAVE_NETWORKING=auto # Enable networking features (recommended)
HAVE_NETPLAY=auto # Enable netplay support (requires networking)
HAVE_D3D9=yes # Disable Direct3D 9 support HAVE_D3D9=yes # Disable Direct3D 9 support
HAVE_OPENGL=yes # Disable OpenGL support HAVE_OPENGL=yes # Disable OpenGL support
HAVE_GLES=no # Use GLESv2 instead of desktop GL HAVE_GLES=no # Use GLESv2 instead of desktop GL