WAGE: Renamed menu.* to macmenu.*

scummvm · Apr 28, 2016 · 367946f · 367946f
1 parent 608a74b
commit 367946f
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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 → engines/wage/macmenu.cpp b/engines/wage/menu.cpp → 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 → engines/wage/macmenu.h b/engines/wage/menu.h → 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
@@ -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
@@ -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 \