]>
Commit | Line | Data |
---|---|---|
3fe9f974 JB |
1 | --- mame-0.167s/src/emu/webengine.c.orig 2015-10-28 09:47:18.000000000 +0100 |
2 | +++ mame-0.167s/src/emu/webengine.c 2015-11-03 17:33:54.905526764 +0100 | |
3 | @@ -9,7 +9,7 @@ | |
4 | ***************************************************************************/\r | |
5 | \r | |
6 | #include "mongoose/mongoose.h"\r | |
7 | -#include "jsoncpp/include/json/json.h"\r | |
8 | +#include <jsoncpp/json/json.h>\r | |
9 | #include "emu.h"\r | |
10 | #include "emuopts.h"\r | |
11 | #include "ui/ui.h"\r | |
12 | --- mame-0.167s/scripts/src/3rdparty.lua.orig 2015-10-28 09:47:14.000000000 +0100 | |
13 | +++ mame-0.167s/scripts/src/3rdparty.lua 2015-11-03 17:35:43.775522156 +0100 | |
14 | @@ -435,6 +435,7 @@ | |
15 | -- jsoncpp library objects\r | |
16 | --------------------------------------------------\r | |
17 | \r | |
18 | +if _OPTIONS["with-bundled-jsoncpp"] then\r | |
19 | project "jsoncpp"\r | |
20 | uuid "ae023ff3-d712-4e54-adc5-3b56a148650f"\r | |
21 | kind "StaticLib"\r | |
22 | @@ -458,6 +459,11 @@ | |
23 | "-Wshadow"\r | |
24 | }\r | |
25 | end\r | |
26 | +else\r | |
27 | +links {\r | |
28 | + "jsoncpp",\r | |
29 | +}\r | |
30 | +end\r | |
31 | \r | |
32 | --------------------------------------------------\r | |
33 | -- SQLite3 library objects\r |