Skip to content

Commit 36c5927

Browse files
dimitredimitre
authored
update vscode templates (#7697)
* update vscode templates * removing addons folder
1 parent 1298030 commit 36c5927

File tree

4 files changed

+129
-135
lines changed

4 files changed

+129
-135
lines changed

‎apps/projectGenerator‎

‎scripts/apothecary‎

‎scripts/templates/vscode/.vscode/c_cpp_properties.json‎

Lines changed: 127 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -1,145 +1,142 @@
11
{
22
"env": {
3-
"OF_ROOT" : "${workspaceFolder}/../../..",
4-
"OF_LIBS_ROOT":"${OF_ROOT}/libs",
5-
"OF_INCLUDE":["${OF_LIBS_ROOT}/openFrameworks/**"],
6-
"OF_LIBS_INCLUDE" : [
7-
"${OF_LIBS_ROOT}/boost/include",
8-
"${OF_LIBS_ROOT}/cairo/include/cairo",
9-
"${OF_LIBS_ROOT}/curl/include",
10-
"${OF_LIBS_ROOT}/fmod/include",
11-
"${OF_LIBS_ROOT}/FreeImage/include",
12-
"${OF_LIBS_ROOT}/freetype/include",
13-
"${OF_LIBS_ROOT}/glew/include",
14-
"${OF_LIBS_ROOT}/glfw/include",
15-
"${OF_LIBS_ROOT}/glm/include",
16-
"${OF_LIBS_ROOT}/json/include",
17-
"${OF_LIBS_ROOT}/pugixml/include",
18-
"${OF_LIBS_ROOT}/rtAudio/include",
19-
"${OF_LIBS_ROOT}/tess2/include",
20-
"${OF_LIBS_ROOT}/uriparser/include",
21-
"${OF_LIBS_ROOT}/utf8/include"
22-
],
23-
"PROJECT_ADDON_INCLUDES": [
24-
25-
],
3+
"OF_ROOT": "${workspaceFolder}/../../..",
4+
"OF_LIBS_ROOT": "${OF_ROOT}/libs",
5+
"OF_INCLUDE": ["${OF_LIBS_ROOT}/openFrameworks/**"],
6+
"OF_LIBS_INCLUDE": [
7+
"${OF_LIBS_ROOT}/boost/include",
8+
"${OF_LIBS_ROOT}/cairo/include/cairo",
9+
"${OF_LIBS_ROOT}/curl/include",
10+
"${OF_LIBS_ROOT}/fmod/include",
11+
"${OF_LIBS_ROOT}/FreeImage/include",
12+
"${OF_LIBS_ROOT}/freetype/include",
13+
"${OF_LIBS_ROOT}/glew/include",
14+
"${OF_LIBS_ROOT}/glfw/include",
15+
"${OF_LIBS_ROOT}/glm/include",
16+
"${OF_LIBS_ROOT}/json/include",
17+
"${OF_LIBS_ROOT}/pugixml/include",
18+
"${OF_LIBS_ROOT}/rtAudio/include",
19+
"${OF_LIBS_ROOT}/tess2/include",
20+
"${OF_LIBS_ROOT}/uriparser/include",
21+
"${OF_LIBS_ROOT}/utf8/include"
22+
],
23+
"PROJECT_ADDON_INCLUDES": [
24+
25+
],
2626
"PROJECT_EXTRA_INCLUDES": [
27-
28-
]
29-
},
30-
"configurations": [
31-
{
32-
"name": "Mac",
33-
"includePath": [
34-
"/usr/local/include",
35-
"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/",
36-
"${OF_INCLUDE}",
37-
"${OF_LIBS_INCLUDE}",
38-
"${workspaceFolder}/src/**",
39-
"${PROJECT_ADDON_INCLUDES}",
40-
"${PROJECT_EXTRA_INCLUDES}"
41-
],
42-
"browse": {
43-
"limitSymbolsToIncludedHeaders": true,
44-
"databaseFilename": "${workspaceRoot}/.vscode/browse.db",
27+
28+
]
29+
},
30+
"configurations": [
31+
{
32+
"name": "Mac",
33+
"includePath": [
34+
"/usr/local/include",
35+
"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/",
36+
"${OF_INCLUDE}",
37+
"${OF_LIBS_INCLUDE}",
38+
"${workspaceFolder}/src/**",
39+
"${PROJECT_ADDON_INCLUDES}",
40+
"${PROJECT_EXTRA_INCLUDES}"
41+
],
42+
"browse": {
43+
"limitSymbolsToIncludedHeaders": true,
44+
"databaseFilename": "${workspaceRoot}/.vscode/browse.db",
4545
"path": [
46-
"/usr/local/include",
47-
"/System/Library/Frameworks",
48-
"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/",
49-
"${workspaceRoot}/../../../addons",
50-
"${workspaceFolder}/src/**",
51-
"${OF_INCLUDE}",
52-
"${OF_LIBS_INCLUDE}",
46+
"/usr/local/include",
47+
"/System/Library/Frameworks",
48+
"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/",
49+
"${workspaceFolder}/src/**",
50+
"${OF_INCLUDE}",
51+
"${OF_LIBS_INCLUDE}",
5352
"${PROJECT_ADDON_INCLUDES}",
5453
"${PROJECT_EXTRA_INCLUDES}"
55-
]
56-
},
54+
]
55+
},
5756
"configurationProvider": "ms-vscode.makefile-tools",
58-
"mergeConfigurations":true,
59-
"intelliSenseMode": "${default}",
60-
"macFrameworkPath": [
61-
"/System/Library/Frameworks",
62-
"/Library/Frameworks"
63-
],
64-
"compilerPath": "/usr/bin/gcc",
65-
"cStandard": "c17",
66-
"cppStandard": "c++17"
67-
},
68-
{
69-
"name": "Linux",
70-
"includePath": [
71-
"/usr/include",
72-
"/usr/local/include",
73-
"/usr/include/c++/*",
74-
"/usr/lib/gcc/x86_64-linux-gnu/*",
75-
"/usr/lib/x86_64-linux-gnu/glib-2.0/include",
76-
"/usr/lib/x86_64-linux-gnu/gstreamer-1.0/include",
77-
"/usr/local/include",
78-
"/usr/include/x86_64-linux-gnu",
79-
"${OF_INCLUDE}",
80-
"${OF_LIBS_INCLUDE}",
81-
"${workspaceRoot}/../../../libs/kiss/include",
82-
"/usr/include/x86_64-linux-gnu/c++/*",
83-
"/usr/include/pulse",
84-
"/usr/include/cairo",
85-
"/usr/include/gstreamer-1.0",
86-
"/usr/include/glib-2.0",
87-
"${workspaceRoot}",
88-
"${workspaceFolder}/src/**",
89-
"${PROJECT_ADDON_INCLUDES}",
90-
"${PROJECT_EXTRA_INCLUDES}"
91-
],
92-
"browse": {
93-
"limitSymbolsToIncludedHeaders": true,
94-
"databaseFilename": "",
95-
"path": [
57+
"mergeConfigurations": true,
58+
"intelliSenseMode": "${default}",
59+
"macFrameworkPath": [
60+
"/System/Library/Frameworks",
61+
"/Library/Frameworks"
62+
],
63+
"compilerPath": "/usr/bin/gcc",
64+
"cStandard": "c17",
65+
"cppStandard": "c++17"
66+
},
67+
{
68+
"name": "Linux",
69+
"includePath": [
70+
"/usr/include",
71+
"/usr/local/include",
72+
"/usr/include/c++/*",
73+
"/usr/lib/gcc/x86_64-linux-gnu/*",
74+
"/usr/lib/x86_64-linux-gnu/glib-2.0/include",
75+
"/usr/lib/x86_64-linux-gnu/gstreamer-1.0/include",
76+
"/usr/local/include",
77+
"/usr/include/x86_64-linux-gnu",
78+
"${OF_INCLUDE}",
79+
"${OF_LIBS_INCLUDE}",
80+
"${workspaceRoot}/../../../libs/kiss/include",
81+
"/usr/include/x86_64-linux-gnu/c++/*",
82+
"/usr/include/pulse",
83+
"/usr/include/cairo",
84+
"/usr/include/gstreamer-1.0",
85+
"/usr/include/glib-2.0",
86+
"${workspaceRoot}",
87+
"${workspaceFolder}/src/**",
88+
"${PROJECT_ADDON_INCLUDES}",
89+
"${PROJECT_EXTRA_INCLUDES}"
90+
],
91+
"browse": {
92+
"limitSymbolsToIncludedHeaders": true,
93+
"databaseFilename": "",
94+
"path": [
9695
"/usr/local/include",
97-
"/usr/include",
98-
"${workspaceRoot}/../../../addons",
99-
"${workspaceFolder}/src/**",
100-
"${OF_INCLUDE}",
101-
"${OF_LIBS_INCLUDE}",
96+
"/usr/include",
97+
"${workspaceFolder}/src/**",
98+
"${OF_INCLUDE}",
99+
"${OF_LIBS_INCLUDE}",
102100
"${PROJECT_ADDON_INCLUDES}",
103101
"${PROJECT_EXTRA_INCLUDES}"
104-
]
105-
},
106-
"intelliSenseMode": "${default}",
102+
]
103+
},
104+
"intelliSenseMode": "${default}",
107105
"configurationProvider": "ms-vscode.makefile-tools",
108-
"mergeConfigurations":true,
109-
"compilerPath": "/usr/bin/gcc",
110-
"cStandard": "c17",
111-
"cppStandard": "c++17"
112-
},
113-
{
114-
"name": "Win32",
115-
"includePath": [
116-
"C:/msys64/mingw64/include/c++/**",
117-
"C:/msys64/mingw64/i686-w64-mingw64/include",
118-
"${OF_INCLUDE}",
119-
"${OF_LIBS_INCLUDE}",
120-
"${workspaceFolder}/src/**",
121-
"${PROJECT_ADDON_INCLUDES}",
122-
"${PROJECT_EXTRA_INCLUDES}"
123-
],
124-
"browse": {
125-
"limitSymbolsToIncludedHeaders": true,
126-
"databaseFilename": "",
127-
"path": [
128-
"${workspaceRoot}/../../../addons",
129-
"${workspaceFolder}/src/**",
130-
"${OF_INCLUDE}",
131-
"${OF_LIBS_INCLUDE}",
106+
"mergeConfigurations": true,
107+
"compilerPath": "/usr/bin/gcc",
108+
"cStandard": "c17",
109+
"cppStandard": "c++17"
110+
},
111+
{
112+
"name": "Win32",
113+
"includePath": [
114+
"C:/msys64/mingw64/include/c++/**",
115+
"C:/msys64/mingw64/i686-w64-mingw64/include",
116+
"${OF_INCLUDE}",
117+
"${OF_LIBS_INCLUDE}",
118+
"${workspaceFolder}/src/**",
119+
"${PROJECT_ADDON_INCLUDES}",
120+
"${PROJECT_EXTRA_INCLUDES}"
121+
],
122+
"browse": {
123+
"limitSymbolsToIncludedHeaders": true,
124+
"databaseFilename": "",
125+
"path": [
126+
"${workspaceFolder}/src/**",
127+
"${OF_INCLUDE}",
128+
"${OF_LIBS_INCLUDE}",
132129
"${PROJECT_ADDON_INCLUDES}",
133130
"${PROJECT_EXTRA_INCLUDES}"
134-
]
135-
},
136-
"intelliSenseMode": "clang-x64",
137-
"compilerPath": "C:/msys64/mingw64/bin/g++.exe",
131+
]
132+
},
133+
"intelliSenseMode": "clang-x64",
134+
"compilerPath": "C:/msys64/mingw64/bin/g++.exe",
138135
"configurationProvider": "ms-vscode.makefile-tools",
139-
"mergeConfigurations":true,
140-
"cStandard": "c17",
141-
"cppStandard": "c++17"
142-
}
143-
],
144-
"version": 4
136+
"mergeConfigurations": true,
137+
"cStandard": "c17",
138+
"cppStandard": "c++17"
139+
}
140+
],
141+
"version": 4
145142
}

‎scripts/templates/vscode/emptyExample.code-workspace‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
},
66
{
77
"path": "${workspaceRoot}/../../../../libs/openFrameworks"
8-
},
9-
{
10-
"path": "${workspaceRoot}/../../../../addons"
118
}
129
],
1310
"settings": {}

0 commit comments

Comments
 (0)