summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-05-22 15:56:52 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-05-22 15:56:52 +0000
commit1e609cabf27182468e8072b9a1ca425626f94617 (patch)
tree9a363752ca9f0ebf957109ddaffb84d1d6dadac5
parent0ac3b58c4c5079f22e6bf4b0efba7f5fe99565cd (diff)
downloadmana-1e609cabf27182468e8072b9a1ca425626f94617.tar.gz
mana-1e609cabf27182468e8072b9a1ca425626f94617.tar.bz2
mana-1e609cabf27182468e8072b9a1ca425626f94617.tar.xz
mana-1e609cabf27182468e8072b9a1ca425626f94617.zip
Fixed linker error caused by missing module.
-rw-r--r--ChangeLog8
-rw-r--r--src/Makefile.am8
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 8a536e67..464895b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-22 Bjørn Lindeijer <bjorn@lindeijer.nl>
+
+ * src/Makefile.am: Fixed linker error caused by missing module.
+
2008-05-19 Bjørn Lindeijer <bjorn@lindeijer.nl>
* src/gui/setup_players.cpp, src/gui/popup_box.h, src/gui/viewport.h,
@@ -10,8 +14,8 @@
* src/net/beinghandler.cpp: Implemented interpretation of names for
NPCs and monsters.
- * src/npc.cpp, src/resources/npcdb.cpp, src/resources/npcdb.hpp: Added the
- possibility to add particle effects to NPCs in npcs.xml.
+ * src/npc.cpp, src/resources/npcdb.cpp, src/resources/npcdb.hpp: Added
+ the possibility to add particle effects to NPCs in npcs.xml.
2008-05-16 David Athay <ko2fan@gmail.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index 97767896..98c0e53e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -193,12 +193,14 @@ tmw_SOURCES = gui/widgets/resizegrip.cpp \
resources/iteminfo.cpp \
resources/mapreader.cpp \
resources/mapreader.h \
- resources/monsterdb.h \
resources/monsterdb.cpp \
- resources/monsterinfo.h \
+ resources/monsterdb.h \
resources/monsterinfo.cpp \
- resources/music.h \
+ resources/monsterinfo.h \
resources/music.cpp \
+ resources/music.h \
+ resources/npcdb.cpp \
+ resources/npcdb.h \
resources/resource.cpp \
resources/resource.h \
resources/resourcemanager.cpp \