Skip to content

Commit 3f94d75

Browse files
committed
chore: Update Project to use latest dmt version
1 parent 4675f74 commit 3f94d75

24 files changed

+149
-1408
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
build/
22
output/
3-
*.DS_Store
3+
*.DS_Store
4+
Copilot.txt

.vscode/c_cpp_properties.json

+26-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414
"${workspaceFolder}/build/src/OscilloscopePlugin_artefacts/JuceLibraryCode",
1515
"${workspaceFolder}/build/Debug/src/OscilloscopePlugin_artefacts/JuceLibraryCode",
1616
"${workspaceFolder}/build/Debug/src/juce_binarydata_FontBinaryData/JuceLibraryCode",
17-
"${workspaceFolder}/external/perfetto"
17+
"${workspaceFolder}/external/perfetto",
18+
"${workspaceFolder}/build/src/juce_binarydata_FontBinaryData/JuceLibraryCode",
19+
"${workspaceFolder}/build/src/OscilloscopePlugin_artefacts/JuceLibraryCode",
20+
"${workspaceFolder}/external/melatonin_perfetto",
21+
"${workspaceFolder}/external"
1822
],
1923
"defines": [
2024
"_DEBUG",
@@ -26,6 +30,27 @@
2630
"cStandard": "c23",
2731
"intelliSenseMode": "windows-msvc-x64",
2832
"cppStandard": "c++23"
33+
},
34+
{
35+
"name": "Linux",
36+
"includePath": [
37+
"${workspaceFolder}/**",
38+
"${workspaceFolder}/build/src/juce_binarydata_FontBinaryData/JuceLibraryCode/**"
39+
],
40+
"defines": [],
41+
"compilerPath": "/usr/bin/g++-13",
42+
"intelliSenseMode": "${default}",
43+
"compilerPathInCppPropertiesJson": "/usr/bin/clang",
44+
"cStandard": "c23",
45+
"cppStandard": "c++23",
46+
"mergeConfigurations": false,
47+
"browse": {
48+
"path": [
49+
"/data/development/Oscilloscope/**",
50+
"${workspaceFolder}"
51+
],
52+
"limitSymbolsToIncludedHeaders": true
53+
}
2954
}
3055
],
3156
"version": 4

.vscode/launch.json

-22
This file was deleted.

.vscode/settings.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,12 @@
112112
"semaphore": "cpp",
113113
"stdfloat": "cpp",
114114
"cfenv": "cpp",
115-
"valarray": "cpp"
115+
"valarray": "cpp",
116+
"*.ipp": "cpp",
117+
"csignal": "cpp",
118+
"strstream": "cpp",
119+
"source_location": "cpp",
120+
"csetjmp": "cpp",
121+
"expected": "cpp"
116122
}
117123
}

.vscode/tasks.json

-29
This file was deleted.

CMakeLists.txt

+10-8
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
cmake_minimum_required(VERSION 3.30)
66
project(Oscilloscope VERSION 0.1.0)
77
set(CMAKE_CXX_STANDARD 23)
8+
set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS TRUE)
89
set(EXT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external)
910
include(cmake/get_cpm.cmake)
1011

1112
# Add external dependencies
1213
CPMAddPackage(
1314
NAME JUCE
1415
GITHUB_REPOSITORY juce-framework/JUCE
15-
GIT_TAG 8.0.1
16+
GIT_TAG master
1617
SOURCE_DIR ${EXT_DIR}/juce
1718
)
1819
CPMAddPackage(
@@ -21,12 +22,6 @@ CPMAddPackage(
2122
GIT_TAG main
2223
SOURCE_DIR ${EXT_DIR}/dmt
2324
)
24-
CPMAddPackage(
25-
NAME TOMLPLUSPLUS
26-
GITHUB_REPOSITORY marzer/tomlplusplus
27-
GIT_TAG master
28-
SOURCE_DIR ${EXT_DIR}/tomlplusplus
29-
)
3025
CPMAddPackage(
3126
NAME CLAP_JUCE
3227
GITHUB_REPOSITORY free-audio/clap-juce-extensions
@@ -37,7 +32,13 @@ CPMAddPackage(
3732
NAME MELATONIN_PERFETTO
3833
GITHUB_REPOSITORY Lunix-420/melatonin_perfetto
3934
GIT_TAG main
40-
SOURCE_DIR ${EXT_DIR}/perfetto
35+
SOURCE_DIR ${EXT_DIR}/melatonin_perfetto
36+
)
37+
CPMAddPackage(
38+
NAME MELATONIN_BLUR
39+
GITHUB_REPOSITORY Lunix-420/melatonin_blur
40+
GIT_TAG main
41+
SOURCE_DIR ${EXT_DIR}/melatonin_blur
4142
)
4243

4344
# Set C++ compiler flags
@@ -49,4 +50,5 @@ endif()
4950

5051
# Silence some warnings
5152
add_definitions(-D_SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING)
53+
5254
add_subdirectory(src)

CMakePresets.json

-25
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
//=========================================================================
2-
/*
3-
Warning: This file normally doesn't allow comments.
4-
Your might get an error if your IDE doesn't support this.
5-
You can simply remove the comments to fix the error.
6-
*/
7-
//=========================================================================
81
{
92
"version": 8,
103
"cmakeMinimumRequired": {
@@ -13,8 +6,6 @@
136
"patch": 0
147
},
158
"configurePresets": [
16-
//=====================================================================
17-
// Windows Debug
189
{
1910
"name": "Windows Debug",
2011
"hidden": false,
@@ -36,8 +27,6 @@
3627
"rhs": "Windows"
3728
}
3829
},
39-
//=====================================================================
40-
// Windows Release
4130
{
4231
"name": "Windows Release",
4332
"hidden": false,
@@ -59,8 +48,6 @@
5948
"rhs": "Windows"
6049
}
6150
},
62-
//=====================================================================
63-
// Windows Perfetto
6451
{
6552
"name": "Windows Perfetto",
6653
"hidden": false,
@@ -83,8 +70,6 @@
8370
"rhs": "Windows"
8471
}
8572
},
86-
//=====================================================================
87-
// Mac Debug
8873
{
8974
"name": "Mac Debug",
9075
"hidden": false,
@@ -106,8 +91,6 @@
10691
"rhs": "Darwin"
10792
}
10893
},
109-
//=====================================================================
110-
// Mac Release
11194
{
11295
"name": "Mac Release",
11396
"hidden": false,
@@ -129,8 +112,6 @@
129112
"rhs": "Darwin"
130113
}
131114
},
132-
//=====================================================================
133-
// Linux Debug
134115
{
135116
"name": "Linux Debug",
136117
"hidden": false,
@@ -152,8 +133,6 @@
152133
"rhs": "Linux"
153134
}
154135
},
155-
//=====================================================================
156-
// Linux Release
157136
{
158137
"name": "Linux Release",
159138
"hidden": false,
@@ -175,8 +154,6 @@
175154
"rhs": "Linux"
176155
}
177156
},
178-
//=====================================================================
179-
// Linux Debug Perfetto
180157
{
181158
"name": "Linux Debug Perfetto",
182159
"hidden": false,
@@ -199,8 +176,6 @@
199176
"rhs": "Linux"
200177
}
201178
},
202-
//=====================================================================
203-
// Linux Release Perfetto
204179
{
205180
"name": "Linux Release Perfetto",
206181
"hidden": false,

0 commit comments

Comments
 (0)