mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-09 18:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

RGUI builds on PC.

Browse Source
This commit is contained in:
Themaister 2013-03-16 09:55:08 +01:00
parent 5626003af5
commit 15099f8e4f
7 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -78,6 +78,10 @@ ifneq ($(findstring Linux,$(OS)),)
JOYCONFIG_OBJ += input/linuxraw_joypad.o JOYCONFIG_OBJ += input/linuxraw_joypad.o
endif endif
ifeq ($(HAVE_RGUI), 1)
OBJ += frontend/menu/rgui.o frontend/menu/utils/file_list.o frontend/menu/menu_settings.o
endif
ifeq ($(HAVE_THREADS), 1) ifeq ($(HAVE_THREADS), 1)
OBJ += autosave.o thread.o gfx/thread_wrapper.o OBJ += autosave.o thread.o gfx/thread_wrapper.o
ifeq ($(findstring Haiku,$(OS)),) ifeq ($(findstring Haiku,$(OS)),)
@ -386,6 +390,8 @@ uninstall:
clean: clean:
rm -f *.o rm -f *.o
rm -f frontend/menu/*.o
rm -f frontend/menu/utils/*.o
rm -f audio/*.o rm -f audio/*.o
rm -f conf/*.o rm -f conf/*.o
rm -f gfx/*.o rm -f gfx/*.o

2
frontend/menu/menu_settings.c
View File

@ -19,6 +19,8 @@
#include <string.h> #include <string.h>
#include "../../general.h" #include "../../general.h"
#include "../../gfx/gfx_common.h"
#include "../../file.h"
#include "menu_settings.h" #include "menu_settings.h"
void menu_settings_set(unsigned setting) void menu_settings_set(unsigned setting)

8
frontend/menu/rgui.c
View File

@ -26,6 +26,8 @@
#include "menu_settings.h" #include "menu_settings.h"
#include "../../general.h" #include "../../general.h"
#include "../../gfx/gfx_common.h" #include "../../gfx/gfx_common.h"
#include "../../config.def.h"
#include "../../file.h"
#ifdef HAVE_OPENGL #ifdef HAVE_OPENGL
#include "../../gfx/gl_common.h" #include "../../gfx/gl_common.h"
@ -892,7 +894,11 @@ static int rgui_settings_toggle_setting(unsigned setting, rgui_action_t action,
g_settings.input.device[port]--; g_settings.input.device[port]--;
else if (action == RGUI_ACTION_RIGHT) else if (action == RGUI_ACTION_RIGHT)
g_settings.input.device[port]++; g_settings.input.device[port]++;
g_settings.input.device[port] %= DEVICE_LAST;
// DEVICE_LAST can be 0, avoid modulo.
if (g_settings.input.device[port] >= DEVICE_LAST)
g_settings.input.device[port] -= DEVICE_LAST;
if (driver.input->set_keybinds) if (driver.input->set_keybinds)
{ {
unsigned keybind_action = (1ULL << KEYBINDS_ACTION_SET_DEFAULT_BINDS); unsigned keybind_action = (1ULL << KEYBINDS_ACTION_SET_DEFAULT_BINDS);

8
frontend/menu/utils/file_list.c
View File

@ -28,14 +28,6 @@ struct rgui_file
size_t directory_ptr; size_t directory_ptr;
}; };
struct rgui_list
{
struct rgui_file *list;
size_t capacity;
size_t size;
};
void rgui_list_push(void *userdata, void rgui_list_push(void *userdata,
const char *path, unsigned type, size_t directory_ptr) const char *path, unsigned type, size_t directory_ptr)
{ {

9
frontend/menu/utils/file_list.h
View File

@ -21,7 +21,14 @@
extern "C" { extern "C" {
#endif #endif
typedef struct rgui_list rgui_list_t; struct rgui_file;
typedef struct rgui_list
{
struct rgui_file *list;
size_t capacity;
size_t size;
} rgui_list_t;
void rgui_list_free(rgui_list_t *list); void rgui_list_free(rgui_list_t *list);

2
qb/config.libs.sh
View File

@ -206,6 +206,6 @@ check_macro NEON __ARM_NEON__
add_define_make OS "$OS" add_define_make OS "$OS"
# Creates config.mk and config.h. # Creates config.mk and config.h.
VARS="ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO PULSE SDL OPENGL GLES VG EGL KMS GBM DRM DYLIB GETOPT_LONG THREADS CG LIBXML2 SDL_IMAGE ZLIB DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE FREETYPE XVIDEO X11 XEXT XF86VM XINERAMA NETPLAY NETWORK_CMD STDIN_CMD COMMAND SOCKET_LEGACY FBO STRL 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 SINC BSV_MOVIE VIDEOCORE NEON" VARS="RGUI ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO PULSE SDL OPENGL GLES VG EGL KMS GBM DRM DYLIB GETOPT_LONG THREADS CG LIBXML2 SDL_IMAGE ZLIB DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE FREETYPE XVIDEO X11 XEXT XF86VM XINERAMA NETPLAY NETWORK_CMD STDIN_CMD COMMAND SOCKET_LEGACY FBO STRL 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 SINC BSV_MOVIE VIDEOCORE NEON"
create_config_make config.mk $VARS create_config_make config.mk $VARS
create_config_header config.h $VARS create_config_header config.h $VARS

1
qb/config.params.sh
View File

@ -1,3 +1,4 @@
HAVE_RGUI=no # Enable RGUI
HAVE_DYNAMIC=yes # Disable dynamic loading of libretro library HAVE_DYNAMIC=yes # Disable dynamic loading of libretro library
HAVE_SDL=auto # SDL support HAVE_SDL=auto # SDL support
HAVE_LIBRETRO= # libretro library used HAVE_LIBRETRO= # libretro library used