From 6c394d717cfc4630105955a15e0c4a23cc5f02a7 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 15 Nov 2013 04:26:38 +0100 Subject: [PATCH] (XDK1 Salamander) Build fix --- frontend/platform/platform_xdk.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/platform/platform_xdk.c b/frontend/platform/platform_xdk.c index 08ad28a9c7..8480a365d9 100644 --- a/frontend/platform/platform_xdk.c +++ b/frontend/platform/platform_xdk.c @@ -28,7 +28,6 @@ #include "../../conf/config_file.h" #include "../../conf/config_file_macros.h" #include "../../file.h" -#include "../../general.h" #ifdef IS_SALAMANDER char config_path[512]; @@ -128,7 +127,8 @@ static void salamander_init_settings(void) } } } - +#else +#include "../../general.h" #endif #ifdef _XBOX1 @@ -270,6 +270,7 @@ static int system_process_args(int argc, char *argv[], void *args) (void)argc; (void)argv; +#ifndef IS_SALAMANDER #if defined(_XBOX1) LAUNCH_DATA ptr; DWORD launch_type; @@ -298,6 +299,7 @@ static int system_process_args(int argc, char *argv[], void *args) delete []pLaunchData; return 1; } +#endif #endif return 0; }