From 4f27c4b56db55b8afb60c7fa7d822ca0007a4804 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 1 Jun 2014 05:35:28 +0200 Subject: [PATCH] (Salamander XDK1) Fix build --- frontend/frontend_context.h | 8 +++ frontend/platform/platform_xdk.c | 2 +- .../RetroArch-Salamander.vcproj | 65 ++++++++++--------- 3 files changed, 43 insertions(+), 32 deletions(-) diff --git a/frontend/frontend_context.h b/frontend/frontend_context.h index 2f6a713e21..62b5e5d1c5 100644 --- a/frontend/frontend_context.h +++ b/frontend/frontend_context.h @@ -25,6 +25,10 @@ #include "frontend.h" +#ifdef __cplusplus +extern "C" { +#endif + typedef struct frontend_ctx_driver { void (*environment_get)(int argc, char *argv[], void *args); @@ -58,4 +62,8 @@ extern const frontend_ctx_driver_t frontend_ctx_null; const frontend_ctx_driver_t *frontend_ctx_find_driver(const char *ident); // Finds driver with ident. Does not initialize. const frontend_ctx_driver_t *frontend_ctx_init_first(void); // Finds first suitable driver and initializes. +#ifdef __cplusplus +} +#endif + #endif diff --git a/frontend/platform/platform_xdk.c b/frontend/platform/platform_xdk.c index 12a4c771d1..3978a1039f 100644 --- a/frontend/platform/platform_xdk.c +++ b/frontend/platform/platform_xdk.c @@ -324,8 +324,8 @@ static int frontend_xdk_process_args(int argc, char *argv[], void *args) } #endif #endif -exit: #ifndef IS_SALAMANDER +exit: g_extern.verbose = original_verbose; #endif return ret; diff --git a/msvc/RetroArch-Xbox1-Salamander/RetroArch-Salamander.vcproj b/msvc/RetroArch-Xbox1-Salamander/RetroArch-Salamander.vcproj index 7478eec73c..af518bdb3d 100644 --- a/msvc/RetroArch-Xbox1-Salamander/RetroArch-Salamander.vcproj +++ b/msvc/RetroArch-Xbox1-Salamander/RetroArch-Salamander.vcproj @@ -371,6 +371,39 @@ CompileAs="2"/> + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + RelativePath="..\..\frontend\platform\platform_null.c">