summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Steinbrink <B.Steinbrink@gmx.de>2005-07-17 22:10:16 +0000
committerBjörn Steinbrink <B.Steinbrink@gmx.de>2005-07-17 22:10:16 +0000
commit19b58f22f7e77382183c70d2b6a1c79b5e1584e7 (patch)
treee2072e7eb9903cf6664cf364c328f110635538eb
parent35b1b1f16978017a39e0951c9ee74115567a0407 (diff)
downloadmana-19b58f22f7e77382183c70d2b6a1c79b5e1584e7.tar.gz
mana-19b58f22f7e77382183c70d2b6a1c79b5e1584e7.tar.bz2
mana-19b58f22f7e77382183c70d2b6a1c79b5e1584e7.tar.xz
mana-19b58f22f7e77382183c70d2b6a1c79b5e1584e7.zip
Updated Makefile.am to reflect the name change of gui/equipmentwindow.*. Also fixed an #include for that header.
-rw-r--r--src/Makefile.am6
-rw-r--r--src/gui/status.cpp2
2 files changed, 3 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index e5cd02f3..dd2711ca 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,3 @@
-AUTOMAKE_OPTIONS = subdir-objects
-
bin_PROGRAMS = tmw
tmw_SOURCES = graphic/spriteset.cpp \
graphic/spriteset.h \
@@ -27,8 +25,8 @@ tmw_SOURCES = graphic/spriteset.cpp \
gui/checkbox.h \
gui/confirm_dialog.cpp \
gui/confirm_dialog.h \
- gui/equipment.cpp \
- gui/equipment.h \
+ gui/equipmentwindow.cpp \
+ gui/equipmentwindow.h \
gui/focushandler.cpp \
gui/focushandler.h \
gui/gui.cpp \
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index 604f6abf..4cb4f010 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -25,7 +25,7 @@
#include "stats.h"
#include "inventory.h"
#include "setup.h"
-#include "equipment.h"
+#include "equipmentwindow.h"
#include "button.h"
#include "../playerinfo.h"