diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c index fb1507b7ef..5ff68bdd0c 100644 --- a/console/griffin/griffin.c +++ b/console/griffin/griffin.c @@ -33,10 +33,6 @@ CONSOLE EXTENSIONS ============================================================ */ #ifdef RARCH_CONSOLE -#include "../rarch_console.h" - -default_paths_t default_paths; - #include "../rarch_console_rom_ext.c" #include "../rarch_console_video.c" @@ -99,7 +95,7 @@ VIDEO CONTEXT #ifdef HAVE_VID_CONTEXT #include "../../gfx/gfx_context.c" -#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__) +#if defined(__CELLOS_LV2__) #include "../../gfx/context/ps3_ctx.c" #elif defined(_XBOX) #include "../../gfx/context/xdk_ctx.c" @@ -143,19 +139,11 @@ VIDEO DRIVER #if defined(HAVE_OPENGL) #include "../../gfx/math/matrix.c" -#include "../../gfx/gl.c" #elif defined(GEKKO) #ifdef HW_RVL #include "../../wii/vi_encoder.c" #include "../../wii/mem2_manager.c" #endif -#include "../../gx/gx_video.c" -#elif defined(SN_TARGET_PSP2) -#include "../../vita/vita_video.c" -#elif defined(PSP) -#include "../../psp1/psp1_video.c" -#elif defined(XENON) -#include "../../360/xenon360_video.c" #endif #ifdef HAVE_DYLIB @@ -166,10 +154,23 @@ VIDEO DRIVER #ifdef _XBOX #include "../../xdk/xdk_resources.cpp" -#include "../../xdk/xdk_d3d.cpp" #endif +#if defined(HAVE_OPENGL) +#include "../../gfx/gl.c" +#elif defined(_XBOX) +#include "../../xdk/xdk_d3d.cpp" +#elif defined(GEKKO) +#include "../../gx/gx_video.c" +#elif defined(SN_TARGET_PSP2) +#include "../../vita/vita_video.c" +#elif defined(PSP) +#include "../../psp1/psp1_video.c" +#elif defined(XENON) +#include "../../360/xenon360_video.c" +#else #include "../../gfx/null.c" +#endif /*============================================================ FONTS @@ -244,9 +245,9 @@ INPUT #elif defined(ANDROID) #include "../../android/native/jni/input_autodetect.c" #include "../../android/native/jni/input_android.c" -#endif - +#else #include "../../input/null.c" +#endif /*============================================================ STATE TRACKER @@ -291,22 +292,18 @@ AUDIO #include "../../360/xenon360_audio.c" #elif defined(GEKKO) #include "../../gx/gx_audio.c" -#endif - -#ifdef HAVE_DSOUND +#elif defined(HAVE_DSOUND) #include "../../audio/dsound.c" +#elif defined(HAVE_SL) +#include "../../audio/opensl.c" +#else +#include "../../audio/null.c" #endif #ifdef HAVE_DYLIB #include "../../audio/ext_audio.c" #endif -#ifdef HAVE_SL -#include "../../audio/opensl.c" -#endif - -#include "../../audio/null.c" - /*============================================================ DRIVERS ============================================================ */ @@ -320,7 +317,6 @@ SCALERS #include "../../gfx/scaler/scaler.c" #include "../../gfx/scaler/scaler_int.c" - /*============================================================ DYNAMIC ============================================================ */ @@ -360,7 +356,7 @@ MAIN ============================================================ */ #if defined(XENON) #include "../../frontend/frontend_xenon.c" -#elif defined(__CELLOS_LV2__) || defined(GEKKO) || defined(_XBOX) || defined(PSP) +#elif defined(RARCH_CONSOLE) || defined(PSP) #include "../../frontend/frontend_console.c" #elif defined(ANDROID) #include "../../frontend/frontend_android.c" @@ -433,4 +429,4 @@ XML #ifdef __cplusplus } -#endif +#endif \ No newline at end of file diff --git a/driver.c b/driver.c index 31c764d497..a37a7c456b 100644 --- a/driver.c +++ b/driver.c @@ -80,7 +80,9 @@ static const audio_driver_t *audio_drivers[] = { #ifdef GEKKO &audio_gx, #endif +#ifdef HAVE_NULLAUDIO &audio_null, +#endif }; static const video_driver_t *video_drivers[] = { @@ -114,7 +116,9 @@ static const video_driver_t *video_drivers[] = { #ifdef HAVE_VG &video_vg, #endif +#ifdef HAVE_NULLVIDEO &video_null, +#endif }; static const input_driver_t *input_drivers[] = { @@ -148,7 +152,9 @@ static const input_driver_t *input_drivers[] = { #if defined(__linux__) && !defined(ANDROID) &input_linuxraw, #endif +#ifdef HAVE_NULLINPUT &input_null, +#endif }; static void find_audio_driver(void) diff --git a/frontend/frontend_console.c b/frontend/frontend_console.c index 99b566c5bb..a965dedca4 100644 --- a/frontend/frontend_console.c +++ b/frontend/frontend_console.c @@ -36,6 +36,8 @@ #undef main +default_paths_t default_paths; + #ifdef IS_SALAMANDER //We need to set libretro to the first entry in the cores diff --git a/frontend/platform/platform_gx.c b/frontend/platform/platform_gx.c index f413793620..802ce4e2b3 100644 --- a/frontend/platform/platform_gx.c +++ b/frontend/platform/platform_gx.c @@ -83,8 +83,6 @@ #ifdef IS_SALAMANDER -default_paths_t default_paths; - static void find_and_set_first_file(void) { //Last fallback - we'll need to start the first executable file diff --git a/frontend/platform/platform_ps3.c b/frontend/platform/platform_ps3.c index b2262fb1e1..b014ea5407 100644 --- a/frontend/platform/platform_ps3.c +++ b/frontend/platform/platform_ps3.c @@ -49,8 +49,6 @@ SYS_PROCESS_PARAM(1001, 0x100000) SYS_PROCESS_PARAM(1001, 0x200000) #endif -#undef main - #ifdef IS_SALAMANDER #include #include @@ -58,8 +56,6 @@ SYS_PROCESS_PARAM(1001, 0x200000) #include #include -default_paths_t default_paths; - static void find_and_set_first_file(void) { //Last fallback - we'll need to start the first executable file diff --git a/frontend/platform/platform_psp.c b/frontend/platform/platform_psp.c index 6c437b0227..c66ae55d4b 100644 --- a/frontend/platform/platform_psp.c +++ b/frontend/platform/platform_psp.c @@ -22,7 +22,6 @@ #include #include -#undef main #include "../../psp/sdk_defines.h" PSP_MODULE_INFO("RetroArch PSP", 0, 1, 1); diff --git a/frontend/platform/platform_xdk.c b/frontend/platform/platform_xdk.c index f1130876d8..ad2b5233b6 100644 --- a/frontend/platform/platform_xdk.c +++ b/frontend/platform/platform_xdk.c @@ -46,8 +46,6 @@ #ifdef IS_SALAMANDER -default_paths_t default_paths; - static void find_and_set_first_file(void) { //Last fallback - we'll need to start the first executable file