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

(Grifin) Move griffin to root (to indicate it's no longer console-specific

This commit is contained in:
twinaphex 2013-03-18 05:46:19 +01:00
parent 2dc3adcde3
commit 15215c47f1
13 changed files with 127 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.ngc
View File

@ -44,7 +44,7 @@ ifeq ($(BIG_STACK), 1)
endif endif
LIBS := -lfat $(WHOLE_START) -lretro_ngc $(WHOLE_END) -logc LIBS := -lfat $(WHOLE_START) -lretro_ngc $(WHOLE_END) -logc
OBJ = console/griffin/griffin.o OBJ = griffin/griffin.o
ifeq ($(PERF_TEST), 1) ifeq ($(PERF_TEST), 1)
CFLAGS += -DPERF_TEST CFLAGS += -DPERF_TEST

2
Makefile.ps3
View File

@ -64,7 +64,7 @@ PYTHON2 = python2.exe
GIT = git.exe GIT = git.exe
endif endif
PPU_SRCS = console/griffin/griffin.c PPU_SRCS = griffin/griffin.c
ifeq ($(PERF_TEST), 1) ifeq ($(PERF_TEST), 1)
DEFINES += -DPERF_TEST DEFINES += -DPERF_TEST

2
Makefile.psl1ght
View File

@ -79,7 +79,7 @@ endif
MAKE_FSELF_NPDRM = $(CELL_SDK)/host-win32/bin/make_fself_npdrm.exe MAKE_FSELF_NPDRM = $(CELL_SDK)/host-win32/bin/make_fself_npdrm.exe
MAKE_PACKAGE_NPDRM = $(CELL_SDK)/host-win32/bin/make_package_npdrm.exe MAKE_PACKAGE_NPDRM = $(CELL_SDK)/host-win32/bin/make_package_npdrm.exe
OBJ = console/griffin/griffin.o OBJ = griffin/griffin.o
ifeq ($(HAVE_LOGGER), 1) ifeq ($(HAVE_LOGGER), 1)
CFLAGS += -DHAVE_LOGGER CFLAGS += -DHAVE_LOGGER

2
Makefile.psp1
View File

@ -23,7 +23,7 @@ LIBS = -lretro_psp1 -lstdc++ -lpspgu -lpspgum -lm
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = RetroArch PSP1 PSP_EBOOT_TITLE = RetroArch PSP1
PSP_OBJECTS = console/griffin/griffin.o PSP_OBJECTS = griffin/griffin.o
OBJS = $(PSP_OBJECTS) OBJS = $(PSP_OBJECTS)

2
Makefile.wii
View File

@ -47,7 +47,7 @@ endif
LIBS := -lfat $(WHOLE_START) -lretro_wii $(WHOLE_END) -logc $(LDFLAGS_WIIUSE) -lbte LIBS := -lfat $(WHOLE_START) -lretro_wii $(WHOLE_END) -logc $(LDFLAGS_WIIUSE) -lbte
APP_BOOTER_DIR = wii/app_booter APP_BOOTER_DIR = wii/app_booter
OBJ = console/griffin/griffin.o $(APP_BOOTER_DIR)/app_booter.binobj OBJ = griffin/griffin.o $(APP_BOOTER_DIR)/app_booter.binobj
ifeq ($(PERF_TEST), 1) ifeq ($(PERF_TEST), 1)
CFLAGS += -DPERF_TEST CFLAGS += -DPERF_TEST

2
Makefile.xenon
View File

@ -13,7 +13,7 @@ PPU_TARGET_ADJUSTED := retroarch-libxenon.elf32
LDDIRS = -L. -L$(DEVKITXENON)/usr/lib -L$(DEVKITXENON)/xenon/lib/32 LDDIRS = -L. -L$(DEVKITXENON)/usr/lib -L$(DEVKITXENON)/xenon/lib/32
INCDIRS = -I. -I$(DEVKITXENON)/usr/include INCDIRS = -I. -I$(DEVKITXENON)/usr/include
OBJ = console/griffin/griffin.o OBJ = griffin/griffin.o
LIBS = -lretro_xenon360 -lxenon -lm -lc LIBS = -lretro_xenon360 -lxenon -lm -lc
DEFINES = -std=gnu99 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -DRARCH_CONSOLE -DHAVE_THREADS -DHAVE_GETOPT_LONG=1 -DHAVE_GRIFFIN DEFINES = -std=gnu99 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -DRARCH_CONSOLE -DHAVE_THREADS -DHAVE_GETOPT_LONG=1 -DHAVE_GRIFFIN

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

@ -40,7 +40,7 @@ endif
LOCAL_MODULE := retroarch-activity LOCAL_MODULE := retroarch-activity
RARCH_PATH := ../../.. RARCH_PATH := ../../..
LOCAL_SRC_FILES += $(RARCH_PATH)/console/griffin/griffin.c LOCAL_SRC_FILES += $(RARCH_PATH)/griffin/griffin.c
ifeq ($(HAVE_LOGGER), 1) ifeq ($(HAVE_LOGGER), 1)
LOCAL_CFLAGS += -DHAVE_LOGGER LOCAL_CFLAGS += -DHAVE_LOGGER

2
gfx/gl_common.h
View File

@ -61,7 +61,7 @@
#if defined(ANDROID) && defined(HAVE_GRIFFIN) #if defined(ANDROID) && defined(HAVE_GRIFFIN)
#include "../console/griffin/hook_context.h" #include "../griffin/hook_context.h"
#else #else
#define gl_shader_use_func(vid, num) gl_shader_use(vid, num) #define gl_shader_use_func(vid, num) gl_shader_use(vid, num)
#define gl_shader_num_func(vid) gl_shader_num(vid) #define gl_shader_num_func(vid) gl_shader_num(vid)

236
console/griffin/griffin.c → griffin/griffin.c
View File

@ -15,17 +15,7 @@
*/ */
#if defined(_XBOX) #if defined(_XBOX)
#include "../../msvc/msvc_compat.h" #include "../msvc/msvc_compat.h"
#endif
/*============================================================
LOGGERS
============================================================ */
#if defined(HAVE_LOGGER) && defined(__PSL1GHT__)
#include "../logger/psl1ght_logger.c"
#elif defined(HAVE_LOGGER) && !defined(ANDROID)
#include "../logger/logger.c"
#endif #endif
/*============================================================ /*============================================================
@ -33,14 +23,20 @@ CONSOLE EXTENSIONS
============================================================ */ ============================================================ */
#ifdef RARCH_CONSOLE #ifdef RARCH_CONSOLE
#if defined(HAVE_LOGGER) && defined(__PSL1GHT__)
#include "../console/logger/psl1ght_logger.c"
#elif defined(HAVE_LOGGER) && !defined(ANDROID)
#include "../console/logger/logger.c"
#endif
#ifdef HW_DOL #ifdef HW_DOL
#include "../../ngc/ssaram.c" #include "../ngc/ssaram.c"
#endif #endif
#endif #endif
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
#include "../../file_extract.c" #include "../file_extract.c"
#endif #endif
/*============================================================ /*============================================================
@ -48,11 +44,11 @@ RLAUNCH
============================================================ */ ============================================================ */
#ifdef HAVE_RLAUNCH #ifdef HAVE_RLAUNCH
#include "../../tools/retrolaunch/rl_fnmatch.c" #include "../tools/retrolaunch/rl_fnmatch.c"
#include "../../tools/retrolaunch/sha1.c" #include "../tools/retrolaunch/sha1.c"
#include "../../tools/retrolaunch/cd_detect.c" #include "../tools/retrolaunch/cd_detect.c"
#include "../../tools/retrolaunch/parser.c" #include "../tools/retrolaunch/parser.c"
#include "../../tools/retrolaunch/main.c" #include "../tools/retrolaunch/main.c"
#endif #endif
/*============================================================ /*============================================================
@ -60,15 +56,15 @@ PERFORMANCE
============================================================ */ ============================================================ */
#ifdef ANDROID #ifdef ANDROID
#include "../../android/native/jni/cpufeatures.c" #include "../android/native/jni/cpufeatures.c"
#endif #endif
#include "../../performance.c" #include "../performance.c"
/*============================================================ /*============================================================
COMPATIBILITY COMPATIBILITY
============================================================ */ ============================================================ */
#include "../../compat/compat.c" #include "../compat/compat.c"
/*============================================================ /*============================================================
CONFIG FILE CONFIG FILE
@ -79,29 +75,29 @@ CONFIG FILE
#undef strcasecmp #undef strcasecmp
#endif #endif
#include "../../conf/config_file.c" #include "../conf/config_file.c"
/*============================================================ /*============================================================
CHEATS CHEATS
============================================================ */ ============================================================ */
#include "../../cheats.c" #include "../cheats.c"
#include "../../hash.c" #include "../hash.c"
/*============================================================ /*============================================================
VIDEO CONTEXT VIDEO CONTEXT
============================================================ */ ============================================================ */
#ifdef HAVE_VID_CONTEXT #ifdef HAVE_VID_CONTEXT
#include "../../gfx/gfx_context.c" #include "../gfx/gfx_context.c"
#if defined(__CELLOS_LV2__) #if defined(__CELLOS_LV2__)
#include "../../gfx/context/ps3_ctx.c" #include "../gfx/context/ps3_ctx.c"
#elif defined(_XBOX) #elif defined(_XBOX)
#include "../../gfx/context/xdk_ctx.c" #include "../gfx/context/xdk_ctx.c"
#elif defined(ANDROID) #elif defined(ANDROID)
#include "../../gfx/context/androidegl_ctx.c" #include "../gfx/context/androidegl_ctx.c"
#elif defined(__BLACKBERRY_QNX__) #elif defined(__BLACKBERRY_QNX__)
#include "../../gfx/context/bbqnx_ctx.c" #include "../gfx/context/bbqnx_ctx.c"
#endif #endif
#endif #endif
@ -111,15 +107,15 @@ VIDEO SHADERS
============================================================ */ ============================================================ */
#ifdef HAVE_CG #ifdef HAVE_CG
#include "../../gfx/shader_cg.c" #include "../gfx/shader_cg.c"
#endif #endif
#ifdef HAVE_HLSL #ifdef HAVE_HLSL
#include "../../gfx/shader_hlsl.c" #include "../gfx/shader_hlsl.c"
#endif #endif
#ifdef HAVE_GLSL #ifdef HAVE_GLSL
#include "../../gfx/shader_glsl.c" #include "../gfx/shader_glsl.c"
#endif #endif
/*============================================================ /*============================================================
@ -127,12 +123,12 @@ VIDEO IMAGE
============================================================ */ ============================================================ */
#if defined(__CELLOS_LV2__) #if defined(__CELLOS_LV2__)
#include "../../ps3/image.c" #include "../ps3/image.c"
#elif defined(_XBOX1) #elif defined(_XBOX1)
#include "../../xdk/image.c" #include "../xdk/image.c"
#elif defined(ANDROID) || defined(__BLACKBERRY_QNX__) #elif defined(ANDROID) || defined(__BLACKBERRY_QNX__)
#include "../../gfx/image.c" #include "../gfx/image.c"
#include "../../gfx/rpng/rpng.c" #include "../gfx/rpng/rpng.c"
#endif #endif
/*============================================================ /*============================================================
@ -140,44 +136,44 @@ VIDEO DRIVER
============================================================ */ ============================================================ */
#if defined(HAVE_OPENGL) #if defined(HAVE_OPENGL)
#include "../../gfx/math/matrix.c" #include "../gfx/math/matrix.c"
#elif defined(GEKKO) #elif defined(GEKKO)
#ifdef HW_RVL #ifdef HW_RVL
#include "../../wii/vi_encoder.c" #include "../wii/vi_encoder.c"
#include "../../wii/mem2_manager.c" #include "../wii/mem2_manager.c"
#endif #endif
#endif #endif
#ifdef HAVE_DYLIB #ifdef HAVE_DYLIB
#include "../../gfx/ext_gfx.c" #include "../gfx/ext_gfx.c"
#endif #endif
#include "../../gfx/gfx_common.c" #include "../gfx/gfx_common.c"
#ifdef _XBOX #ifdef _XBOX
#include "../../xdk/xdk_resources.cpp" #include "../xdk/xdk_resources.cpp"
#endif #endif
#ifdef HAVE_OPENGL #ifdef HAVE_OPENGL
#include "../../gfx/gl.c" #include "../gfx/gl.c"
#endif #endif
#ifdef _XBOX #ifdef _XBOX
#include "../../xdk/xdk_d3d.cpp" #include "../xdk/xdk_d3d.cpp"
#endif #endif
#if defined(GEKKO) #if defined(GEKKO)
#include "../../gx/gx_video.c" #include "../gx/gx_video.c"
#elif defined(SN_TARGET_PSP2) #elif defined(SN_TARGET_PSP2)
#include "../../vita/vita_video.c" #include "../vita/vita_video.c"
//#elif defined(PSP) //#elif defined(PSP)
//#include "../../psp1/psp1_video.c" //#include "../psp1/psp1_video.c"
#elif defined(XENON) #elif defined(XENON)
#include "../../xenon/xenon360_video.c" #include "../xenon/xenon360_video.c"
#endif #endif
#if defined(HAVE_NULLVIDEO) #if defined(HAVE_NULLVIDEO)
#include "../../gfx/null.c" #include "../gfx/null.c"
#endif #endif
/*============================================================ /*============================================================
@ -191,30 +187,30 @@ FONTS
#if defined(HAVE_OPENGL) || defined(HAVE_D3D8) || defined(HAVE_D3D9) #if defined(HAVE_OPENGL) || defined(HAVE_D3D8) || defined(HAVE_D3D9)
#if defined(HAVE_FREETYPE) #if defined(HAVE_FREETYPE)
#include "../../gfx/fonts/freetype.c" #include "../gfx/fonts/freetype.c"
#endif #endif
#if !defined(DONT_HAVE_BITMAPFONTS) #if !defined(DONT_HAVE_BITMAPFONTS)
#include "../../gfx/fonts/fonts.c" #include "../gfx/fonts/fonts.c"
#include "../../gfx/fonts/bitmapfont.c" #include "../gfx/fonts/bitmapfont.c"
#endif #endif
#ifdef HAVE_OPENGL #ifdef HAVE_OPENGL
#include "../../gfx/fonts/gl_font.c" #include "../gfx/fonts/gl_font.c"
#endif #endif
#ifdef _XBOX #ifdef _XBOX
#include "../../gfx/fonts/d3d_font.c" #include "../gfx/fonts/d3d_font.c"
#endif #endif
#if defined(HAVE_LIBDBGFONT) #if defined(HAVE_LIBDBGFONT)
#include "../../gfx/fonts/ps_libdbgfont.c" #include "../gfx/fonts/ps_libdbgfont.c"
#elif defined(HAVE_OPENGL) #elif defined(HAVE_OPENGL)
#include "../../gfx/fonts/gl_raster_font.c" #include "../gfx/fonts/gl_raster_font.c"
#elif defined(_XBOX1) #elif defined(_XBOX1)
#include "../../gfx/fonts/xdk1_xfonts.c" #include "../gfx/fonts/xdk1_xfonts.c"
#elif defined(_XBOX360) #elif defined(_XBOX360)
#include "../../gfx/fonts/xdk360_fonts.cpp" #include "../gfx/fonts/xdk360_fonts.cpp"
#endif #endif
#endif #endif
@ -223,30 +219,30 @@ FONTS
INPUT INPUT
============================================================ */ ============================================================ */
#ifndef RARCH_CONSOLE #ifndef RARCH_CONSOLE
#include "../../input/input_common.c" #include "../input/input_common.c"
#endif #endif
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
#include "../../input/overlay.c" #include "../input/overlay.c"
#endif #endif
#if defined(__CELLOS_LV2__) #if defined(__CELLOS_LV2__)
#include "../../ps3/ps3_input.c" #include "../ps3/ps3_input.c"
#elif defined(SN_TARGET_PSP2) || defined(PSP) #elif defined(SN_TARGET_PSP2) || defined(PSP)
#include "../../psp/psp_input.c" #include "../psp/psp_input.c"
#elif defined(GEKKO) #elif defined(GEKKO)
#include "../../gx/gx_input.c" #include "../gx/gx_input.c"
#elif defined(_XBOX) #elif defined(_XBOX)
#include "../../xdk/xdk_xinput_input.c" #include "../xdk/xdk_xinput_input.c"
#elif defined(XENON) #elif defined(XENON)
#include "../../xenon/xenon360_input.c" #include "../xenon/xenon360_input.c"
#elif defined(ANDROID) #elif defined(ANDROID)
#include "../../android/native/jni/input_autodetect.c" #include "../android/native/jni/input_autodetect.c"
#include "../../android/native/jni/input_android.c" #include "../android/native/jni/input_android.c"
#endif #endif
#if defined(HAVE_NULLINPUT) #if defined(HAVE_NULLINPUT)
#include "../../input/null.c" #include "../input/null.c"
#endif #endif
/*============================================================ /*============================================================
@ -257,151 +253,151 @@ STATE TRACKER
#endif #endif
#ifndef DONT_HAVE_STATE_TRACKER #ifndef DONT_HAVE_STATE_TRACKER
#include "../../gfx/state_tracker.c" #include "../gfx/state_tracker.c"
#endif #endif
/*============================================================ /*============================================================
FIFO BUFFER FIFO BUFFER
============================================================ */ ============================================================ */
#include "../../fifo_buffer.c" #include "../fifo_buffer.c"
/*============================================================ /*============================================================
AUDIO RESAMPLER AUDIO RESAMPLER
============================================================ */ ============================================================ */
#include "../../audio/resampler.c" #include "../audio/resampler.c"
#ifdef HAVE_SINC #ifdef HAVE_SINC
#include "../../audio/sinc.c" #include "../audio/sinc.c"
#endif #endif
#include "../../audio/hermite.c" #include "../audio/hermite.c"
/*============================================================ /*============================================================
RSOUND RSOUND
============================================================ */ ============================================================ */
#ifdef HAVE_RSOUND #ifdef HAVE_RSOUND
#include "../../deps/librsound/librsound.c" #include "../deps/librsound/librsound.c"
#include "../../audio/rsound.c" #include "../audio/rsound.c"
#endif #endif
/*============================================================ /*============================================================
AUDIO UTILS AUDIO UTILS
============================================================ */ ============================================================ */
#include "../../audio/utils.c" #include "../audio/utils.c"
/*============================================================ /*============================================================
AUDIO AUDIO
============================================================ */ ============================================================ */
#if defined(__CELLOS_LV2__) #if defined(__CELLOS_LV2__)
#include "../../ps3/ps3_audio.c" #include "../ps3/ps3_audio.c"
#elif defined(XENON) #elif defined(XENON)
#include "../../xenon/xenon360_audio.c" #include "../xenon/xenon360_audio.c"
#elif defined(GEKKO) #elif defined(GEKKO)
#include "../../gx/gx_audio.c" #include "../gx/gx_audio.c"
#endif #endif
#ifdef HAVE_XAUDIO #ifdef HAVE_XAUDIO
#include "../../audio/xaudio.c" #include "../audio/xaudio.c"
#include "../../audio/xaudio-c/xaudio-c.cpp" #include "../audio/xaudio-c/xaudio-c.cpp"
#endif #endif
#ifdef HAVE_DSOUND #ifdef HAVE_DSOUND
#include "../../audio/dsound.c" #include "../audio/dsound.c"
#endif #endif
#ifdef HAVE_SL #ifdef HAVE_SL
#include "../../audio/opensl.c" #include "../audio/opensl.c"
#endif #endif
#ifdef HAVE_AL #ifdef HAVE_AL
#include "../../audio/openal.c" #include "../audio/openal.c"
#endif #endif
#if defined(HAVE_NULLAUDIO) #if defined(HAVE_NULLAUDIO)
#include "../../audio/null.c" #include "../audio/null.c"
#endif #endif
#ifdef HAVE_DYLIB #ifdef HAVE_DYLIB
#include "../../audio/ext_audio.c" #include "../audio/ext_audio.c"
#endif #endif
/*============================================================ /*============================================================
DRIVERS DRIVERS
============================================================ */ ============================================================ */
#include "../../driver.c" #include "../driver.c"
/*============================================================ /*============================================================
SCALERS SCALERS
============================================================ */ ============================================================ */
#include "../../gfx/scaler/filter.c" #include "../gfx/scaler/filter.c"
#include "../../gfx/scaler/pixconv.c" #include "../gfx/scaler/pixconv.c"
#include "../../gfx/scaler/scaler.c" #include "../gfx/scaler/scaler.c"
#include "../../gfx/scaler/scaler_int.c" #include "../gfx/scaler/scaler_int.c"
/*============================================================ /*============================================================
DYNAMIC DYNAMIC
============================================================ */ ============================================================ */
#include "../../dynamic.c" #include "../dynamic.c"
/*============================================================ /*============================================================
FILE FILE
============================================================ */ ============================================================ */
#ifdef HAVE_FILEBROWSER #ifdef HAVE_FILEBROWSER
#include "../../frontend/menu/utils/file_browser.c" #include "../frontend/menu/utils/file_browser.c"
#endif #endif
#include "../../file.c" #include "../file.c"
#include "../../file_path.c" #include "../file_path.c"
/*============================================================ /*============================================================
MESSAGE MESSAGE
============================================================ */ ============================================================ */
#include "../../message.c" #include "../message.c"
/*============================================================ /*============================================================
PATCH PATCH
============================================================ */ ============================================================ */
#include "../../patch.c" #include "../patch.c"
/*============================================================ /*============================================================
SETTINGS SETTINGS
============================================================ */ ============================================================ */
#include "../../settings.c" #include "../settings.c"
/*============================================================ /*============================================================
REWIND REWIND
============================================================ */ ============================================================ */
#include "../../rewind.c" #include "../rewind.c"
/*============================================================ /*============================================================
MAIN MAIN
============================================================ */ ============================================================ */
#if defined(XENON) #if defined(XENON)
#include "../../frontend/frontend_xenon.c" #include "../frontend/frontend_xenon.c"
#elif defined(RARCH_CONSOLE) || defined(PSP) #elif defined(RARCH_CONSOLE) || defined(PSP)
#include "../../frontend/frontend_console.c" #include "../frontend/frontend_console.c"
#elif defined(__BLACKBERRY_QNX__) #elif defined(__BLACKBERRY_QNX__)
#include "../../frontend/frontend_bbqnx.c" #include "../frontend/frontend_bbqnx.c"
#elif defined(ANDROID) #elif defined(ANDROID)
#include "../../frontend/frontend_android.c" #include "../frontend/frontend_android.c"
#endif #endif
#ifndef ANDROID #ifndef ANDROID
#include "../../frontend/frontend.c" #include "../frontend/frontend.c"
#endif #endif
/*============================================================ /*============================================================
RETROARCH RETROARCH
============================================================ */ ============================================================ */
#include "../../retroarch.c" #include "../retroarch.c"
/*============================================================ /*============================================================
THREAD THREAD
============================================================ */ ============================================================ */
#if defined(HAVE_THREADS) && defined(XENON) #if defined(HAVE_THREADS) && defined(XENON)
#include "../../thread/xenon_sdl_threads.c" #include "../thread/xenon_sdl_threads.c"
#elif defined(HAVE_THREADS) #elif defined(HAVE_THREADS)
#include "../../thread.c" #include "../thread.c"
#include "../../gfx/thread_wrapper.c" #include "../gfx/thread_wrapper.c"
#ifndef RARCH_CONSOLE #ifndef RARCH_CONSOLE
#include "../../autosave.c" #include "../autosave.c"
#endif #endif
#endif #endif
@ -410,34 +406,34 @@ THREAD
NETPLAY NETPLAY
============================================================ */ ============================================================ */
#ifdef HAVE_NETPLAY #ifdef HAVE_NETPLAY
#include "../../netplay.c" #include "../netplay.c"
#endif #endif
/*============================================================ /*============================================================
SCREENSHOTS SCREENSHOTS
============================================================ */ ============================================================ */
#ifdef HAVE_SCREENSHOTS #ifdef HAVE_SCREENSHOTS
#include "../../screenshot.c" #include "../screenshot.c"
#endif #endif
/*============================================================ /*============================================================
MENU MENU
============================================================ */ ============================================================ */
#if defined(HAVE_RMENU_GUI) #if defined(HAVE_RMENU_GUI)
#include "../../frontend/menu/utils/menu_stack.c" #include "../frontend/menu/utils/menu_stack.c"
#include "../../frontend/menu/rmenu.c" #include "../frontend/menu/rmenu.c"
#endif #endif
#ifdef HAVE_RGUI #ifdef HAVE_RGUI
#include "../../frontend/menu/utils/file_list.c" #include "../frontend/menu/utils/file_list.c"
#include "../../frontend/menu/rgui.c" #include "../frontend/menu/rgui.c"
#endif #endif
#if defined(_XBOX360) #if defined(_XBOX360)
#include "../../frontend/menu/rmenu_xui.cpp" #include "../frontend/menu/rmenu_xui.cpp"
#endif #endif
#include "../../frontend/menu/menu_settings.c" #include "../frontend/menu/menu_settings.c"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -447,15 +443,15 @@ extern "C" {
RZLIB RZLIB
============================================================ */ ============================================================ */
#ifdef WANT_MINIZ #ifdef WANT_MINIZ
#include "../../deps/miniz/miniz.c" #include "../deps/miniz/miniz.c"
#include "../../deps/minizip/unzip.c" #include "../deps/minizip/unzip.c"
#endif #endif
/*============================================================ /*============================================================
XML XML
============================================================ */ ============================================================ */
#define RXML_LIBXML2_COMPAT #define RXML_LIBXML2_COMPAT
#include "../../compat/rxml/rxml.c" #include "../compat/rxml/rxml.c"
#ifdef __cplusplus #ifdef __cplusplus
} }

0
console/griffin/hook_context.h → griffin/hook_context.h
View File

2
msvc/RetroArch-360/RetroArch-360.vcxproj
View File

@ -348,7 +348,7 @@
</PreBuildEvent> </PreBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\console\griffin\griffin.c" /> <ClCompile Include="..\..\griffin\griffin.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\360\menu.h" /> <ClInclude Include="..\..\360\menu.h" />

2
msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj
View File

@ -291,7 +291,7 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File <File
RelativePath="..\..\console\griffin\griffin.c"> RelativePath="..\..\griffin\griffin.c">
<FileConfiguration <FileConfiguration
Name="Debug|Xbox"> Name="Debug|Xbox">
<Tool <Tool

2
playbook/.project
View File

@ -77,7 +77,7 @@
<link> <link>
<name>src/griffin.c</name> <name>src/griffin.c</name>
<type>1</type> <type>1</type>
<locationURI>PARENT-1-PROJECT_LOC/console/griffin/griffin.c</locationURI> <locationURI>PARENT-1-PROJECT_LOC/griffin/griffin.c</locationURI>
</link> </link>
<link> <link>
<name>src/sinc_neon.S</name> <name>src/sinc_neon.S</name>