Skip to content

Commit 93958a8

Browse files
nathanjhoodnathanjhood
authored
Merge pull request #260 from StoneyDSP/development
feat/design-system
2 parents 66f746c + d23e93c commit 93958a8

File tree

16 files changed

+961
-397
lines changed

16 files changed

+961
-397
lines changed

‎.vscode/c_cpp_properties.json‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@
1111
{
1212
"name": "Linux",
1313
"includePath": [
14+
"${workspaceFolder}/build/vcpkg_installed/x64-linux/include/Rack-SDK/dep",
15+
"${workspaceFolder}/build/vcpkg_installed/x64-linux/include/Rack-SDK/rack",
16+
"${workspaceFolder}/build/vcpkg_installed/x64-linux/include",
1417
"${default}"
18+
1519
],
1620
"defines": [
1721
"${default}"
@@ -24,6 +28,7 @@
2428
"`pkg-config --cflags --libs Rack-SDK`",
2529
"`pkg-config --cflags --libs catch2-with-main`",
2630
"-I${workspaceFolder}/include",
31+
"-I${workspaceFolder}/build/vcpkg_installed/x64-linux/include",
2732
"-fno-gnu-unique",
2833
"-MMD",
2934
"-MP",
@@ -36,6 +41,7 @@
3641
"-Wno-unused-parameter",
3742
"-march=nehalem",
3843
"-lRack",
44+
"-L${workspaceFolder}/build/vcpkg_installed/x64-linux/lib",
3945
"-static-libstdc++",
4046
"-static-libgcc"
4147
],
@@ -57,6 +63,9 @@
5763
{
5864
"name": "Mac",
5965
"includePath": [
66+
"${workspaceFolder}/build/vcpkg_installed/x64-osx/include/Rack-SDK/dep",
67+
"${workspaceFolder}/build/vcpkg_installed/x64-osx/include/Rack-SDK/rack",
68+
"${workspaceFolder}/build/vcpkg_installed/x64-osx/include",
6069
"${default}"
6170
],
6271
"defines": [
@@ -70,6 +79,8 @@
7079
"`pkg-config --cflags --libs Rack-SDK`",
7180
"`pkg-config --cflags --libs catch2-with-main`",
7281
"-I${workspaceFolder}/include",
82+
"-I${workspaceFolder}/build/vcpkg_installed/x64-osx/include",
83+
"-I${workspaceFolder}/build/vcpkg_installed/arm64-osx/include",
7384
"-MMD",
7485
"-MP",
7586
"-g",
@@ -81,7 +92,9 @@
8192
"-Wno-unused-parameter",
8293
"-march=armv8-a+fp+simd",
8394
"-mmacosx-version-min=10.9",
84-
"-L${RACK_DIR}",
95+
"-lRack",
96+
"-L${workspaceFolder}/build/vcpkg_installed/x64-osx/lib",
97+
"-L${workspaceFolder}/build/vcpkg_installed/arm64-osx/lib",
8598
"-undefined dynamic_lookup"
8699
],
87100
"browse": {
@@ -102,11 +115,14 @@
102115
{
103116
"name": "Windows",
104117
"includePath": [
118+
"${workspaceFolder}\\build\\vcpkg_installed\\x64-linux\\include\\Rack-SDK\\dep",
119+
"${workspaceFolder}\\build\\vcpkg_installed\\x64-linux\\include\\Rack-SDK\\rack",
120+
"${workspaceFolder}\\build\\vcpkg_installed\\x64-mingw-dynamic\\include",
105121
"${default}"
106122
],
107123
"defines": [
108-
"${default}",
109-
"_USE_MATH_DEFINES"
124+
"_USE_MATH_DEFINES",
125+
"${default}"
110126
],
111127
"compilerArgs": [
112128
"-std=c++11",
@@ -116,6 +132,7 @@
116132
"`pkg-config --cflags --libs Rack-SDK`",
117133
"`pkg-config --cflags --libs catch2-with-main`",
118134
"-I${workspaceFolder}\\include",
135+
"-I${workspaceFolder}\\build\\vcpkg_installed\\x64-mingw-dynamic\\include",
119136
"-MMD",
120137
"-MP",
121138
"-g",
@@ -128,6 +145,7 @@
128145
"-march=nehalem",
129146
"-municode",
130147
"-lRack",
148+
"-L${workspaceFolder}\\build\\vcpkg_installed\\x64-mingw-dynamic\\include",
131149
"-static-libstdc++"
132150
],
133151
"browse": {

‎CMakePresets.json‎

Lines changed: 60 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,12 @@
99
"configurePresets": [
1010
{
1111
"name": "base",
12-
"description": "Base configuration for all presets",
12+
"description": "Base configuration options for all presets",
13+
"hidden": true,
1314
"generator": "Ninja",
1415
"binaryDir": "${sourceDir}/build",
15-
"installDir": "${sourceDir}/install",
16+
"installDir": "${sourceDir}/dist",
1617
"toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
17-
"hidden": true,
18-
"warnings": {
19-
"dev": false,
20-
"unusedCli": false,
21-
"uninitialized": false
22-
},
23-
"errors": {
24-
"dev": false,
25-
"deprecated": false
26-
},
27-
"environment": {
28-
"VCPKG_ROOT": "$penv{VCPKG_ROOT}",
29-
"VCPKG_OVERLAY_PORTS": "${sourceDir}/dep/vcpkg-registry/ports",
30-
"VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/dep/vcpkg-registry/triplets"
31-
},
3218
"cacheVariables": {
3319
"CMAKE_EXPORT_COMPILE_COMMANDS": {
3420
"value": "ON",
@@ -83,13 +69,21 @@
8369
"type": "BOOL"
8470
}
8571
},
86-
"vendor": {
87-
"microsoft.com/VisualStudioSettings/CMake/1.0": {
88-
"autoFormat": true,
89-
"intelliSenseOptions": {
90-
"useCompilerDefaults": true
91-
}
92-
}
72+
"environment": {
73+
"ARCH_NAME": "$env{ARCH_OS}-$env{ARCH_CPU}",
74+
"PLUGINS_DIR": "$env{RACK_USER_DIR}/plugins-$env{ARCH_OS}-$env{ARCH_CPU}",
75+
"VCPKG_ROOT": "$penv{VCPKG_ROOT}",
76+
"VCPKG_OVERLAY_PORTS": "${sourceDir}/dep/vcpkg-registry/ports",
77+
"VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/dep/vcpkg-registry/triplets"
78+
},
79+
"warnings": {
80+
"dev": false,
81+
"unusedCli": false,
82+
"uninitialized": false
83+
},
84+
"errors": {
85+
"dev": false,
86+
"deprecated": false
9387
}
9488
},
9589
{
@@ -139,6 +133,28 @@
139133
"VERBOSE": "1"
140134
}
141135
},
136+
{
137+
"name": "x64",
138+
"hidden": true,
139+
"inherits": [
140+
"base"
141+
],
142+
"environment": {
143+
"ARCH_CPU": "x64",
144+
"ARCH_X64": "1"
145+
}
146+
},
147+
{
148+
"name": "arm64",
149+
"hidden": true,
150+
"inherits": [
151+
"base"
152+
],
153+
"environment": {
154+
"ARCH_CPU": "arm64",
155+
"ARCH_ARM64": "1"
156+
}
157+
},
142158
{
143159
"name": "windows",
144160
"hidden": true,
@@ -157,6 +173,11 @@
157173
"intelliSenseOptions": {
158174
"useCompilerDefaults": true
159175
}
176+
},
177+
"environment": {
178+
"RACK_USER_DIR": "$penv{LOCALAPPDATA}/Rack2",
179+
"ARCH_OS": "win",
180+
"ARCH_WIN": "1"
160181
}
161182
}
162183
},
@@ -170,6 +191,12 @@
170191
"type": "equals",
171192
"lhs": "${hostSystemName}",
172193
"rhs": "Linux"
194+
},
195+
"environment": {
196+
"XDG_DATA_HOME": "$penv{HOME}/.local/share",
197+
"RACK_USER_DIR": "$env{XDG_DATA_HOME}/Rack2",
198+
"ARCH_OS": "lin",
199+
"ARCH_LIN": "1"
173200
}
174201
},
175202
{
@@ -182,6 +209,11 @@
182209
"type": "equals",
183210
"lhs": "${hostSystemName}",
184211
"rhs": "Darwin"
212+
},
213+
"environment": {
214+
"RACK_USER_DIR": "$penv{HOME}/Library/Application Support/Rack2",
215+
"ARCH_OS": "mac",
216+
"ARCH_MAC": "1"
185217
}
186218
},
187219
{
@@ -190,7 +222,7 @@
190222
"description": "This build is only available on Windows x64",
191223
"hidden": true,
192224
"inherits": [
193-
"base",
225+
"x64",
194226
"windows"
195227
],
196228
"cacheVariables": {
@@ -214,7 +246,7 @@
214246
"name": "x64-linux",
215247
"hidden": true,
216248
"inherits": [
217-
"base",
249+
"x64",
218250
"linux"
219251
],
220252
"displayName": "Linux-only configuration",
@@ -249,7 +281,7 @@
249281
"name": "x64-osx",
250282
"hidden": true,
251283
"inherits": [
252-
"base",
284+
"x64",
253285
"osx"
254286
],
255287
"displayName": "MacOS-only configuration",
@@ -284,7 +316,7 @@
284316
"name": "arm64-osx",
285317
"hidden": true,
286318
"inherits": [
287-
"base",
319+
"arm64",
288320
"osx"
289321
],
290322
"displayName": "MacOS-only configuration",
@@ -319,7 +351,6 @@
319351
"name": "x64-linux-debug",
320352
"hidden": false,
321353
"inherits": [
322-
"base",
323354
"x64-linux",
324355
"debug"
325356
]
@@ -328,7 +359,6 @@
328359
"name": "x64-linux-release",
329360
"hidden": false,
330361
"inherits": [
331-
"base",
332362
"x64-linux",
333363
"release"
334364
]
@@ -337,7 +367,6 @@
337367
"name": "x64-linux-debug-verbose",
338368
"hidden": false,
339369
"inherits": [
340-
"base",
341370
"x64-linux",
342371
"debug",
343372
"verbose"
@@ -347,7 +376,6 @@
347376
"name": "x64-linux-release-verbose",
348377
"hidden": false,
349378
"inherits": [
350-
"base",
351379
"x64-linux",
352380
"release",
353381
"verbose"
@@ -357,7 +385,6 @@
357385
"name": "x64-windows-debug",
358386
"hidden": false,
359387
"inherits": [
360-
"base",
361388
"x64-windows",
362389
"debug"
363390
]
@@ -366,7 +393,6 @@
366393
"name": "x64-windows-release",
367394
"hidden": false,
368395
"inherits": [
369-
"base",
370396
"x64-windows",
371397
"release"
372398
]
@@ -375,7 +401,6 @@
375401
"name": "x64-windows-debug-verbose",
376402
"hidden": false,
377403
"inherits": [
378-
"base",
379404
"x64-windows",
380405
"debug",
381406
"verbose"
@@ -385,7 +410,6 @@
385410
"name": "x64-windows-release-verbose",
386411
"hidden": false,
387412
"inherits": [
388-
"base",
389413
"x64-windows",
390414
"release",
391415
"verbose"
@@ -395,8 +419,6 @@
395419
"name": "x64-osx-debug",
396420
"hidden": false,
397421
"inherits": [
398-
"base",
399-
"osx",
400422
"x64-osx",
401423
"debug"
402424
]
@@ -405,8 +427,6 @@
405427
"name": "x64-osx-release",
406428
"hidden": false,
407429
"inherits": [
408-
"base",
409-
"osx",
410430
"x64-osx",
411431
"release"
412432
]
@@ -415,8 +435,6 @@
415435
"name": "x64-osx-debug-verbose",
416436
"hidden": false,
417437
"inherits": [
418-
"base",
419-
"osx",
420438
"x64-osx",
421439
"debug",
422440
"verbose"
@@ -426,8 +444,6 @@
426444
"name": "x64-osx-release-verbose",
427445
"hidden": false,
428446
"inherits": [
429-
"base",
430-
"osx",
431447
"x64-osx",
432448
"release",
433449
"verbose"
@@ -437,8 +453,6 @@
437453
"name": "arm64-osx-debug",
438454
"hidden": false,
439455
"inherits": [
440-
"base",
441-
"osx",
442456
"arm64-osx",
443457
"debug"
444458
]
@@ -447,8 +461,6 @@
447461
"name": "arm64-osx-release",
448462
"hidden": false,
449463
"inherits": [
450-
"base",
451-
"osx",
452464
"arm64-osx",
453465
"release"
454466
]
@@ -457,8 +469,6 @@
457469
"name": "arm64-osx-debug-verbose",
458470
"hidden": false,
459471
"inherits": [
460-
"base",
461-
"osx",
462472
"arm64-osx",
463473
"debug",
464474
"verbose"
@@ -468,8 +478,6 @@
468478
"name": "arm64-osx-release-verbose",
469479
"hidden": false,
470480
"inherits": [
471-
"base",
472-
"osx",
473481
"arm64-osx",
474482
"release",
475483
"verbose"

0 commit comments

Comments
 (0)