From fb4e9f560ff3950afd0abf0f2a8cc69a9cff6758 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Wed, 24 Apr 2019 03:42:14 +0200 Subject: [PATCH] (OSX 10.7) Update --- .../project.pbxproj | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkg/apple/RetroArch_OSX107.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_OSX107.xcodeproj/project.pbxproj index d496448ca7..b482d4a0f9 100644 --- a/pkg/apple/RetroArch_OSX107.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_OSX107.xcodeproj/project.pbxproj @@ -22,6 +22,8 @@ 500845341B89300700CE6073 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EB41A89E737007336C1 /* IOKit.framework */; }; 5061C8A41AE47E510080AE14 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5061C8A31AE47E510080AE14 /* libz.dylib */; }; 509F0C9D1AA23AFC00619ECC /* griffin_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 509F0C9C1AA23AFC00619ECC /* griffin_objc.m */; }; + 50BD99D5226FF5BA00CD6BAB /* griffin_cpp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50BD99D4226FF5BA00CD6BAB /* griffin_cpp.cpp */; }; + 50BD99D6226FF5F200CD6BAB /* griffin_cpp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50BD99D4226FF5BA00CD6BAB /* griffin_cpp.cpp */; }; 840222FC1A889EE2009AB261 /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 840222FB1A889EE2009AB261 /* griffin.c */; }; 84DD5EA31A89E2AA007336C1 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97324FDCFA39411CA2CEA /* AppKit.framework */; }; 84DD5EA91A89E4BE007336C1 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EA81A89E4BE007336C1 /* CoreAudio.framework */; }; @@ -79,6 +81,7 @@ 5008453B1B89300700CE6073 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = /../../pkg/apple/OSX/Info.plist; sourceTree = SOURCE_ROOT; }; 5061C8A31AE47E510080AE14 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; 509F0C9C1AA23AFC00619ECC /* griffin_objc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = griffin_objc.m; path = ../../griffin/griffin_objc.m; sourceTree = ""; }; + 50BD99D4226FF5BA00CD6BAB /* griffin_cpp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = griffin_cpp.cpp; path = ../../griffin/griffin_cpp.cpp; sourceTree = ""; }; 840222FB1A889EE2009AB261 /* griffin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = griffin.c; path = ../../griffin/griffin.c; sourceTree = SOURCE_ROOT; }; 84DD5E9E1A88E45B007336C1 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = /System/Library/Frameworks/CoreVideo.framework; sourceTree = ""; }; 84DD5EA61A89E406007336C1 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = /System/Library/Frameworks/CoreLocation.framework; sourceTree = ""; }; @@ -210,6 +213,7 @@ 840222FA1A889EA2009AB261 /* Core */ = { isa = PBXGroup; children = ( + 50BD99D4226FF5BA00CD6BAB /* griffin_cpp.cpp */, 509F0C9C1AA23AFC00619ECC /* griffin_objc.m */, 840222FB1A889EE2009AB261 /* griffin.c */, ); @@ -274,7 +278,7 @@ attributes = { LastUpgradeCheck = 0640; }; - buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "RetroArch" */; + buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "RetroArch_OSX107" */; compatibilityVersion = "Xcode 3.1"; developmentRegion = English; hasScannedForEncodings = 1; @@ -319,6 +323,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 50BD99D5226FF5BA00CD6BAB /* griffin_cpp.cpp in Sources */, 500845291B89300700CE6073 /* griffin_objc.m in Sources */, 5008452A1B89300700CE6073 /* griffin.c in Sources */, ); @@ -328,6 +333,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 50BD99D6226FF5F200CD6BAB /* griffin_cpp.cpp in Sources */, 509F0C9D1AA23AFC00619ECC /* griffin_objc.m in Sources */, 840222FC1A889EE2009AB261 /* griffin.c in Sources */, ); @@ -500,6 +506,8 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LIBRARY = "libc++"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_OPTIMIZATION_LEVEL = 0; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -534,9 +542,9 @@ "-DHAVE_CC_RESAMPLER", "-UHAVE_OPENGL", "-UHAVE_GLSL", - "-DHAVE_SLANG", - "-DHAVE_SPIRV_CROSS", - "-DWANT_GLSLANG", + "-DHAVE_SLANG", + "-DHAVE_SPIRV_CROSS", + "-DWANT_GLSLANG", "-DINLINE=inline", "-D__LIBRETRO__", "-DHAVE_COREAUDIO", @@ -572,6 +580,8 @@ C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LIBRARY = "libc++"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -604,9 +614,9 @@ "-DHAVE_CC_RESAMPLER", "-UHAVE_OPENGL", "-UHAVE_GLSL", - "-DHAVE_SLANG", - "-DHAVE_SPIRV_CROSS", - "-DWANT_GLSLANG", + "-DHAVE_SLANG", + "-DHAVE_SPIRV_CROSS", + "-DWANT_GLSLANG", "-DINLINE=inline", "-D__LIBRETRO__", "-DHAVE_COREAUDIO", @@ -660,7 +670,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - C01FCF4E08A954540054247B /* Build configuration list for PBXProject "RetroArch" */ = { + C01FCF4E08A954540054247B /* Build configuration list for PBXProject "RetroArch_OSX107" */ = { isa = XCConfigurationList; buildConfigurations = ( C01FCF4F08A954540054247B /* Debug */,