From cfd078812e3e68aba03cfc4bf318fe6ee6337cd2 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Sat, 20 Sep 2014 05:26:12 +0200 Subject: [PATCH] (Apple) iOS Xcode 6 build fix --- apple/common/contentview_camera_ios.m.inl | 4 ++++ .../xcshareddata/RetroArch_iOS.xccheckout | 22 ++++++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/apple/common/contentview_camera_ios.m.inl b/apple/common/contentview_camera_ios.m.inl index 7429189483..068afe2cb8 100644 --- a/apple/common/contentview_camera_ios.m.inl +++ b/apple/common/contentview_camera_ios.m.inl @@ -4,6 +4,10 @@ CVOpenGLESTextureCacheRef textureCache; GLuint outputTexture; static bool newFrame = false; +#ifndef GL_BGRA +#define GL_BGRA 0x80E1 +#endif + void event_process_camera_frame(void* pixelBufferPtr) { CVOpenGLESTextureRef renderTexture; diff --git a/apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout b/apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout index 2bc51df130..96f4777dbe 100644 --- a/apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout +++ b/apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout @@ -12,7 +12,9 @@ 49FCA0A2-0FE0-4A7A-9C54-642C68ED726A git://github.com/libretro/common-overlays.git - A5B07A9E-AFED-41CB-BE4B-7C0CDBC26E8C + 76200F0D6584D865E96F58DE862E738E88B23A3C + https://github.com/libretro/libretro-super.git + C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 https://github.com/libretro/RetroArch.git IDESourceControlProjectPath @@ -21,17 +23,27 @@ 49FCA0A2-0FE0-4A7A-9C54-642C68ED726A ../../../media/overlays - A5B07A9E-AFED-41CB-BE4B-7C0CDBC26E8C + 76200F0D6584D865E96F58DE862E738E88B23A3C + ../../../.. + C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 ../../.. IDESourceControlProjectURL https://github.com/libretro/RetroArch.git IDESourceControlProjectVersion - 110 + 111 IDESourceControlProjectWCCIdentifier - A5B07A9E-AFED-41CB-BE4B-7C0CDBC26E8C + C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 IDESourceControlProjectWCConfigurations + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 76200F0D6584D865E96F58DE862E738E88B23A3C + IDESourceControlWCCName + + IDESourceControlRepositoryExtensionIdentifierKey public.vcs.git @@ -44,7 +56,7 @@ IDESourceControlRepositoryExtensionIdentifierKey public.vcs.git IDESourceControlWCCIdentifierKey - A5B07A9E-AFED-41CB-BE4B-7C0CDBC26E8C + C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 IDESourceControlWCCName retroarch