aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/wage/gui-console.cpp2
-rw-r--r--engines/wage/gui.cpp2
-rw-r--r--engines/wage/macmenu.cpp (renamed from engines/wage/menu.cpp)2
-rw-r--r--engines/wage/macmenu.h (renamed from engines/wage/menu.h)4
-rw-r--r--engines/wage/macwindowmanager.cpp2
-rw-r--r--engines/wage/module.mk2
6 files changed, 7 insertions, 7 deletions
diff --git a/engines/wage/gui-console.cpp b/engines/wage/gui-console.cpp
index 0609b4f35c..9c89c2721f 100644
--- a/engines/wage/gui-console.cpp
+++ b/engines/wage/gui-console.cpp
@@ -56,7 +56,7 @@
#include "wage/design.h"
#include "wage/entities.h"
#include "wage/macwindow.h"
-#include "wage/menu.h"
+#include "wage/macmenu.h"
#include "wage/gui.h"
#include "wage/world.h"
diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp
index 7752f2d7c3..e3e7ccfcf7 100644
--- a/engines/wage/gui.cpp
+++ b/engines/wage/gui.cpp
@@ -57,7 +57,7 @@
#include "wage/gui.h"
#include "wage/macwindow.h"
#include "wage/macwindowmanager.h"
-#include "wage/menu.h"
+#include "wage/macmenu.h"
#include "wage/world.h"
namespace Wage {
diff --git a/engines/wage/menu.cpp b/engines/wage/macmenu.cpp
index 6a677fda5c..8dee8eba18 100644
--- a/engines/wage/menu.cpp
+++ b/engines/wage/macmenu.cpp
@@ -52,7 +52,7 @@
#include "wage/entities.h"
#include "wage/design.h"
#include "wage/gui.h"
-#include "wage/menu.h"
+#include "wage/macmenu.h"
#include "wage/world.h"
namespace Wage {
diff --git a/engines/wage/menu.h b/engines/wage/macmenu.h
index 7e8e9d966e..0ad99a458c 100644
--- a/engines/wage/menu.h
+++ b/engines/wage/macmenu.h
@@ -45,8 +45,8 @@
*
*/
-#ifndef WAGE_MENU_H
-#define WAGE_MENU_H
+#ifndef WAGE_MACMENU_H
+#define WAGE_MACMENU_H
namespace Wage {
diff --git a/engines/wage/macwindowmanager.cpp b/engines/wage/macwindowmanager.cpp
index 402350d2fa..66c5bf173c 100644
--- a/engines/wage/macwindowmanager.cpp
+++ b/engines/wage/macwindowmanager.cpp
@@ -59,7 +59,7 @@
#include "wage/gui.h"
#include "wage/macwindow.h"
#include "wage/macwindowmanager.h"
-#include "wage/menu.h"
+#include "wage/macmenu.h"
namespace Wage {
diff --git a/engines/wage/module.mk b/engines/wage/module.mk
index d65934fc2b..e150d5f27e 100644
--- a/engines/wage/module.mk
+++ b/engines/wage/module.mk
@@ -9,9 +9,9 @@ MODULE_OBJS := \
entities.o \
gui.o \
gui-console.o \
+ macmenu.o \
macwindow.o \
macwindowmanager.o \
- menu.o \
randomhat.o \
script.o \
sound.o \