Skip to content

Commit 6105967

Browse files
artificielartificiel
authored
Merge branch 'openframeworks:master' into ofcolor-vector
2 parents eb8b9ce + 36c5927 commit 6105967

File tree

5 files changed

+144
-181
lines changed

5 files changed

+144
-181
lines changed

‎apps/projectGenerator

‎libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ HEADER_BOOST = "$(OF_PATH)/libs/boost/include"
2121
HEADER_UTF8 = "$(OF_PATH)/libs/utf8/include"
2222
HEADER_JSON = "$(OF_PATH)/libs/json/include"
2323
HEADER_GLM = "$(OF_PATH)/libs/glm/include"
24-
HEADER_CURL = "$(OF_PATH)/libs/curl/include"
24+
HEADER_CURL = ""
2525
HEADER_URIPARSER = "$(OF_PATH)/libs/uriparser/include"
2626
HEADER_PUGIXML = "$(OF_PATH)/libs/pugixml/include"
2727

@@ -37,7 +37,7 @@ LIB_CAIRO2 = "$(OF_PATH)/libs/cairo/lib/osx/cairo.a"
3737
LIB_CAIRO3 = "$(OF_PATH)/libs/cairo/lib/osx/pixman-1.a"
3838
LIB_BOOST_SYSTEM = "$(OF_PATH)/libs/boost/lib/osx/boost_system.a"
3939
LIB_BOOST_FS = "$(OF_PATH)/libs/boost/lib/osx/boost_filesystem.a"
40-
LIB_CURL = "$(OF_PATH)/libs/curl/lib/osx/curl.a"
40+
LIB_CURL = "-lcurl"
4141
LIB_URIPARSER = "$(OF_PATH)/libs/uriparser/lib/osx/uriparser.a"
4242
LIB_PUGIXML = "$(OF_PATH)/libs/pugixml/lib/osx/pugixml.a"
4343

‎scripts/apothecary

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

Lines changed: 140 additions & 174 deletions
Original file line numberDiff line numberDiff line change
@@ -1,176 +1,142 @@
11
{
2-
"configurations": [
3-
{
4-
"name": "Mac",
5-
"includePath": [
6-
"/usr/include",
7-
"/usr/local/include",
8-
"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/",
9-
"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/c++/4.2.1",
10-
"${workspaceRoot}/../../../libs/openFrameworks",
11-
"${workspaceRoot}/../../../libs/openFrameworks/3d",
12-
"${workspaceRoot}/../../../libs/openFrameworks/app",
13-
"${workspaceRoot}/../../../libs/openFrameworks/communication",
14-
"${workspaceRoot}/../../../libs/openFrameworks/events",
15-
"${workspaceRoot}/../../../libs/openFrameworks/gl",
16-
"${workspaceRoot}/../../../libs/openFrameworks/graphics",
17-
"${workspaceRoot}/../../../libs/openFrameworks/math",
18-
"${workspaceRoot}/../../../libs/openFrameworks/sound",
19-
"${workspaceRoot}/../../../libs/openFrameworks/types",
20-
"${workspaceRoot}/../../../libs/openFrameworks/utils",
21-
"${workspaceRoot}/../../../libs/openFrameworks/video",
22-
"${workspaceRoot}/../../../libs/boost/include",
23-
"${workspaceRoot}/../../../libs/cairo/include",
24-
"${workspaceRoot}/../../../libs/curl/include",
25-
"${workspaceRoot}/../../../libs/fmod/include",
26-
"${workspaceRoot}/../../../libs/FreeImage/include",
27-
"${workspaceRoot}/../../../libs/freetype/include",
28-
"${workspaceRoot}/../../../libs/glew/include",
29-
"${workspaceRoot}/../../../libs/glfw/include",
30-
"${workspaceRoot}/../../../libs/glm/include",
31-
"${workspaceRoot}/../../../libs/json/include",
32-
"${workspaceRoot}/../../../libs/pugixml/include",
33-
"${workspaceRoot}/../../../libs/rtAudio/include",
34-
"${workspaceRoot}/../../../libs/tess2/include",
35-
"${workspaceRoot}/../../../libs/uriparser/include",
36-
"${workspaceRoot}/../../../libs/utf8/include"
37-
],
38-
"browse": {
39-
"limitSymbolsToIncludedHeaders": true,
40-
"databaseFilename": "${workspaceRoot}/.vscode/browse.db",
41-
"path": [
42-
"/usr/include",
43-
"/usr/local/include",
44-
"/System/Library/Frameworks",
45-
"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/",
46-
"${workspaceRoot}/../../../libs",
47-
"${workspaceRoot}/../../../addons",
48-
"${workspaceRoot}/../../../libs/openFrameworks"
49-
]
50-
},
51-
"intelliSenseMode": "clang-x64",
52-
"macFrameworkPath": [
53-
"/System/Library/Frameworks",
54-
"/Library/Frameworks"
55-
],
56-
"compilerPath": "/usr/local/bin/gcc-8",
57-
"cStandard": "c11",
58-
"cppStandard": "c++17"
59-
},
60-
{
61-
"name": "Linux",
62-
"includePath": [
63-
"/usr/include",
64-
"/usr/local/include",
65-
"/usr/include/c++/5",
66-
"/usr/include/c++/5/backward",
67-
"/usr/lib/gcc/x86_64-linux-gnu/5/include",
68-
"/usr/lib/x86_64-linux-gnu/glib-2.0/include",
69-
"/usr/lib/x86_64-linux-gnu/gstreamer-1.0/include",
70-
"/usr/local/include",
71-
"/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed",
72-
"/usr/include/x86_64-linux-gnu",
73-
"${workspaceRoot}/../../../libs/openFrameworks",
74-
"${workspaceRoot}/../../../libs/openFrameworks/3d",
75-
"${workspaceRoot}/../../../libs/openFrameworks/app",
76-
"${workspaceRoot}/../../../libs/openFrameworks/communication",
77-
"${workspaceRoot}/../../../libs/openFrameworks/events",
78-
"${workspaceRoot}/../../../libs/openFrameworks/gl",
79-
"${workspaceRoot}/../../../libs/openFrameworks/graphics",
80-
"${workspaceRoot}/../../../libs/openFrameworks/math",
81-
"${workspaceRoot}/../../../libs/openFrameworks/sound",
82-
"${workspaceRoot}/../../../libs/openFrameworks/types",
83-
"${workspaceRoot}/../../../libs/openFrameworks/utils",
84-
"${workspaceRoot}/../../../libs/openFrameworks/video",
85-
"${workspaceRoot}/../../../libs/boost/include",
86-
"${workspaceRoot}/../../../libs/cairo/include",
87-
"${workspaceRoot}/../../../libs/curl/include",
88-
"${workspaceRoot}/../../../libs/fmod/include",
89-
"${workspaceRoot}/../../../libs/FreeImage/include",
90-
"${workspaceRoot}/../../../libs/freetype/include",
91-
"${workspaceRoot}/../../../libs/glew/include",
92-
"${workspaceRoot}/../../../libs/glfw/include",
93-
"${workspaceRoot}/../../../libs/glm/include",
94-
"${workspaceRoot}/../../../libs/json/include",
95-
"${workspaceRoot}/../../../libs/pugixml/include",
96-
"${workspaceRoot}/../../../libs/rtAudio/include",
97-
"${workspaceRoot}/../../../libs/tess2/include",
98-
"${workspaceRoot}/../../../libs/uriparser/include",
99-
"${workspaceRoot}/../../../libs/utf8/include",
100-
"${workspaceRoot}/../../../libs/poco/include",
101-
"${workspaceRoot}/../../../libs/kiss/include",
102-
"/usr/include/x86_64-linux-gnu/c++/5",
103-
"/usr/include/pulse",
104-
"/usr/include/cairo",
105-
"/usr/include/gstreamer-1.0",
106-
"/usr/include/glib-2.0",
107-
"${workspaceRoot}"
108-
],
109-
"browse": {
110-
"limitSymbolsToIncludedHeaders": true,
111-
"databaseFilename": "",
112-
"path": [
113-
"/usr/include",
114-
"/usr/local/include",
115-
"${workspaceRoot}/../../../libs",
116-
"${workspaceRoot}/../../../addons",
117-
"${workspaceRoot}/../../../libs/openFrameworks"
118-
]
119-
},
120-
"intelliSenseMode": "clang-x64",
121-
"compilerPath": "/usr/local/bin/gcc-8",
122-
"cStandard": "c11",
123-
"cppStandard": "c++17"
124-
},
125-
{
126-
"name": "Win32",
127-
"includePath": [
128-
"C:/msys64/mingw32/include/c++/7.4.0",
129-
"C:/msys64/mingw32/i686-w64-mingw32/include",
130-
"${workspaceRoot}/../../../libs",
131-
"${workspaceRoot}/../../../addons",
132-
"${workspaceRoot}/../../../libs/openFrameworks",
133-
"${workspaceRoot}/../../../libs/openFrameworks/3d",
134-
"${workspaceRoot}/../../../libs/openFrameworks/app",
135-
"${workspaceRoot}/../../../libs/openFrameworks/communication",
136-
"${workspaceRoot}/../../../libs/openFrameworks/events",
137-
"${workspaceRoot}/../../../libs/openFrameworks/gl",
138-
"${workspaceRoot}/../../../libs/openFrameworks/graphics",
139-
"${workspaceRoot}/../../../libs/openFrameworks/math",
140-
"${workspaceRoot}/../../../libs/openFrameworks/sound",
141-
"${workspaceRoot}/../../../libs/openFrameworks/types",
142-
"${workspaceRoot}/../../../libs/openFrameworks/utils",
143-
"${workspaceRoot}/../../../libs/openFrameworks/video",
144-
"${workspaceRoot}/../../../libs/boost/include",
145-
"${workspaceRoot}/../../../libs/cairo/include",
146-
"${workspaceRoot}/../../../libs/curl/include",
147-
"${workspaceRoot}/../../../libs/fmod/include",
148-
"${workspaceRoot}/../../../libs/FreeImage/include",
149-
"${workspaceRoot}/../../../libs/freetype/include",
150-
"${workspaceRoot}/../../../libs/glew/include",
151-
"${workspaceRoot}/../../../libs/glfw/include",
152-
"${workspaceRoot}/../../../libs/glm/include",
153-
"${workspaceRoot}/../../../libs/json/include",
154-
"${workspaceRoot}/../../../libs/pugixml/include",
155-
"${workspaceRoot}/../../../libs/rtAudio/include",
156-
"${workspaceRoot}/../../../libs/tess2/include",
157-
"${workspaceRoot}/../../../libs/uriparser/include",
158-
"${workspaceRoot}/../../../libs/utf8/include"
159-
],
160-
"browse": {
161-
"limitSymbolsToIncludedHeaders": true,
162-
"databaseFilename": "",
163-
"path": [
164-
"${workspaceRoot}/../../../libs",
165-
"${workspaceRoot}/../../../addons",
166-
"${workspaceRoot}/../../../libs/openFrameworks"
167-
]
168-
},
169-
"intelliSenseMode": "clang-x64",
170-
"compilerPath": "C:/msys64/mingw32/bin/g++.exe",
171-
"cStandard": "c11",
172-
"cppStandard": "c++17"
173-
}
174-
],
175-
"version": 4
2+
"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+
],
26+
"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",
45+
"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+
"${workspaceFolder}/src/**",
50+
"${OF_INCLUDE}",
51+
"${OF_LIBS_INCLUDE}",
52+
"${PROJECT_ADDON_INCLUDES}",
53+
"${PROJECT_EXTRA_INCLUDES}"
54+
]
55+
},
56+
"configurationProvider": "ms-vscode.makefile-tools",
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": [
95+
"/usr/local/include",
96+
"/usr/include",
97+
"${workspaceFolder}/src/**",
98+
"${OF_INCLUDE}",
99+
"${OF_LIBS_INCLUDE}",
100+
"${PROJECT_ADDON_INCLUDES}",
101+
"${PROJECT_EXTRA_INCLUDES}"
102+
]
103+
},
104+
"intelliSenseMode": "${default}",
105+
"configurationProvider": "ms-vscode.makefile-tools",
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}",
129+
"${PROJECT_ADDON_INCLUDES}",
130+
"${PROJECT_EXTRA_INCLUDES}"
131+
]
132+
},
133+
"intelliSenseMode": "clang-x64",
134+
"compilerPath": "C:/msys64/mingw64/bin/g++.exe",
135+
"configurationProvider": "ms-vscode.makefile-tools",
136+
"mergeConfigurations": true,
137+
"cStandard": "c17",
138+
"cppStandard": "c++17"
139+
}
140+
],
141+
"version": 4
176142
}

‎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)