From 87d0ef8b7dc3714616865dfa7d9e9bc9e3e23d48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Higor=20Eur=C3=ADpedes?= Date: Tue, 2 Jun 2015 10:57:18 -0300 Subject: [PATCH] (qb) Add --disable-libretrodb --- Makefile.common | 4 +++- qb/config.libs.sh | 2 +- qb/config.params.sh | 1 + runloop_data.h | 2 ++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile.common b/Makefile.common index 0d7cd240ba..7fd5799804 100644 --- a/Makefile.common +++ b/Makefile.common @@ -1,4 +1,6 @@ -HAVE_LIBRETRODB = 1 +ifeq ($(HAVE_LIBRETRODB),) + HAVE_LIBRETRODB = 1 +endif ifeq ($(HAVE_LIBRETRODB), 1) DEFINES += -DHAVE_LIBRETRODB diff --git a/qb/config.libs.sh b/qb/config.libs.sh index 3f1250cafb..4d3c6c7eb8 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -378,6 +378,6 @@ add_define_make OS "$OS" # Creates config.mk and config.h. 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 CORETEXT PULSE SDL SDL2 D3D9 DINPUT LIBUSB XINPUT DSOUND XAUDIO OPENGL EXYNOS DISPMANX SUNXI 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 COCOA AVFOUNDATION CORELOCATION IOHIDMANAGER" +VARS="RGUI LAKKA GLUI XMB ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO CORETEXT PULSE SDL SDL2 D3D9 DINPUT LIBUSB XINPUT DSOUND XAUDIO OPENGL EXYNOS DISPMANX SUNXI 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 COCOA AVFOUNDATION CORELOCATION IOHIDMANAGER LIBRETRODB" create_config_make config.mk $VARS create_config_header config.h $VARS diff --git a/qb/config.params.sh b/qb/config.params.sh index a4fcad84cb..6b08c92f72 100644 --- a/qb/config.params.sh +++ b/qb/config.params.sh @@ -1,3 +1,4 @@ +HAVE_LIBRETRODB=yes # Disable libretrodb HAVE_RGUI=yes # Disable RGUI HAVE_GLUI=no # Enable GLUI menu HAVE_XMB=no # Enable XMB menu diff --git a/runloop_data.h b/runloop_data.h index ca28377931..4c92932220 100644 --- a/runloop_data.h +++ b/runloop_data.h @@ -119,6 +119,7 @@ typedef struct nbio_handle unsigned status; } nbio_handle_t; +#ifdef HAVE_LIBRETRODB typedef struct database_state_handle { database_info_list_t *info; @@ -137,6 +138,7 @@ typedef struct db_handle msg_queue_t *msg_queue; unsigned status; } db_handle_t; +#endif typedef struct data_runloop {