blob: 3cc1c1248a2a97d2a9ce49a5b74ce013ff38fdf1 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
diff -ruN a/src/core/conf.cpp b/src/core/conf.cpp
--- a/src/core/conf.cpp 2020-11-15 21:26:40.000000000 +0100
+++ b/src/core/conf.cpp 2020-11-20 17:28:36.176616521 +0100
@@ -29,7 +29,7 @@
#include <cassert>
#include <string>
#include <FL/Fl.H>
-#include "deps/json/single_include/nlohmann/json.hpp"
+#include <nlohmann/json.hpp>
#include "utils/fs.h"
#include "utils/log.h"
#include "core/const.h"
@@ -315,4 +315,4 @@
ofs << j;
return true;
}
-}}} // giada::m::conf::
\ No newline at end of file
+}}} // giada::m::conf::
diff -ruN a/src/core/init.cpp b/src/core/init.cpp
--- a/src/core/init.cpp 2020-11-15 21:26:40.000000000 +0100
+++ b/src/core/init.cpp 2020-11-20 17:29:53.759248660 +0100
@@ -35,7 +35,7 @@
#include <X11/Xlib.h> // For XInitThreads
#endif
#include <FL/Fl.H>
-#include "deps/json/single_include/nlohmann/json.hpp"
+#include <nlohmann/json.hpp>
#include "gui/updater.h"
#include "utils/log.h"
#include "utils/fs.h"
diff -ruN a/src/core/midiMapConf.cpp b/src/core/midiMapConf.cpp
--- a/src/core/midiMapConf.cpp 2020-11-15 21:26:40.000000000 +0100
+++ b/src/core/midiMapConf.cpp 2020-11-20 17:28:01.216937457 +0100
@@ -30,7 +30,7 @@
#include <string>
#include <cstring>
#include <filesystem>
-#include "deps/json/single_include/nlohmann/json.hpp"
+#include <nlohmann/json.hpp>
#include "utils/string.h"
#include "utils/log.h"
#include "utils/fs.h"
diff -ruN a/src/core/patch.cpp b/src/core/patch.cpp
--- a/src/core/patch.cpp 2020-11-15 21:26:40.000000000 +0100
+++ b/src/core/patch.cpp 2020-11-20 17:30:12.475748254 +0100
@@ -26,7 +26,7 @@
#include <fstream>
-#include "deps/json/single_include/nlohmann/json.hpp"
+#include <nlohmann/json.hpp>
#include "utils/math.h"
#include "utils/log.h"
#include "core/mixer.h"
|