summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-06-03 19:02:50 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-06-03 19:03:24 (GMT)
commitcbbd005dba6f4b105a74f81c44654bb957dd044e (patch)
tree4ef5a7abed56d32c4752eecd395dfa402360894d /Swiften
parent3dd69f2f852953638b220352b0eeee10464da5d8 (diff)
downloadswift-contrib-cbbd005dba6f4b105a74f81c44654bb957dd044e.zip
swift-contrib-cbbd005dba6f4b105a74f81c44654bb957dd044e.tar.bz2
Added bundled Expat.
Diffstat (limited to 'Swiften')
-rw-r--r--Swiften/EventLoop/MainEventLoop.cpp1
-rw-r--r--Swiften/QA/ClientTest/Makefile.inc4
-rw-r--r--Swiften/QA/NetworkTest/Makefile.inc4
-rw-r--r--Swiften/QA/UnitTest/Makefile.inc4
4 files changed, 7 insertions, 6 deletions
diff --git a/Swiften/EventLoop/MainEventLoop.cpp b/Swiften/EventLoop/MainEventLoop.cpp
index afaab42..c306d3f 100644
--- a/Swiften/EventLoop/MainEventLoop.cpp
+++ b/Swiften/EventLoop/MainEventLoop.cpp
@@ -1,6 +1,7 @@
#include "Swiften/EventLoop/MainEventLoop.h"
#include <iostream>
+#include <typeinfo>
namespace Swift {
diff --git a/Swiften/QA/ClientTest/Makefile.inc b/Swiften/QA/ClientTest/Makefile.inc
index d01ccf8..08a9b5b 100644
--- a/Swiften/QA/ClientTest/Makefile.inc
+++ b/Swiften/QA/ClientTest/Makefile.inc
@@ -8,8 +8,8 @@ TEST_TARGETS += ClientTest
CLEANFILES += $(CLIENTTEST_OBJECTS) $(CLIENTTEST_TARGET)
-$(CLIENTTEST_TARGET): $(SWIFTEN_TARGET) $(CLIENTTEST_OBJECTS)
- $(QUIET_LINK)$(CXX) -o $(CLIENTTEST_TARGET) $(CLIENTTEST_OBJECTS) $(LDFLAGS) $(CPPCLIENT_LDFLAGS) $(SWIFTEN_TARGET) $(LIBS)
+$(CLIENTTEST_TARGET): $(SWIFTEN_TARGET) $(CLIENTTEST_OBJECTS) $(BUNDLED_LIBS)
+ $(QUIET_LINK)$(CXX) -o $(CLIENTTEST_TARGET) $(CLIENTTEST_OBJECTS) $(LDFLAGS) $(CPPCLIENT_LDFLAGS) $(SWIFTEN_TARGET) $(BUNDLED_LIBS) $(LIBS)
.PHONY: ClientTest
ClientTest: $(CLIENTTEST_TARGET)
diff --git a/Swiften/QA/NetworkTest/Makefile.inc b/Swiften/QA/NetworkTest/Makefile.inc
index 6924a70..3638f2f 100644
--- a/Swiften/QA/NetworkTest/Makefile.inc
+++ b/Swiften/QA/NetworkTest/Makefile.inc
@@ -10,8 +10,8 @@ TEST_TARGETS += NetworkTest
CLEANFILES += $(NETWORKTEST_OBJECTS) $(NETWORKTEST_TARGET)
-$(NETWORKTEST_TARGET): $(SWIFTEN_TARGET) $(CPPUNIT_TARGET) $(NETWORKTEST_OBJECTS)
- $(QUIET_LINK)$(CXX) -o $(NETWORKTEST_TARGET) $(NETWORKTEST_OBJECTS) $(LDFLAGS) $(CPPNETWORK_LDFLAGS) $(SWIFTEN_TARGET) $(CPPUNIT_TARGET) $(LIBS)
+$(NETWORKTEST_TARGET): $(SWIFTEN_TARGET) $(CPPUNIT_TARGET) $(NETWORKTEST_OBJECTS) $(BUNDLED_LIBS)
+ $(QUIET_LINK)$(CXX) -o $(NETWORKTEST_TARGET) $(NETWORKTEST_OBJECTS) $(LDFLAGS) $(CPPNETWORK_LDFLAGS) $(SWIFTEN_TARGET) $(CPPUNIT_TARGET) $(BUNDLED_LIBS) $(LIBS)
.PHONY: NetworkTest
NetworkTest: $(NETWORKTEST_TARGET)
diff --git a/Swiften/QA/UnitTest/Makefile.inc b/Swiften/QA/UnitTest/Makefile.inc
index 5b456db..7f31da3 100644
--- a/Swiften/QA/UnitTest/Makefile.inc
+++ b/Swiften/QA/UnitTest/Makefile.inc
@@ -12,6 +12,6 @@ CLEANFILES += $(UNITTEST_OBJECTS) $(UNITTEST_TARGET)
check: $(UNITTEST_TARGET)
$(TEST_RUNNER) ./$(UNITTEST_TARGET)
-$(UNITTEST_TARGET): $(SWIFTEN_TARGET) $(CPPUNIT_TARGET) $(UNITTEST_OBJECTS)
- $(QUIET_LINK)$(CXX) -o $(UNITTEST_TARGET) $(UNITTEST_OBJECTS) $(LDFLAGS) $(SWIFTEN_TARGET) $(CPPUNIT_TARGET) $(LIBS)
+$(UNITTEST_TARGET): $(SWIFTEN_TARGET) $(CPPUNIT_TARGET) $(UNITTEST_OBJECTS) $(BUNDLED_LIBS)
+ $(QUIET_LINK)$(CXX) -o $(UNITTEST_TARGET) $(UNITTEST_OBJECTS) $(LDFLAGS) $(SWIFTEN_TARGET) $(CPPUNIT_TARGET) $(BUNDLED_LIBS) $(LIBS)