summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-06-30 09:12:16 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-06-30 09:12:16 +0000
commitcf5cfbcb8ff63005b1e08f9718ce3f80f919271e (patch)
treeedc73c162e1b636f2f9571f46e9882845122958c
parent4dbc9b7af344d3ff006a40e3e0c06ce160f365f9 (diff)
downloadmana-cf5cfbcb8ff63005b1e08f9718ce3f80f919271e.tar.gz
mana-cf5cfbcb8ff63005b1e08f9718ce3f80f919271e.tar.bz2
mana-cf5cfbcb8ff63005b1e08f9718ce3f80f919271e.tar.xz
mana-cf5cfbcb8ff63005b1e08f9718ce3f80f919271e.zip
Updated CMake file to fix compilation. Patch by darkKnight.
-rw-r--r--ChangeLog11
-rw-r--r--src/CMakeLists.txt8
2 files changed, 16 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 160e3b58..759af38a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-30 Bjørn Lindeijer <bjorn@lindeijer.nl>
+
+ * src/CMakeLists.txt: Updated CMake file to fix compilation. Patch by
+ darkKnight.
+
2008-06-24 Philipp Sehmisch <tmw@crushnet.org>
* src/particle.cpp, src/particle.h, src/particleemitter.cpp,
@@ -108,7 +113,7 @@
* src/gui/popupmenu.cpp: Applied QOAL's patch to fix popup bug.
-2008-05-14 fate <fate.tmw@googlemail.com>
+2008-05-14 Fate <fate.tmw@googlemail.com>
* src/configuration.cpp, src/game.cpp, src/player_relations.h,
src/beingmanager.h, src/gui/setup_players.cpp, src/gui/setup.cpp,
@@ -183,8 +188,8 @@
2008-04-26 Dennis Friis <peavey@placid.dk>
- * src/inventory.cpp: Avoid stacking equipment other than arrows. Based on
- similar fix in inventoryhandler.
+ * src/inventory.cpp: Avoid stacking equipment other than arrows. Based
+ on similar fix in inventoryhandler.
* src/gui/trade.cpp: Text fix, z => GP.
* src/net/playerhandler.cpp: When picking up GP from trade or quest,
tell the user in the chat window like with items.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0c2ef4cd..20f2f761 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -148,6 +148,8 @@ SET(SRCS
gui/setup_joystick.h
gui/setup_keyboard.cpp
gui/setup_keyboard.h
+ gui/setup_players.cpp
+ gui/setup_players.h
gui/setuptab.h
gui/setup_video.cpp
gui/setup_video.h
@@ -163,6 +165,10 @@ SET(SRCS
gui/status.h
gui/tabbedcontainer.cpp
gui/tabbedcontainer.h
+ gui/table.cpp
+ gui/table.h
+ gui/table_model.cpp
+ gui/table_model.h
gui/textbox.cpp
gui/textbox.h
gui/textfield.cpp
@@ -324,6 +330,8 @@ SET(SRCS
particleemitter.h
player.cpp
player.h
+ player_relations.cpp
+ player_relations.h
properties.h
serverinfo.h
shopitem.cpp