summaryrefslogtreecommitdiff
path: root/project2/json
diff options
context:
space:
mode:
Diffstat (limited to 'project2/json')
-rw-r--r--project2/json/Jamfile.jam11
-rw-r--r--project2/json/presenter.cpp2
2 files changed, 7 insertions, 6 deletions
diff --git a/project2/json/Jamfile.jam b/project2/json/Jamfile.jam
index 92a6e28..323e4fe 100644
--- a/project2/json/Jamfile.jam
+++ b/project2/json/Jamfile.jam
@@ -1,19 +1,20 @@
-alias libxmlpp : : : :
- <cflags>"`pkg-config --cflags libxml++-2.6`"
- <linkflags>"`pkg-config --libs libxml++-2.6`" ;
+alias glibmm : : : :
+ <cflags>"`pkg-config --cflags glibmm-2.4`"
+ <linkflags>"`pkg-config --libs glibmm-2.4`"
+ ;
lib boost_filesystem : : <name>boost_filesystem ;
lib boost_date_time : : <name>boost_date_time ;
cpp-pch pch : pch.hpp :
<include>../../libmisc
- <library>libxmlpp
+ <library>glibmm
<library>../common//p2common
;
lib p2json :
pch [ glob *.cpp ]
:
<include>../libmisc
- <library>libxmlpp
+ <library>glibmm
<library>../common//p2common
<library>../uuid//p2uuid
<library>../url//p2url
diff --git a/project2/json/presenter.cpp b/project2/json/presenter.cpp
index 4afd1a0..3b069a4 100644
--- a/project2/json/presenter.cpp
+++ b/project2/json/presenter.cpp
@@ -7,7 +7,7 @@
class JsonPresenter : public MultiRowSetPresenter, public ContentPresenter, public SourceOf<json::Object> {
public:
- JsonPresenter(const xmlpp::Element *) :
+ JsonPresenter(ScriptNodePtr) :
ContentPresenter("application/json; charset=UTF-8") {
curRowSet.push(&object);
}