(Xbox 1) Build fixes

deps/miniz/miniz.c

@@ -296,10 +296,12 @@ typedef struct
   tinfl_status m_last_status;
 } inflate_state;
 
+#ifndef _XBOX1
 int inflateInit2_(z_streamp pStream, int window_bits, char *version, int stream_size)
 {
    return mz_inflateInit2(pStream, window_bits);
 }
+#endif
 
 int mz_inflateInit2(mz_streamp pStream, int window_bits)
 {
@@ -335,10 +337,12 @@ int mz_inflateInit(mz_streamp pStream)
    return mz_inflateInit2(pStream, MZ_DEFAULT_WINDOW_BITS);
 }
 
+#ifndef _XBOX1
 int inflate(z_streamp pStream, int flush)
 {
    return mz_inflate(pStream, flush);
 }
+#endif
 
 int mz_inflate(mz_streamp pStream, int flush)
 {
@@ -431,10 +435,12 @@ int mz_inflate(mz_streamp pStream, int flush)
   return ((status == TINFL_STATUS_DONE) && (!pState->m_dict_avail)) ? MZ_STREAM_END : MZ_OK;
 }
 
+#ifndef _XBOX1
 int inflateReset(z_streamp pStream)
 {
    return mz_inflateReset(pStream);
 }
+#endif
 
 int mz_inflateReset(mz_streamp pStream)
 {
@@ -442,10 +448,12 @@ int mz_inflateReset(mz_streamp pStream)
    return mz_inflateInit(pStream);
 }
 
+#ifndef _XBOX1
 int inflateEnd(z_streamp pStream)
 {
    return mz_inflateEnd(pStream);
 }
+#endif
 
 int mz_inflateEnd(mz_streamp pStream)
 {

frontend/menu/menu_settings.c

@@ -142,7 +142,7 @@ static enum rarch_shader_type shader_manager_get_type(const struct gfx_shader *s
    return type;
 }
 
-static int shader_manager_toggle_setting(void *data, unsigned setting, rgui_action_t action)
+static int shader_manager_toggle_setting(void *data, unsigned setting, unsigned action)
 {
    unsigned dist_shader, dist_filter, dist_scale;
    rgui_handle_t *rgui = (rgui_handle_t*)data;
@@ -247,7 +247,7 @@ static int shader_manager_toggle_setting(void *data, unsigned setting, rgui_acti
 }
 #endif
 
-static int menu_core_setting_toggle(unsigned setting, rgui_action_t action)
+static int menu_core_setting_toggle(unsigned setting, unsigned action)
 {
    unsigned index = setting - RGUI_SETTINGS_CORE_OPTION_START;
    switch (action)
@@ -272,7 +272,7 @@ static int menu_core_setting_toggle(unsigned setting, rgui_action_t action)
    return 0;
 }
 
-int menu_settings_toggle_setting(void *data, unsigned setting, rgui_action_t action, unsigned menu_type)
+int menu_settings_toggle_setting(void *data, unsigned setting, unsigned action, unsigned menu_type)
 {
    rgui_handle_t *rgui = (rgui_handle_t*)data;
 #ifdef HAVE_SHADER_MANAGER

frontend/menu/rmenu_disp.c

@@ -46,6 +46,14 @@
 #endif
 
 #if defined(_XBOX1)
+#define ENTRIES_HEIGHT 15
+#define POSITION_EDGE_MAX (640)
+#define POSITION_EDGE_MIN 0
+#define POSITION_EDGE_CENTER (320)
+#define POSITION_OFFSET 60
+#define POSITION_RENDER_OFFSET 60
+#define TERM_WIDTH 45
+#define FONT_SIZE_NORMAL 21
 #elif defined(__CELLOS_LV2__)
 #define ENTRIES_HEIGHT 25
 #define POSITION_MIDDLE 0.50f

gfx/context/xdk_ctx.c

@@ -220,10 +220,6 @@ static void gfx_ctx_xdk_destroy(void)
 {
    xdk_d3d_video_t * d3d = (xdk_d3d_video_t*)driver.video_data;
 
-#ifdef HAVE_MENU
-   texture_image_free(&d3d->rgui_texture);
-#endif
-
    if (d3d->d3d_render_device)
    {
       d3d->d3d_render_device->Release();

msvc/msvc-71/logger_override.h

@@ -17,6 +17,9 @@
 #ifndef __MSVC_71_H
 #define __MSVC_71_H
 
+#ifdef _XBOX1
+#include <xtl.h>
+#endif
 #include <stdarg.h>
 
 #include "../msvc_compat.h"

xdk/xdk_xinput_input.c

@@ -286,6 +286,7 @@ static bool xdk_input_set_rumble(void *data, unsigned port, enum retro_rumble_ef
       rumble_state.wRightMotorSpeed = strength;
    val = XInputSetState(port, &rumble_state) == ERROR_SUCCESS;
 #elif defined(_XBOX1)
+#if 0
    XINPUT_FEEDBACK rumble_state;
 
    if (effect == RETRO_RUMBLE_STRONG)
@@ -293,6 +294,7 @@ static bool xdk_input_set_rumble(void *data, unsigned port, enum retro_rumble_ef
    else if (effect == RETRO_RUMBLE_WEAK)
       rumble_state.Rumble.wRightMotorSpeed = strength;
    val = XInputSetState(xdk->gamepads[port], &rumble_state) == ERROR_SUCCESS;
+#endif
 #endif
    return val;
 }