Skip to content

Commit 1a26fda

Browse files
authored
nlohmann fix for msys2 (#492)
1 parent ecdb901 commit 1a26fda

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

commandLine/src/projects/VSCodeProject.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,13 @@
99
#include "ofFileUtils.h"
1010
#include "ofLog.h"
1111
#include "Utils.h"
12+
#if !defined(TARGET_MINGW)
13+
#include <json.hpp>
14+
#else
15+
#include <nlohmann/json.hpp> // MSYS2 : use of system-installed include
16+
#endif
17+
1218

13-
#include "json.hpp"
1419
using json = nlohmann::json;
1520

1621
struct fileJson {

commandLine/src/projects/xcodeProject.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
#include "xcodeProject.h"
22
#include "Utils.h"
33
#include "ofUtils.h"
4-
#include "json.hpp"
4+
#if !defined(TARGET_MINGW)
5+
#include <json.hpp>
6+
#else
7+
#include <nlohmann/json.hpp> // MSYS2 : use of system-installed include
8+
#endif
59
#include <iostream>
610

711
using nlohmann::json;

0 commit comments

Comments
 (0)