From 0908c4bec988bef172b205934cd9f4bff70b9313 Mon Sep 17 00:00:00 2001 From: 2bit Date: Fri, 11 Mar 2022 16:34:33 +0900 Subject: [PATCH] resolve confilict to current master --- libs/openFrameworksCompiled/project/ios/CoreOF.xcconfig | 3 ++- libs/openFrameworksCompiled/project/tvOS/CoreOF.xcconfig | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/openFrameworksCompiled/project/ios/CoreOF.xcconfig b/libs/openFrameworksCompiled/project/ios/CoreOF.xcconfig index 737a6d60b9a..bb7e43171da 100644 --- a/libs/openFrameworksCompiled/project/ios/CoreOF.xcconfig +++ b/libs/openFrameworksCompiled/project/ios/CoreOF.xcconfig @@ -40,5 +40,6 @@ OF_CORE_FRAMEWORKS = -framework AudioToolbox -framework Accelerate -framework AV // once all libraries are compiled for libc++ / all architectures CLANG_CXX_LIBRARY = libc++ -CLANG_CXX_LANGUAGE_STANDARD = c++11 +CLANG_CXX_LANGUAGE_STANDARD = c++17 +IPHONEOS_DEPLOYMENT_TARGET = 13.0 CLANG_ENABLE_OBJC_ARC = YES diff --git a/libs/openFrameworksCompiled/project/tvOS/CoreOF.xcconfig b/libs/openFrameworksCompiled/project/tvOS/CoreOF.xcconfig index 5d6093ec67f..cd309394fcb 100644 --- a/libs/openFrameworksCompiled/project/tvOS/CoreOF.xcconfig +++ b/libs/openFrameworksCompiled/project/tvOS/CoreOF.xcconfig @@ -40,5 +40,6 @@ OF_CORE_FRAMEWORKS = -framework AudioToolbox -framework Accelerate -framework AV // once all libraries are compiled for libc++ / all architectures CLANG_CXX_LIBRARY = libc++ -CLANG_CXX_LANGUAGE_STANDARD = c++11 +CLANG_CXX_LANGUAGE_STANDARD = c++17 +TVOS_DEPLOYMENT_TARGET = 13.0 CLANG_ENABLE_OBJC_ARC = YES