Skip to content

Commit d05702c

Browse files
committed
Merge branch 'optimize/better_file_structure' into cmake
2 parents bf7b582 + fd55a50 commit d05702c

File tree

716 files changed

+37348
-116822
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

716 files changed

+37348
-116822
lines changed

.clang-format

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
---
2+
#Language: Cpp
3+
BasedOnStyle: LLVM
4+
AccessModifierOffset: -4
5+
#AlignAfterOpenBracket: Align
6+
AlignConsecutiveAssignments: false
7+
AlignConsecutiveDeclarations: false
8+
AlignEscapedNewlines: Left
9+
AlignOperands: false
10+
AlignTrailingComments: true
11+
AllowAllParametersOfDeclarationOnNextLine: true
12+
AllowShortBlocksOnASingleLine: Empty
13+
AllowShortCaseLabelsOnASingleLine: false
14+
AllowShortFunctionsOnASingleLine: All
15+
AllowShortIfStatementsOnASingleLine: WithoutElse
16+
AllowShortLoopsOnASingleLine: false
17+
AllowShortEnumsOnASingleLine: true
18+
AlwaysBreakAfterDefinitionReturnType: None
19+
AlwaysBreakAfterReturnType: None
20+
AlwaysBreakBeforeMultilineStrings: false
21+
AlwaysBreakTemplateDeclarations: MultiLine
22+
BinPackArguments: true
23+
BinPackParameters: true
24+
BreakBeforeBraces: Custom
25+
BraceWrapping:
26+
AfterClass: true
27+
AfterControlStatement: Always
28+
AfterEnum: true
29+
AfterFunction: true
30+
AfterNamespace: true
31+
AfterObjCDeclaration: true
32+
AfterStruct: true
33+
AfterUnion: true
34+
AfterExternBlock: true
35+
BeforeCatch: true
36+
BeforeElse: true
37+
IndentBraces: false
38+
SplitEmptyFunction: false
39+
SplitEmptyRecord: false
40+
SplitEmptyNamespace: false
41+
BreakBeforeBinaryOperators: None
42+
ObjCSpaceBeforeProtocolList: false
43+
ObjCSpaceAfterProperty: true
44+
ObjCBlockIndentWidth: 4
45+
ObjCBreakBeforeNestedBlockParam: false
46+
BreakInheritanceList: AfterColon
47+
BreakBeforeTernaryOperators: false
48+
BreakConstructorInitializers: AfterColon
49+
BreakAfterJavaFieldAnnotations: true
50+
BreakStringLiterals: false
51+
ColumnLimit: 0
52+
CommentPragmas: '^ IWYU pragma:'
53+
CompactNamespaces: true
54+
ConstructorInitializerAllOnOneLineOrOnePerLine: true
55+
ConstructorInitializerIndentWidth: 4
56+
ContinuationIndentWidth: 4
57+
Cpp11BracedListStyle: false
58+
DerivePointerAlignment: false
59+
DisableFormat: false
60+
ExperimentalAutoDetectBinPacking: false
61+
FixNamespaceComments: true
62+
ForEachMacros:
63+
- foreach
64+
- Q_FOREACH
65+
- BOOST_FOREACH
66+
IncludeBlocks: Regroup
67+
IncludeCategories:
68+
- Regex: '^"(llvm|llvm-c|clang|clang-c)/'
69+
Priority: 2
70+
- Regex: '^(<|"(gtest|gmock|isl|json)/)'
71+
Priority: 3
72+
- Regex: '.*'
73+
Priority: 1
74+
#IncludeIsMainRegex: '(Test)?$'
75+
IndentCaseLabels: false
76+
IndentPPDirectives: None
77+
IndentWidth: 4
78+
IndentWrappedFunctionNames: true
79+
JavaScriptQuotes: Leave
80+
JavaScriptWrapImports: true
81+
KeepEmptyLinesAtTheStartOfBlocks: false
82+
#MacroBlockBegin: ''
83+
#MacroBlockEnd: ''
84+
MaxEmptyLinesToKeep: 1
85+
NamespaceIndentation: None
86+
IndentExternBlock: NoIndent
87+
PenaltyBreakAssignment: 4
88+
PenaltyBreakBeforeFirstCallParameter: 19
89+
PenaltyBreakComment: 300
90+
PenaltyBreakFirstLessLess: 120
91+
PenaltyBreakString: 1000
92+
PenaltyBreakTemplateDeclaration: 10
93+
PenaltyExcessCharacter: 1000000
94+
PenaltyReturnTypeOnItsOwnLine: 60
95+
PointerAlignment: Left
96+
ReflowComments: true
97+
SortIncludes: true
98+
SortUsingDeclarations: true
99+
SpaceAfterCStyleCast: false
100+
SpaceAfterTemplateKeyword: true
101+
SpaceBeforeAssignmentOperators: true
102+
SpaceBeforeCpp11BracedList: false
103+
SpaceBeforeCtorInitializerColon: true
104+
SpaceBeforeInheritanceColon: true
105+
SpaceBeforeParens: ControlStatements
106+
SpaceBeforeRangeBasedForLoopColon: true
107+
SpaceInEmptyParentheses: false
108+
SpacesBeforeTrailingComments: 1
109+
SpacesInAngles: false
110+
SpacesInContainerLiterals: true
111+
SpacesInCStyleCastParentheses: false
112+
SpacesInParentheses: false
113+
SpacesInSquareBrackets: false
114+
Standard: c++17
115+
StatementMacros:
116+
- Q_UNUSED
117+
- QT_REQUIRE_VERSION
118+
TabWidth: 4
119+
UseTab: Never
120+
---
121+
Language: Java
122+
DisableFormat: true
123+
---
124+
Language: TableGen
125+
DisableFormat: true
126+
---
127+
Language: TextProto
128+
DisableFormat: true
129+
---
130+
Language: CSharp
131+
DisableFormat: true
132+
---
133+
Language: Proto
134+
DisableFormat: true
135+
---
136+
Language: JavaScript
137+
DisableFormat: true
138+
...
139+

.vscode/c_cpp_properties.json

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"version": 4,
3+
"env": {
4+
"myDefaultIncludePath": [
5+
"${workspaceFolder}",
6+
"${workspaceFolder}/library/src/main/jni",
7+
"${workspaceFolder}/library/src/main/jni/cge/common",
8+
"${workspaceFolder}/library/src/main/jni/cge/extends",
9+
"${workspaceFolder}/library/src/main/jni/cge/filters",
10+
"${workspaceFolder}/library/src/main/jni/custom",
11+
"${workspaceFolder}/library/src/main/jni/ffmpeg",
12+
"${workspaceFolder}/library/src/main/jni/interface"
13+
]
14+
},
15+
"configurations": [
16+
{
17+
"name": "default",
18+
"cStandard": "c11",
19+
"cppStandard": "c++17",
20+
"defines": [
21+
"DEBUG=1",
22+
"_CGE_USE_FFMPEG_=1",
23+
"ANDROID_NDK=1",
24+
"_CGE_DISABLE_GLOBALCONTEXT_=1",
25+
"_CGE_ONLY_FILTERS_=1"
26+
],
27+
"includePath": [
28+
"${myDefaultIncludePath}",
29+
"${env:NDK}/ndk-build-toolchain/sysroot/usr/include"
30+
],
31+
"configurationProvider": "ms-vscode.cmake-tools"
32+
}
33+
]
34+
}

.vscode/settings.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
3+
"cmake.configureArgs": [
4+
],
5+
"files.exclude": {
6+
},
7+
"files.associations": {
8+
}
9+
}

.vscode/tasks.json

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
{
2+
// See https://go.microsoft.com/fwlink/?LinkId=733558
3+
// for the documentation about the tasks.json format
4+
"version": "2.0.0",
5+
"tasks": [
6+
{
7+
"label": "[Android] Build Android Demo",
8+
"type": "shell",
9+
"command": "bash",
10+
"args": [
11+
"vscode_tasks.sh",
12+
"--build"
13+
],
14+
"options": {
15+
"cwd": "${workspaceFolder}"
16+
},
17+
"group": "build",
18+
"problemMatcher": "$gcc"
19+
},
20+
{
21+
"label": "[Android] Run Android Demo",
22+
"type": "shell",
23+
"command": "bash",
24+
"args": [
25+
"vscode_tasks.sh",
26+
"--build",
27+
"--run"
28+
],
29+
"options": {
30+
"cwd": "${workspaceFolder}"
31+
},
32+
"group": "build",
33+
"problemMatcher": "$gcc"
34+
},
35+
{
36+
"label": "[Android] Build And Run Android Demo",
37+
"type": "shell",
38+
"command": "bash",
39+
"args": [
40+
"-c",
41+
"echo done!"
42+
],
43+
"options": {
44+
"cwd": "${workspaceFolder}"
45+
},
46+
"group": "build",
47+
"problemMatcher": "$gcc",
48+
"dependsOn": [
49+
"[Android] Build Android Demo",
50+
"[Android] Run Android Demo",
51+
]
52+
},
53+
{
54+
"label": "[Android] Build Native Library",
55+
"type": "shell",
56+
"command": "bash",
57+
"args": [
58+
"library/src/main/jni/buildJNI"
59+
],
60+
"options": {
61+
"cwd": "${workspaceFolder}"
62+
},
63+
"group": "build",
64+
"problemMatcher": "$gcc"
65+
}
66+
]
67+
}

0 commit comments

Comments
 (0)