diff options
| author | Térence Clastres | 2020-11-29 12:55:41 +0100 |
|---|---|---|
| committer | Térence Clastres | 2020-11-29 13:10:55 +0100 |
| commit | 6e95e3ed20f57d6bbc84e0c51b5abe7280dbe2d8 (patch) | |
| tree | f4f7f3df0d2e02a0b538c780b6d6bb724cd88c29 /giada-git-devendor_nlohmann_json.patch | |
| parent | 740f9ed7a0c5806c3b97f82170f53ef1fc5b0d01 (diff) | |
| download | aur-6e95e3ed20f57d6bbc84e0c51b5abe7280dbe2d8.tar.gz | |
Fix build
- Sync with community/giada
- Add vst2/3 support
- Remove unneeded gcc9 fix
- Allow rebuilding without --cleanbuild option
Diffstat (limited to 'giada-git-devendor_nlohmann_json.patch')
| -rw-r--r-- | giada-git-devendor_nlohmann_json.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/giada-git-devendor_nlohmann_json.patch b/giada-git-devendor_nlohmann_json.patch new file mode 100644 index 000000000000..3cc1c1248a2a --- /dev/null +++ b/giada-git-devendor_nlohmann_json.patch @@ -0,0 +1,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" |