From 1db8f4ab579ad2030b147450e662beb9cc74ebf1 Mon Sep 17 00:00:00 2001 From: Gabriel O'Flaherty-Chan Date: Wed, 6 Jul 2016 13:42:33 -0400 Subject: [PATCH] Fix compiler errors and bump minimum version to iOS5 --- .../xcschemes/xcschememanagement.plist | 22 +++++ .../UserInterfaceState.xcuserstate | Bin 0 -> 22100 bytes common/SDL_shim/ios/SDL_Mixer.m | 12 +-- common/idmobilelib/ios/Carousel.mm | 2 +- common/idmobilelib/ios/GameCenter.mm | 1 + common/idmobilelib/ios/InAppStore.h | 6 +- common/idmobilelib/ios/InAppStore.mm | 13 ++- .../ios/idmobilelib.xcodeproj/project.pbxproj | 16 +++- .../xcschemes/xcschememanagement.plist | 22 +++++ .../xcschemes/EmbeddedAudioSynthesis.xcscheme | 80 ++++++++++++++++++ .../xcschemes/xcschememanagement.plist | 22 +++++ .../xcschemes/xcschememanagement.plist | 22 +++++ .../xcschemes/prboom.xcscheme | 80 ++++++++++++++++++ .../xcschemes/xcschememanagement.plist | 22 +++++ .../xcschemes/tess.xcscheme | 80 ++++++++++++++++++ .../xcschemes/xcschememanagement.plist | 22 +++++ 16 files changed, 404 insertions(+), 18 deletions(-) create mode 100644 DoomClassic/code/iphone/Doom.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/xcschememanagement.plist create mode 100644 DoomClassics.xcworkspace/xcuserdata/gabrieloc.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 common/idmobilelib/ios/idmobilelib.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/xcschememanagement.plist create mode 100644 common/ios/EmbeddedAudioSynthesis/EmbeddedAudioSynthesis.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/EmbeddedAudioSynthesis.xcscheme create mode 100644 common/ios/EmbeddedAudioSynthesis/EmbeddedAudioSynthesis.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/xcschememanagement.plist create mode 100644 common/ios/doomengine.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/xcschememanagement.plist create mode 100644 common/ios/prboom/prboom.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/prboom.xcscheme create mode 100644 common/ios/prboom/prboom.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/xcschememanagement.plist create mode 100644 common/ios/tess/tess.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/tess.xcscheme create mode 100644 common/ios/tess/tess.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/DoomClassic/code/iphone/Doom.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/xcschememanagement.plist b/DoomClassic/code/iphone/Doom.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 00000000..e80c9628 --- /dev/null +++ b/DoomClassic/code/iphone/Doom.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,22 @@ + + + + + SchemeUserState + + DOOM.xcscheme_^#shared#^_ + + orderHint + 0 + + + SuppressBuildableAutocreation + + 1D6058900D05DD3D006BFB54 + + primary + + + + + diff --git a/DoomClassics.xcworkspace/xcuserdata/gabrieloc.xcuserdatad/UserInterfaceState.xcuserstate b/DoomClassics.xcworkspace/xcuserdata/gabrieloc.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000000000000000000000000000000000000..ae60caf5b96d1b45225d9caf2d8cbce5c8bde422 GIT binary patch literal 22100 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, audioBuffer->mDataByteSize, audioBuffer->mNumberChannels ); */ - AudioUnitSampleType * hardwareBufferLeft = (AudioUnitSampleType *) audioBufferLeft->mData; - AudioUnitSampleType * hardwareBufferRight = (AudioUnitSampleType *) audioBufferRight->mData; + SInt32 * hardwareBufferLeft = (SInt32 *) audioBufferLeft->mData; + SInt32 * hardwareBufferRight = (SInt32 *) audioBufferRight->mData; // EAS_Render always produces BUFFER_SIZE_IN_MONO_SAMPLES frames per call. Currently, this // is defined to 128. Let's fill up a 128 frame buffer, then do a conversion from EAS_PCM - // (which is signed 16-bit integer) to AudioUnitSampleType (which is 8.24 fixed-point with + // (which is signed 16-bit integer) to AudioUnitSampleType (which is 8.24 fixed-point with // a range of -1 to +1). // // Note that EAS renders interleaved stereo, so we actually a buffer size of diff --git a/common/idmobilelib/ios/Carousel.mm b/common/idmobilelib/ios/Carousel.mm index 6632be8f..2b142d81 100755 --- a/common/idmobilelib/ios/Carousel.mm +++ b/common/idmobilelib/ios/Carousel.mm @@ -159,7 +159,7 @@ - (void) touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event { } else { // Going the left. - percentage = fabsf( percentage ); + percentage = (CGFloat) fabs( percentage ); CGRect newMainRect = LerpRect( mainRect, prevRect , percentage ); CGRect newNextRect = LerpRect( nextRect, mainRect , percentage ); diff --git a/common/idmobilelib/ios/GameCenter.mm b/common/idmobilelib/ios/GameCenter.mm index e38b2dd8..7c65d64b 100755 --- a/common/idmobilelib/ios/GameCenter.mm +++ b/common/idmobilelib/ios/GameCenter.mm @@ -195,6 +195,7 @@ - (void)match:(GKMatch *)match player:(NSString *)playerID didChangeState:(GKPla break; case GKPlayerStateDisconnected: + case GKPlayerStateUnknown: matchHandler->playerDisconnected( NSStringToStdString( playerID ) ); break; } diff --git a/common/idmobilelib/ios/InAppStore.h b/common/idmobilelib/ios/InAppStore.h index 1e1ec3ba..c2fa6c18 100755 --- a/common/idmobilelib/ios/InAppStore.h +++ b/common/idmobilelib/ios/InAppStore.h @@ -52,6 +52,8 @@ the application can get the price information and actually initiate purchases of #include #include +@class SKProduct; + namespace idInAppStore { void Initialize( const std::vector & productIdentifiers ); @@ -70,8 +72,8 @@ namespace idInAppStore { std::string GetLocalizedPrice( const char * const productIdentifier ); - void StartPurchase( const char * const productIdentifier ); - + void StartPurchase( SKProduct * product ); + /* ======================== The application can register callbacks to be notified of events that occur relating to diff --git a/common/idmobilelib/ios/InAppStore.mm b/common/idmobilelib/ios/InAppStore.mm index 04544835..5b88d4d5 100755 --- a/common/idmobilelib/ios/InAppStore.mm +++ b/common/idmobilelib/ios/InAppStore.mm @@ -301,21 +301,20 @@ bool IsEnabled() { purchase. ======================== */ - void StartPurchase( const char * const productIdentifier ) { + void StartPurchase( SKProduct * product ) { if ( ![SKPaymentQueue canMakePayments] ) { return; } + const char * productIdentifier = [product.productIdentifier UTF8String]; + if ( !CanPurchase( productIdentifier ) ) { return; } - SetProductState( productIdentifier, PRODUCT_WAIT_FOR_PURCHASE ); - - NSString * nsProductIdentifier = [NSString stringWithCString:productIdentifier - encoding:NSUTF8StringEncoding]; - - SKPayment * payment = [SKPayment paymentWithProductIdentifier:nsProductIdentifier]; + SetProductState( product.productIdentifier, PRODUCT_WAIT_FOR_PURCHASE ); + + SKPayment * payment = [SKPayment paymentWithProduct:product]; [[SKPaymentQueue defaultQueue] addPayment:payment]; } diff --git a/common/idmobilelib/ios/idmobilelib.xcodeproj/project.pbxproj b/common/idmobilelib/ios/idmobilelib.xcodeproj/project.pbxproj index f4d0bde2..4f4da5f4 100755 --- a/common/idmobilelib/ios/idmobilelib.xcodeproj/project.pbxproj +++ b/common/idmobilelib/ios/idmobilelib.xcodeproj/project.pbxproj @@ -320,8 +320,13 @@ GCC_WARN_UNUSED_LABEL = YES; GCC_WARN_UNUSED_PARAMETER = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 3.2; + IPHONEOS_DEPLOYMENT_TARGET = 5; ONLY_ACTIVE_ARCH = NO; + OTHER_CPLUSPLUSFLAGS = ( + "$(OTHER_CFLAGS)", + "-std=c++0x\n", + "-stdlib=libc++\n", + ); SDKROOT = iphoneos; USER_HEADER_SEARCH_PATHS = ../; WARNING_CFLAGS = ( @@ -369,7 +374,12 @@ GCC_WARN_UNUSED_LABEL = YES; GCC_WARN_UNUSED_PARAMETER = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 3.2; + IPHONEOS_DEPLOYMENT_TARGET = 5; + OTHER_CPLUSPLUSFLAGS = ( + "$(OTHER_CFLAGS)", + "-std=c++0x\n", + "-stdlib=libc++\n", + ); SDKROOT = iphoneos; USER_HEADER_SEARCH_PATHS = ../; VALIDATE_PRODUCT = YES; @@ -386,6 +396,7 @@ buildSettings = { DSTROOT = /tmp/idmobilelib.dst; GCC_VERSION = ""; + OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -398,6 +409,7 @@ buildSettings = { DSTROOT = /tmp/idmobilelib.dst; GCC_VERSION = ""; + OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; diff --git a/common/idmobilelib/ios/idmobilelib.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/xcschememanagement.plist b/common/idmobilelib/ios/idmobilelib.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 00000000..46775cb4 --- /dev/null +++ b/common/idmobilelib/ios/idmobilelib.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,22 @@ + + + + + SchemeUserState + + idmobilelib.xcscheme_^#shared#^_ + + orderHint + 2 + + + SuppressBuildableAutocreation + + 3D80884614928766002D6CC3 + + primary + + + + + diff --git a/common/ios/EmbeddedAudioSynthesis/EmbeddedAudioSynthesis.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/EmbeddedAudioSynthesis.xcscheme b/common/ios/EmbeddedAudioSynthesis/EmbeddedAudioSynthesis.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/EmbeddedAudioSynthesis.xcscheme new file mode 100644 index 00000000..db4bb2d4 --- /dev/null +++ b/common/ios/EmbeddedAudioSynthesis/EmbeddedAudioSynthesis.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/EmbeddedAudioSynthesis.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/ios/EmbeddedAudioSynthesis/EmbeddedAudioSynthesis.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/xcschememanagement.plist b/common/ios/EmbeddedAudioSynthesis/EmbeddedAudioSynthesis.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 00000000..d52b83a3 --- /dev/null +++ b/common/ios/EmbeddedAudioSynthesis/EmbeddedAudioSynthesis.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,22 @@ + + + + + SchemeUserState + + EmbeddedAudioSynthesis.xcscheme + + orderHint + 4 + + + SuppressBuildableAutocreation + + 3DC1C5D514B624ED00680D02 + + primary + + + + + diff --git a/common/ios/doomengine.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/xcschememanagement.plist b/common/ios/doomengine.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 00000000..f9597de6 --- /dev/null +++ b/common/ios/doomengine.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,22 @@ + + + + + SchemeUserState + + doomengine.xcscheme_^#shared#^_ + + orderHint + 1 + + + SuppressBuildableAutocreation + + 3DE694381489AFDE0049CAA4 + + primary + + + + + diff --git a/common/ios/prboom/prboom.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/prboom.xcscheme b/common/ios/prboom/prboom.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/prboom.xcscheme new file mode 100644 index 00000000..5faddfd9 --- /dev/null +++ b/common/ios/prboom/prboom.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/prboom.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/ios/prboom/prboom.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/xcschememanagement.plist b/common/ios/prboom/prboom.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 00000000..f4e9da4d --- /dev/null +++ b/common/ios/prboom/prboom.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,22 @@ + + + + + SchemeUserState + + prboom.xcscheme + + orderHint + 3 + + + SuppressBuildableAutocreation + + 3DC1C85414B63E1B00680D02 + + primary + + + + + diff --git a/common/ios/tess/tess.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/tess.xcscheme b/common/ios/tess/tess.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/tess.xcscheme new file mode 100644 index 00000000..6ff3b59d --- /dev/null +++ b/common/ios/tess/tess.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/tess.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/ios/tess/tess.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/xcschememanagement.plist b/common/ios/tess/tess.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 00000000..34e12250 --- /dev/null +++ b/common/ios/tess/tess.xcodeproj/xcuserdata/gabrieloc.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,22 @@ + + + + + SchemeUserState + + tess.xcscheme + + orderHint + 5 + + + SuppressBuildableAutocreation + + 3D155FC014B51127000D33AA + + primary + + + + +