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 00000000..ae60caf5 Binary files /dev/null and b/DoomClassics.xcworkspace/xcuserdata/gabrieloc.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/common/SDL_shim/ios/SDL_Mixer.m b/common/SDL_shim/ios/SDL_Mixer.m index 83805d82..c696e9e5 100755 --- a/common/SDL_shim/ios/SDL_Mixer.m +++ b/common/SDL_shim/ios/SDL_Mixer.m @@ -235,14 +235,14 @@ AudioStreamBasicDescription getStreamFormat( void ) { AudioStreamBasicDescription streamFormat = { 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - // The AudioUnitSampleType data type is the recommended type for sample data in audio + // The SInt32 data type is the recommended type for sample data in audio // units. This obtains the byte size of the type for use in filling in the ASBD. - size_t bytesPerSample = sizeof (AudioUnitSampleType); + size_t bytesPerSample = sizeof (SInt32); // Fill the application audio format struct's fields to define a linear PCM, // stereo, noninterleaved stream at the hardware sample rate. streamFormat.mFormatID = kAudioFormatLinearPCM; - streamFormat.mFormatFlags = kAudioFormatFlagsAudioUnitCanonical; + streamFormat.mFormatFlags = kAudioFormatFlagIsFloat | kAudioFormatFlagsNativeEndian | kAudioFormatFlagIsPacked | kAudioFormatFlagIsNonInterleaved; streamFormat.mBytesPerPacket = bytesPerSample; streamFormat.mFramesPerPacket = 1; streamFormat.mBytesPerFrame = bytesPerSample; @@ -473,13 +473,13 @@ static OSStatus inputRenderCallback ( inNumberFrames, ioData->mNumberBuffers, 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 + + + + +