diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000000..93f51704fe5 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,40 @@ +# EditorConfig https://editorconfig.org +root = true + +# Default settings for all files +[*] +indent_style = tab +indent_size = 4 +tab_width = 4 +insert_final_newline = true +trim_trailing_whitespace = true + +[*.{js,py}] +charset = utf-8 + +[*.sh] +indent_style = tab +indent_size = 4 +tab_width = 4 +insert_final_newline = true +trim_trailing_whitespace = true + +# Override JSON +[*.json] +indent_style = space +indent_size = 2 +tab_width = 2 + +# Override YAML +[*.yml] +indent_style = space +indent_size = 2 +tab_width = 2 + +[*.html] +indent_style = space +indent_size = 2 + +[*.js] +indent_style = space +indent_size = 2 diff --git a/libs/openFrameworksCompiled/project/ios/iOS+OFLib.xcodeproj/project.pbxproj b/libs/openFrameworksCompiled/project/ios/iOS+OFLib.xcodeproj/project.pbxproj index 3d0c405e06d..c347655e373 100644 --- a/libs/openFrameworksCompiled/project/ios/iOS+OFLib.xcodeproj/project.pbxproj +++ b/libs/openFrameworksCompiled/project/ios/iOS+OFLib.xcodeproj/project.pbxproj @@ -681,7 +681,7 @@ name = CustomTemplate; sourceTree = ""; tabWidth = 4; - usesTabs = 0; + usesTabs = 1; }; 29B97323FDCFA39411CA2CEA /* core frameworks */ = { isa = PBXGroup; diff --git a/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj b/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj index f4105425043..2ca98d2ba81 100644 --- a/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj +++ b/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj @@ -555,7 +555,7 @@ indentWidth = 4; sourceTree = ""; tabWidth = 4; - usesTabs = 0; + usesTabs = 1; }; E4F3BA5212F4C4BF002D19BB /* 3d */ = { isa = PBXGroup; diff --git a/libs/openFrameworksCompiled/project/tvOS/tvOS+OFLib.xcodeproj/project.pbxproj b/libs/openFrameworksCompiled/project/tvOS/tvOS+OFLib.xcodeproj/project.pbxproj index 9f61875baf4..b3d448542e8 100644 --- a/libs/openFrameworksCompiled/project/tvOS/tvOS+OFLib.xcodeproj/project.pbxproj +++ b/libs/openFrameworksCompiled/project/tvOS/tvOS+OFLib.xcodeproj/project.pbxproj @@ -441,6 +441,9 @@ BFF80A4A2C50AFEB00784E74 /* Frameworks */, ); sourceTree = ""; + indentWidth = 4; + tabWidth = 4; + usesTabs = 1; }; 8446395D1BC343E000F24926 /* Products */ = { isa = PBXGroup; diff --git a/scripts/templates/ios/emptyExample.xcodeproj/project.pbxproj b/scripts/templates/ios/emptyExample.xcodeproj/project.pbxproj index bcf25cde70e..389205d11e4 100644 --- a/scripts/templates/ios/emptyExample.xcodeproj/project.pbxproj +++ b/scripts/templates/ios/emptyExample.xcodeproj/project.pbxproj @@ -124,7 +124,7 @@ "COMPRESS_PNG_FILES": "NO", "GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL": "NO", "GCC_OPTIMIZATION_LEVEL": "0", - "GCC_C_LANGUAGE_STANDARD": "c11", + "GCC_C_LANGUAGE_STANDARD": "c17", "TARGETED_DEVICE_FAMILY": "1", "GCC_WARN_PROTOTYPE_CONVERSION": "NO", "GCC_WARN_64_TO_32_BIT_CONVERSION[arch=*64]": "NO", diff --git a/scripts/templates/tvOS/emptyExample.xcodeproj/project.pbxproj b/scripts/templates/tvOS/emptyExample.xcodeproj/project.pbxproj index b2eb51f449e..0181756bd21 100644 --- a/scripts/templates/tvOS/emptyExample.xcodeproj/project.pbxproj +++ b/scripts/templates/tvOS/emptyExample.xcodeproj/project.pbxproj @@ -206,6 +206,9 @@ ); path = src; sourceTree = SOURCE_ROOT; + indentWidth = 4; + tabWidth = 4; + usesTabs = 1; }; 9998920A1BF4D40400DCECB0 /* mediaAssets */ = { isa = PBXGroup;