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

(Lakka) Remove Lakka - XMB will become the replacement driver

Browse Source
This commit is contained in:
twinaphex 2015-01-27 01:56:04 +01:00
parent 49a2bce941
commit e431f8e8f0
16 changed files with 5 additions and 2022 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.common
View File

@ -48,7 +48,6 @@ ifeq ($(HAVE_OPENGL), 1)
ifeq ($(HAVE_RGUI), 1)
HAVE_GLUI = 1
HAVE_XMB = 1
HAVE_LAKKA = 1
endif
endif
@ -299,10 +298,6 @@ ifeq ($(HAVE_XMB), 1)
OBJ += menu/drivers/xmb.o
DEFINES += -DHAVE_XMB
endif
ifeq ($(HAVE_LAKKA), 1)
OBJ += menu/drivers/lakka.o
DEFINES += -DHAVE_LAKKA
endif
endif
ifeq ($(HAVE_MENU_COMMON), 1)

2
Makefile.win
View File

@ -21,8 +21,6 @@ DYNAMIC = 1
HAVE_WINXINPUT = 1
HAVE_LAKKA = 1
HAVE_SDL := 0
HAVE_SDL2 := 0
HAVE_RSOUND := 0

2
android/phoenix/jni/Android.mk
View File

@ -58,7 +58,7 @@ else
endif
LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -fno-stack-protector -funroll-loops -DNDEBUG -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_LAKKA -DHAVE_GLUI -DHAVE_XMB -std=gnu99
LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -fno-stack-protector -funroll-loops -DNDEBUG -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_GLUI -DHAVE_XMB -std=gnu99
LOCAL_CFLAGS += -DHAVE_7ZIP
LOCAL_CFLAGS += -O2

4
apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.pbxproj
View File

@ -436,7 +436,6 @@
"-DHAVE_DYLIB",
"-DHAVE_CG",
"-DHAVE_7ZIP",
"-DHAVE_LAKKA",
"-DHAVE_GLUI",
"-DHAVE_HID",
"-DHAVE_XMB",
@ -507,7 +506,6 @@
"-DHAVE_DYLIB",
"-DHAVE_CG",
"-DHAVE_7ZIP",
"-DHAVE_LAKKA",
"-DHAVE_GLUI",
"-DHAVE_HID",
"-DHAVE_XMB",
@ -621,7 +619,6 @@
"-DHAVE_DYLIB",
"-DHAVE_CG",
"-DHAVE_7ZIP",
"-DHAVE_LAKKA",
"-DHAVE_GLUI",
"-DHAVE_HID",
"-DHAVE_XMB",
@ -692,7 +689,6 @@
"-DHAVE_DYLIB",
"-DHAVE_CG",
"-DHAVE_7ZIP",
"-DHAVE_LAKKA",
"-DHAVE_GLUI",
"-DHAVE_HID",
"-DHAVE_XMB",

2
apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj
View File

@ -337,7 +337,6 @@
"-DHAVE_THREADS",
"-DHAVE_DYLIB",
"-DHAVE_7ZIP",
"-DHAVE_LAKKA",
"-DHAVE_GLUI",
"-DHAVE_HID",
"-DHAVE_XMB",
@ -398,7 +397,6 @@
"-DHAVE_THREADS",
"-DHAVE_DYLIB",
"-DHAVE_7ZIP",
"-DHAVE_LAKKA",
"-DHAVE_GLUI",
"-DHAVE_HID",
"-DHAVE_XMB",

2
apple/iOS/Makefile
View File

@ -23,7 +23,7 @@ ${APPLICATION_NAME}_FILES = $(SRC_DIR)/griffin/griffin.c \
$(SRC_DIR)/apple/common/RAGameView.m \
$(SRC_DIR)/apple/common/utility.m \
COMMON_FLAGS := -DIOS -DHAVE_GRIFFIN -DHAVE_LOCATION -DHAVE_NETPLAY -DHAVE_RGUI -DHAVE_MENU -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -DRARCH_MOBILE -std=gnu99 -DHAVE_COREAUDIO -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_ZLIB -DWANT_MINIZ -DSINC_LOWER_QUALITY -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_LAKKA -DHAVE_XMB -D_LZMA_UINT32_IS_ULONG -DHAVE_STRL
COMMON_FLAGS := -DIOS -DHAVE_GRIFFIN -DHAVE_LOCATION -DHAVE_NETPLAY -DHAVE_RGUI -DHAVE_MENU -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -DRARCH_MOBILE -std=gnu99 -DHAVE_COREAUDIO -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_ZLIB -DWANT_MINIZ -DSINC_LOWER_QUALITY -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_XMB -D_LZMA_UINT32_IS_ULONG -DHAVE_STRL
COMMON_FLAGS += -DHAVE_CAMERA
COMMON_IOS_FLAGS := -Wno-deprecated-declarations -Wno-error
COMMON_IOS_OBJCFLAGS := -fobjc-arc

3
apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj
View File

@ -494,7 +494,6 @@
"-DRARCH_INTERNAL",
"-DHAVE_THREADS",
"-DHAVE_FILTERS_BUILTIN",
"-DHAVE_LAKKA",
"-DHAVE_GLUI",
"-DHAVE_XMB",
"-D_LZMA_UINT32_IS_ULONG",
@ -558,7 +557,6 @@
"-DHAVE_THREADS",
"-DHAVE_FILTERS_BUILTIN",
"-DHAVE_7ZIP",
"-DHAVE_LAKKA",
"-DHAVE_GLUI",
"-DHAVE_XMB",
"-D_LZMA_UINT32_IS_ULONG",
@ -592,7 +590,6 @@
"-DHAVE_THREADS",
"-DHAVE_FILTERS_BUILTIN",
"-DHAVE_7ZIP",
"-DHAVE_LAKKA",
"-DHAVE_GLUI",
"-DHAVE_XMB",
"-D_LZMA_UINT32_IS_ULONG",

1
config.def.h
View File

@ -119,7 +119,6 @@ enum
MENU_RGUI,
MENU_RMENU,
MENU_RMENU_XUI,
MENU_LAKKA,
MENU_GLUI,
MENU_XMB,
MENU_IOS,

4
griffin/griffin.c
View File

@ -710,10 +710,6 @@ MENU
#ifdef HAVE_OPENGL
#ifdef HAVE_LAKKA
#include "../menu/drivers/lakka.c"
#endif
#ifdef HAVE_XMB
#include "../menu/drivers/xmb.c"
#endif

1854
menu/drivers/lakka.c
View File

File diff suppressed because it is too large Load Diff

135
menu/drivers/lakka.h
View File

@ -1,135 +0,0 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2010-2014 - Hans-Kristian Arntzen
* Copyright (C) 2011-2015 - Daniel De Matteis
* Copyright (C) 2012-2015 - Michael Lelli
* Copyright (C) 2014-2015 - Jean-André Santoni
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with RetroArch.
* If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _MENU_DISP_LAKKA_H
#define _MENU_DISP_LAKKA_H
#include "../../gfx/gl_common.h"
#include "../../gfx/font_renderer_driver.h"
#define THEME "monochrome" // flatui or monochrome themes are available
#ifndef LAKKA_DELAY
#define LAKKA_DELAY 0.02
#endif
enum
{
TEXTURE_MAIN = 0,
TEXTURE_FONT,
TEXTURE_BG,
TEXTURE_SETTINGS,
TEXTURE_SETTING,
TEXTURE_SUBSETTING,
TEXTURE_ARROW,
TEXTURE_RUN,
TEXTURE_RESUME,
TEXTURE_SAVESTATE,
TEXTURE_LOADSTATE,
TEXTURE_SCREENSHOT,
TEXTURE_RELOAD,
TEXTURE_SWITCH_ON,
TEXTURE_SWITCH_OFF,
TEXTURE_LAST
};
typedef struct
{
char name[256];
GLuint icon;
float alpha;
float zoom;
float y;
rarch_setting_t *setting;
} menu_subitem_t;
typedef struct
{
char name[256];
char rom[PATH_MAX_LENGTH];
float alpha;
float zoom;
float y;
int active_subitem;
int num_subitems;
menu_subitem_t *subitems;
} menu_item_t;
typedef struct
{
char name[256];
char libretro[PATH_MAX_LENGTH];
GLuint icon;
GLuint item_icon;
float alpha;
float zoom;
int active_item;
int num_items;
menu_item_t *items;
} menu_category_t;
struct lakka_texture_item
{
GLuint id;
char path[PATH_MAX_LENGTH];
};
typedef struct lakka_handle
{
float scale_factor;
float c_active_zoom;
float c_passive_zoom;
float c_active_alpha;
float c_passive_alpha;
float i_active_zoom;
float i_passive_zoom;
float i_active_alpha;
float i_passive_alpha;
float margin_left;
float margin_top;
float title_margin_left;
float title_margin_top;
float label_margin_left;
float label_margin_top;
float setting_margin_left;
float above_subitem_offset;
float above_item_offset;
float active_item_factor;
float under_item_offset;
float hspacing;
float vspacing;
float all_categories_x;
float global_alpha;
float global_scale;
float arrow_alpha;
int depth;
int num_categories;
int menu_active_category;
int icon_size;
char icon_dir[4];
menu_category_t *categories;
struct lakka_texture_item textures[TEXTURE_LAST];
GLuint fbo;
GLuint fbo_color;
GLuint fbo_depth;
void *font;
int font_size;
} lakka_handle_t;
#endif /* MENU_DISP_LAKKA_H */

3
menu/menu_driver.c
View File

@ -31,9 +31,6 @@ static const menu_ctx_driver_t *menu_ctx_drivers[] = {
#if defined(HAVE_RMENU_XUI)
&menu_ctx_rmenu_xui,
#endif
#if defined(HAVE_LAKKA)
&menu_ctx_lakka,
#endif
#if defined(HAVE_GLUI)
&menu_ctx_glui,
#endif

1
menu/menu_driver.h
View File

@ -198,7 +198,6 @@ extern menu_ctx_driver_t menu_ctx_rmenu_xui;
extern menu_ctx_driver_t menu_ctx_rgui;
extern menu_ctx_driver_t menu_ctx_glui;
extern menu_ctx_driver_t menu_ctx_xmb;
extern menu_ctx_driver_t menu_ctx_lakka;
extern menu_ctx_driver_t menu_ctx_ios;
/**

6
msvc/msvc-2010/RetroArch-msvc2010.vcxproj
View File

@ -100,7 +100,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_GLUI;HAVE_LAKKA</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_GLUI</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;$(MSBuildProjectDirectory)\..\..\libretro-sdk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<CompileAs>CompileAsCpp</CompileAs>
@ -142,7 +142,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_GLUI;HAVE_LAKKA</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_MINIZ;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_WINXINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_GLUI</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\deps\rzlib;$(MSBuildProjectDirectory)\..\..\libretro-sdk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<CompileAs>CompileAsCpp</CompileAs>
@ -193,4 +193,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

1
qb/config.params.sh
View File

@ -1,7 +1,6 @@
HAVE_RGUI=yes # Disable RGUI
HAVE_GLUI=no # Enable GLUI menu
HAVE_XMB=no # Enable XMB menu
HAVE_LAKKA=no # Enable Lakka menu
HAVE_DYNAMIC=yes # Disable dynamic loading of libretro library
HAVE_SDL=auto # SDL support
HAVE_SDL2=auto # SDL2 support (disables SDL 1.x)

2
settings.c
View File

@ -276,8 +276,6 @@ const char *config_get_default_menu(void)
return "rmenu";
case MENU_RMENU_XUI:
return "rmenu_xui";
case MENU_LAKKA:
return "lakka";
case MENU_GLUI:
return "glui";
case MENU_IOS: