diff options
| -rw-r--r-- | .clang-format | 65 | ||||
| -rwxr-xr-x | build_and_test.sh | 5 |
2 files changed, 0 insertions, 70 deletions
diff --git a/.clang-format b/.clang-format deleted file mode 100644 index 11fb6f9..0000000 --- a/.clang-format +++ /dev/null @@ -1,65 +0,0 @@ -BasedOnStyle: LLVM -UseTab: Never -TabWidth: 2 -IndentWidth: 2 - -Language: Cpp -Standard: Auto - -ColumnLimit: 70 -MaxEmptyLinesToKeep: 1 -SpacesBeforeTrailingComments: 1 -AccessModifierOffset: -2 -PenaltyBreakAssignment: 100 -PenaltyReturnTypeOnItsOwnLine: 200 - -IndentCaseLabels: true -IndentExternBlock: NoIndent -IndentGotoLabels: false -IndentPPDirectives: AfterHash -IndentRequires: true -IndentWrappedFunctionNames: false -NamespaceIndentation: All - -SpaceAfterCStyleCast: true -SpaceAfterLogicalNot: false -SpaceAfterTemplateKeyword: true -SpaceBeforeAssignmentOperators: true -SpaceBeforeCpp11BracedList: true -SpaceBeforeCtorInitializerColon: true -SpaceBeforeInheritanceColon: true -SpaceBeforeParens: ControlStatements -SpaceBeforeRangeBasedForLoopColon: true -SpaceBeforeSquareBrackets: false -SpaceInEmptyBlock: true -SpaceInEmptyParentheses: false -SpacesInAngles: false -SpacesInCStyleCastParentheses: false -SpacesInConditionalStatement: false -SpacesInSquareBrackets: false - -AlignAfterOpenBracket: Align -AlignConsecutiveAssignments: Consecutive -AlignConsecutiveBitFields: Consecutive -AlignConsecutiveDeclarations: Consecutive -AlignEscapedNewlines: Left -AllowShortLambdasOnASingleLine: All -AllowShortFunctionsOnASingleLine: Empty -AllowShortBlocksOnASingleLine: Empty -AllowShortCaseLabelsOnASingleLine: false -AllowShortLoopsOnASingleLine: false -AllowAllArgumentsOnNextLine: true -AllowAllConstructorInitializersOnNextLine: true -AllowAllParametersOfDeclarationOnNextLine: true -AlwaysBreakTemplateDeclarations: Yes -BinPackArguments: true -BinPackParameters: true -BreakBeforeConceptDeclarations: true -BreakConstructorInitializers: AfterColon -Cpp11BracedListStyle: false -EmptyLineBeforeAccessModifier: LogicalBlock -FixNamespaceComments: false -PointerAlignment: Right -ReflowComments: true -SortIncludes: Never -SortUsingDeclarations: true diff --git a/build_and_test.sh b/build_and_test.sh index 46ed36a..09077b8 100755 --- a/build_and_test.sh +++ b/build_and_test.sh @@ -196,11 +196,6 @@ else fi fi -if [ "$COMPILE" = "clang" ] || [ "$OS" = "macOS" ]; then - FLAGS="-fblocks $FLAGS" - LINK_FLAGS="-lBlocksRuntime $LINK_FLAGS" -fi - if [ "$EXTRA_OPTIONS" != "" ]; then FLAGS="$EXTRA_OPTIONS $FLAGS" fi |