resolve confilict to current master

openframeworks · Mar 11, 2022 · 0908c4b · 0908c4b
1 parent ef4befc
commit 0908c4b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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