menu: remove _all

diff --git a/qcsrc/menu/_all.inc b/qcsrc/menu/_all.inc
deleted file mode 100644 (file)
index e5198f5..0000000
--- a/qcsrc/menu/_all.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <menu/_all.qh>
-#include "_mod.inc"
-
-#include "anim/_mod.inc"
-#include "command/_mod.inc"
-#include "item/_mod.inc"
-#include "mutators/_mod.inc"
-#include "xonotic/_mod.inc"
-
-#include <common/_all.inc>

diff --git a/qcsrc/menu/_all.qh b/qcsrc/menu/_all.qh
deleted file mode 100644 (file)
index 21f784e..0000000
--- a/qcsrc/menu/_all.qh
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#include "draw.qh"
-#include "xonotic/util.qh"
-#include "menu.qh"

diff --git a/qcsrc/menu/_mod.inc b/qcsrc/menu/_mod.inc
index e1a26e76b6449bf442fb47f18e4bd6c3892e040f..d2a8d702f16ad3241b92011889b7a52da3599bd4 100644 (file)
--- a/qcsrc/menu/_mod.inc
+++ b/qcsrc/menu/_mod.inc
@@ -3,3 +3,9 @@
 #include <menu/item.qc>
 #include <menu/matrix.qc>
 #include <menu/menu.qc>
+
+#include <menu/anim/_mod.inc>
+#include <menu/command/_mod.inc>
+#include <menu/item/_mod.inc>
+#include <menu/mutators/_mod.inc>
+#include <menu/xonotic/_mod.inc>

diff --git a/qcsrc/menu/_mod.qh b/qcsrc/menu/_mod.qh
index a5fe87d3e41a80d846a7adf98620bf622dbb1ed7..da8675831a4d8e130e66df558f7ecb102625ce5a 100644 (file)
--- a/qcsrc/menu/_mod.qh
+++ b/qcsrc/menu/_mod.qh
@@ -3,3 +3,9 @@
 #include <menu/item.qh>
 #include <menu/matrix.qh>
 #include <menu/menu.qh>
+
+#include <menu/anim/_mod.qh>
+#include <menu/command/_mod.qh>
+#include <menu/item/_mod.qh>
+#include <menu/mutators/_mod.qh>
+#include <menu/xonotic/_mod.qh>

diff --git a/qcsrc/menu/item.qh b/qcsrc/menu/item.qh
index 00dae2ed37db4ae2eb84c01977b2a78917831ebb..a5df526806e851e7777f0e6792de627881a46145 100644 (file)
--- a/qcsrc/menu/item.qh
+++ b/qcsrc/menu/item.qh
@@ -2,6 +2,8 @@
 
 // convenience
 #include "skin.qh"
+#include "draw.qh"
+#include "menu.qh"
 
 CLASS(Item, Object)
        METHOD(Item, draw, void(Item));

diff --git a/qcsrc/menu/progs.inc b/qcsrc/menu/progs.inc
index 404c6f2e5a409a588e1014849337e1133fca81fd..e5b6fb98d0f1e6ecbfd13e454d6523ad0e4acaef 100644 (file)
--- a/qcsrc/menu/progs.inc
+++ b/qcsrc/menu/progs.inc
@@ -1,7 +1,11 @@
 #include <lib/_all.inc>
 
 #if XONOTIC
-#include <menu/_all.inc>
+
+#include "_mod.inc"
+
+#include <common/_all.inc>
+
 #endif
 
 #ifdef BUILD_MOD