Fixed building with Xcode 10.0
authorSam Lantinga <slouken@libsdl.org>
Fri, 28 Sep 2018 01:18:54 -0700
changeset 12247f1cfd508f012
parent 12246 87fecd66352a
child 12248 a65c2e471570
Fixed building with Xcode 10.0
Xcode/SDL/SDL.xcodeproj/project.pbxproj
src/joystick/hidapi/SDL_hidapi_xbox360.c
     1.1 --- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj	Fri Sep 28 11:04:55 2018 +0300
     1.2 +++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj	Fri Sep 28 01:18:54 2018 -0700
     1.3 @@ -2614,7 +2614,7 @@
     1.4  		0867D690FE84028FC02AAC07 /* Project object */ = {
     1.5  			isa = PBXProject;
     1.6  			attributes = {
     1.7 -				LastUpgradeCheck = 0900;
     1.8 +				LastUpgradeCheck = 1000;
     1.9  			};
    1.10  			buildConfigurationList = 0073178E0858DB0500B2BC32 /* Build configuration list for PBXProject "SDL" */;
    1.11  			compatibilityVersion = "Xcode 3.2";
    1.12 @@ -3112,11 +3112,13 @@
    1.13  				CLANG_WARN_BOOL_CONVERSION = YES;
    1.14  				CLANG_WARN_COMMA = YES;
    1.15  				CLANG_WARN_CONSTANT_CONVERSION = YES;
    1.16 +				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
    1.17  				CLANG_WARN_EMPTY_BODY = YES;
    1.18  				CLANG_WARN_ENUM_CONVERSION = YES;
    1.19  				CLANG_WARN_INFINITE_RECURSION = YES;
    1.20  				CLANG_WARN_INT_CONVERSION = YES;
    1.21  				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
    1.22 +				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
    1.23  				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
    1.24  				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
    1.25  				CLANG_WARN_STRICT_PROTOTYPES = YES;
    1.26 @@ -3153,7 +3155,6 @@
    1.27  		00CFA622106A567900758660 /* Release */ = {
    1.28  			isa = XCBuildConfiguration;
    1.29  			buildSettings = {
    1.30 -				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
    1.31  				CLANG_LINK_OBJC_RUNTIME = NO;
    1.32  				COMBINE_HIDPI_IMAGES = YES;
    1.33  				DYLIB_COMPATIBILITY_VERSION = 1.0.0;
    1.34 @@ -3206,11 +3207,13 @@
    1.35  				CLANG_WARN_BOOL_CONVERSION = YES;
    1.36  				CLANG_WARN_COMMA = YES;
    1.37  				CLANG_WARN_CONSTANT_CONVERSION = YES;
    1.38 +				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
    1.39  				CLANG_WARN_EMPTY_BODY = YES;
    1.40  				CLANG_WARN_ENUM_CONVERSION = YES;
    1.41  				CLANG_WARN_INFINITE_RECURSION = YES;
    1.42  				CLANG_WARN_INT_CONVERSION = YES;
    1.43  				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
    1.44 +				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
    1.45  				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
    1.46  				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
    1.47  				CLANG_WARN_STRICT_PROTOTYPES = YES;
    1.48 @@ -3247,7 +3250,6 @@
    1.49  		00CFA628106A568900758660 /* Debug */ = {
    1.50  			isa = XCBuildConfiguration;
    1.51  			buildSettings = {
    1.52 -				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
    1.53  				CLANG_LINK_OBJC_RUNTIME = NO;
    1.54  				COMBINE_HIDPI_IMAGES = YES;
    1.55  				DYLIB_COMPATIBILITY_VERSION = 1.0.0;
     2.1 --- a/src/joystick/hidapi/SDL_hidapi_xbox360.c	Fri Sep 28 11:04:55 2018 +0300
     2.2 +++ b/src/joystick/hidapi/SDL_hidapi_xbox360.c	Fri Sep 28 01:18:54 2018 -0700
     2.3 @@ -752,7 +752,9 @@
     2.4  static void
     2.5  HIDAPI_DriverXbox360_Quit(SDL_Joystick *joystick, hid_device *dev, void *context)
     2.6  {
     2.7 +#if defined(SDL_JOYSTICK_HIDAPI_WINDOWS_XINPUT) || defined(SDL_JOYSTICK_HIDAPI_WINDOWS_GAMING_INPUT)
     2.8      SDL_DriverXbox360_Context *ctx = (SDL_DriverXbox360_Context *)context;
     2.9 +#endif
    2.10  
    2.11  #ifdef SDL_JOYSTICK_HIDAPI_WINDOWS_XINPUT
    2.12      if (ctx->xinput_enabled) {