From fb579c24bef35dc70748e5843a6b946d8d56799a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 14 Apr 2014 20:50:10 +0200 Subject: [PATCH] (iOS) Fix some warnings in apple_gamecontroller.m --- apple/RetroArch_iOS.xcodeproj/project.pbxproj | 4 ++-- apple/common/apple_gamecontroller.m | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apple/RetroArch_iOS.xcodeproj/project.pbxproj b/apple/RetroArch_iOS.xcodeproj/project.pbxproj index 654d0291d0..298a1f06c3 100644 --- a/apple/RetroArch_iOS.xcodeproj/project.pbxproj +++ b/apple/RetroArch_iOS.xcodeproj/project.pbxproj @@ -366,7 +366,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ../; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "-DHAVE_CAMERA", @@ -416,7 +416,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ../; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; OTHER_CFLAGS = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", diff --git a/apple/common/apple_gamecontroller.m b/apple/common/apple_gamecontroller.m index 2d5c78f5ee..a6608f4374 100644 --- a/apple/common/apple_gamecontroller.m +++ b/apple/common/apple_gamecontroller.m @@ -35,7 +35,7 @@ static void apple_gamecontroller_poll(GCController* controller) if (!controller || controller.playerIndex == MAX_PLAYERS) return; - uint32_t slot = controller.playerIndex; + uint32_t slot = (uint32_t)controller.playerIndex; g_current_input_data.pad_buttons[slot] = 0; memset(g_current_input_data.pad_axis[slot], 0, sizeof(g_current_input_data.pad_axis[0])); @@ -118,7 +118,7 @@ void apple_gamecontroller_disconnect(GCController* controller) if (controller.playerIndex == GCControllerPlayerIndexUnset) return; - apple_joypad_disconnect(controller.playerIndex); + apple_joypad_disconnect((uint32_t)(controller.playerIndex)); } void apple_gamecontroller_init(void)