summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--data/graphics/gui/CMakeLists.txt4
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Makefile.am2
4 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index dfc5c292..b40e18dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-01 Roderic Morris <roderic@ccs.neu.edu>
+
+ * data/graphics/gui/CMakeLists.txt, src/CMakeLists.txt, src/Makefile.am:
+ Add new files to CMakeLists, add missing backslash to Makefile.
+
2008-07-01 Philipp Sehmisch <tmw@crushnet.org>
* data/gui/window.cpp, data/gui/window.hpp, data/graphics/gui/default.png,
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index 4a5ea7e5..99ddb715 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -8,8 +8,10 @@ SET (FILES
checkbox.png
close_button.png
deepbox.png
+ default.png
equip_bg.png
fixedfont.png
+ gui.xml
hits_blue.png
hits_red.png
hits_yellow.png
@@ -32,6 +34,8 @@ SET (FILES
sansserif8.png
selection.png
slider.png
+ speech_bubble.png
+ speechbubble.xml
target-cursor-blue-l.png
target-cursor-blue-m.png
target-cursor-blue-s.png
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 80d0a17a..ce322bdc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -115,6 +115,8 @@ SET(SRCS
gui/item_amount.h
gui/itemcontainer.cpp
gui/itemcontainer.h
+ gui/itempopup.cpp
+ gui/itempopup.h
gui/itemshortcutcontainer.cpp
gui/itemshortcutcontainer.h
gui/itemshortcutwindow.cpp
@@ -181,6 +183,8 @@ SET(SRCS
gui/skill.h
gui/slider.cpp
gui/slider.h
+ gui/speechbubble.cpp
+ gui/speechbubble.h
gui/status.cpp
gui/status.h
gui/textbox.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index a64cd502..2fb1f148 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -66,7 +66,7 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
gui/itemcontainer.cpp \
gui/itemcontainer.h \
gui/itempopup.cpp \
- gui/itempopup.h
+ gui/itempopup.h \
gui/itemshortcutcontainer.cpp \
gui/itemshortcutcontainer.h \
gui/itemshortcutwindow.cpp \