From c8cdb641d402fbdf94828209881c568c32c7a110 Mon Sep 17 00:00:00 2001
From: Kalamatee <kalamatee@gmail.com>
Date: Sun, 2 Apr 2017 00:39:01 +0100
Subject: [PATCH] # move the AROS specific folder icon and default.cfg
 mmakefile.src under neo/sys/aros/setup # add a comment to the top level AROS
 mmakefile.src to clarify that it is specifically for AROS.

---
 base/mmakefile.src                       |  18 ------------------
 neo/mmakefile.src                        |  10 +++++++---
 neo/sys/aros/mmakefile.src               |   2 +-
 neo/{ => sys/aros/setup}/ADoom3.info.src |   0
 neo/{ => sys/aros/setup}/ADoom3.png      | Bin
 neo/sys/aros/setup/mmakefile.src         |  20 ++++++++++++++++++++
 6 files changed, 28 insertions(+), 22 deletions(-)
 delete mode 100644 base/mmakefile.src
 rename neo/{ => sys/aros/setup}/ADoom3.info.src (100%)
 rename neo/{ => sys/aros/setup}/ADoom3.png (100%)
 create mode 100644 neo/sys/aros/setup/mmakefile.src

diff --git a/base/mmakefile.src b/base/mmakefile.src
deleted file mode 100644
index bc9e3b56..00000000
--- a/base/mmakefile.src
+++ /dev/null
@@ -1,18 +0,0 @@
-# $Id$
-
-include $(TOP)/config/make.cfg
-
-#MM- aros-doom3 : aros-doom3-defconfig
-
-#MM aros-doom3-defconfig : aros-doom3-dirs
-
-aros-doom3-defconfig:  $(AROS_CONTRIB)/Games/ADoom3/base/default.cfg
-
-$(AROS_CONTRIB)/Games/ADoom3/base/default.cfg: $(SRCDIR)/$(CURDIR)/default.cfg
-	@$(CP) $< $@
-        
-#MM
-aros-doom3-dirs :
-	%mkdirs_q $(AROS_CONTRIB)/Games/ADoom3/base
-
-%common
diff --git a/neo/mmakefile.src b/neo/mmakefile.src
index 97ef43a3..d05dffd0 100644
--- a/neo/mmakefile.src
+++ b/neo/mmakefile.src
@@ -1,9 +1,15 @@
 # Copyright © 2012-2017, Nick "Kalamatee" Andrews.
 # $Id$
 
+#
+#  This is the AROS specific top level mmakefile to build
+#  dhewm3.  It correctly configures/invokes cmake to
+#  build the AROS ARM, i386 and x86_64 ports.
+#
+
 include $(SRCDIR)/config/aros.cfg
 
-DOOM3_EXEDIR := $(AROS_CONTRIB)/Games/ADoom3
+DOOM3_EXEDIR := $(AROS_CONTRIB)/Games/Fps/ADoom3
 DOOM3_GAMEDIR := base
 
 GRAPHITE_CFLAGS := \
@@ -45,6 +51,4 @@ DOOM3_OPTIONS := -DCORE=ON -DDEDICATED=ON -DBASE=ON -DSDL2=OFF \
     	prefix="$(DOOM3_EXEDIR)"		\
 	extraoptions="$(DOOM3_OPTIONS)"
 
-%build_icons mmake=iconset-Gorilla-contrib-icons-extras-games-adoom3 icons=ADoom3 dir=$(AROS_CONTRIB)/Games
-
 %common
diff --git a/neo/sys/aros/mmakefile.src b/neo/sys/aros/mmakefile.src
index 4662d210..db7222fc 100644
--- a/neo/sys/aros/mmakefile.src
+++ b/neo/sys/aros/mmakefile.src
@@ -5,6 +5,6 @@ include $(TOP)/config/make.cfg
 
 #MM- iconset-Gorilla-contrib-games-doom3game : doom3-gorillaicons-game
 
-DOOM3_EXEDIR := $(AROS_CONTRIB)/Games/ADoom3
+DOOM3_EXEDIR := $(AROS_CONTRIB)/Games/Fps/ADoom3
 DOOM3_ICONS := ADoom3  ROE
 %build_icons mmake=doom3-gorillaicons-game icons="$(DOOM3_ICONS)" dir=$(DOOM3_EXEDIR)
diff --git a/neo/ADoom3.info.src b/neo/sys/aros/setup/ADoom3.info.src
similarity index 100%
rename from neo/ADoom3.info.src
rename to neo/sys/aros/setup/ADoom3.info.src
diff --git a/neo/ADoom3.png b/neo/sys/aros/setup/ADoom3.png
similarity index 100%
rename from neo/ADoom3.png
rename to neo/sys/aros/setup/ADoom3.png
diff --git a/neo/sys/aros/setup/mmakefile.src b/neo/sys/aros/setup/mmakefile.src
new file mode 100644
index 00000000..b6e651b5
--- /dev/null
+++ b/neo/sys/aros/setup/mmakefile.src
@@ -0,0 +1,20 @@
+# $Id$
+
+include $(TOP)/config/make.cfg
+
+#MM- aros-doom3 : aros-doom3-defconfig
+
+#MM aros-doom3-defconfig : aros-doom3-dirs
+
+aros-doom3-defconfig:  $(AROS_CONTRIB)/Games/Fps/ADoom3/base/default.cfg
+
+$(AROS_CONTRIB)/Games/ADoom3/base/default.cfg: $(SRCDIR)/$(CURDIR)/default.cfg
+	@$(CP) $< $@
+
+%build_icons mmake=iconset-Gorilla-contrib-icons-extras-games-adoom3 icons=ADoom3 dir=$(AROS_CONTRIB)/Games/Fps
+
+#MM
+aros-doom3-dirs :
+	%mkdirs_q $(AROS_CONTRIB)/Fps/Games/ADoom3/base
+
+%common