cleanup lutris list headersdev

8 files changed, 45 insertions, 36 deletions

diff --git a/src/lutris.h b/src/lutris.h
index b9a2b37..dfadf81 100644
--- a/src/lutris.h
+++ b/src/lutris.h
@@ -6,6 +6,7 @@
 
 #define VARIABLESIGN '$'
 
+#include "lutris/pre.h"
 #include "lutris/enum.h"
 enum keyword_t {
     #include "lutris/keyword.h"
@@ -27,7 +28,6 @@ enum runner_t {
 
     RUNNERMAX
 };
-
 #include "lutris/array.h"
 static const char keywordstr[KEYWORDMAX][0xF] = {
     #include "lutris/keyword.h"
@@ -43,7 +43,7 @@ static const char runnerStr[RUNNERMAX][0xF] =
 {
     #include "lutris/runner.h"
 };
-
+#include "lutris/post.h"
 
 enum errors {
     NONE,
diff --git a/src/lutris/array.h b/src/lutris/array.h
index 82ed84b..df0a48b 100644
--- a/src/lutris/array.h
+++ b/src/lutris/array.h
@@ -1,5 +1,5 @@
-#ifdef CREATE_ENUM
-#undef CREATE_ENUM
+#ifdef VAL
+#undef VAL
 #endif
 
-#define CREATE_ENUM(x) #x,
+#define VAL(x) #x,
diff --git a/src/lutris/enum.h b/src/lutris/enum.h
index 9abac9f..2784223 100644
--- a/src/lutris/enum.h
+++ b/src/lutris/enum.h
@@ -1,5 +1,5 @@
-#ifdef CREATE_ENUM
-#undef CREATE_ENUM
+#ifdef VAL
+#undef VAL
 #endif
 
-#define CREATE_ENUM(x) x,
+#define VAL(x) x,
diff --git a/src/lutris/keyword.h b/src/lutris/keyword.h
index ed14cbd..ddaf3d5 100644
--- a/src/lutris/keyword.h
+++ b/src/lutris/keyword.h
@@ -1,12 +1,12 @@
-CREATE_ENUM(move)
-CREATE_ENUM(merge)
-CREATE_ENUM(extract)
-CREATE_ENUM(copy)
-CREATE_ENUM(chmodx)
-CREATE_ENUM(execute)
-CREATE_ENUM(write_file)
-CREATE_ENUM(write_config)
-CREATE_ENUM(write_json)
-CREATE_ENUM(input_menu)
-CREATE_ENUM(insert_disc)
-CREATE_ENUM(task)
+VAL(move)
+VAL(merge)
+VAL(extract)
+VAL(copy)
+VAL(chmodx)
+VAL(execute)
+VAL(write_file)
+VAL(write_config)
+VAL(write_json)
+VAL(input_menu)
+VAL(insert_disc)
+VAL(task)
diff --git a/src/lutris/post.h b/src/lutris/post.h
new file mode 100644
index 0000000..0b4c3a9
--- /dev/null
+++ b/src/lutris/post.h
@@ -0,0 +1,9 @@
+
+#ifdef _linux
+#define linux _linux
+#undef _linux
+#endif
+
+#ifdef VAL
+#undef VAL
+#endif
diff --git a/src/lutris/pre.h b/src/lutris/pre.h
new file mode 100644
index 0000000..4507854
--- /dev/null
+++ b/src/lutris/pre.h
@@ -0,0 +1,8 @@
+// do some leg work ahead of time
+
+// linux is already a macro
+// but we want it as a keyword
+#ifdef linux
+#define _linux linux
+#undef linux
+#endif
diff --git a/src/lutris/runner.h b/src/lutris/runner.h
index d095b1b..ffb6722 100644
--- a/src/lutris/runner.h
+++ b/src/lutris/runner.h
@@ -1,11 +1,3 @@
-CREATE_ENUM(unknown_runner)
-CREATE_ENUM(wine)
-#ifdef linux
-#define _linux linux
-#undef linux
-#endif
-CREATE_ENUM(linux)
-#ifdef _linux
-#define linux _linux
-#undef _linux
-#endif
+VAL(unknown_runner)
+VAL(wine)
+VAL(linux)
diff --git a/src/lutris/task.h b/src/lutris/task.h
index bca95a4..e7048a8 100644
--- a/src/lutris/task.h
+++ b/src/lutris/task.h
@@ -1,5 +1,5 @@
-CREATE_ENUM(wineexec)
-CREATE_ENUM(winetricks)
-CREATE_ENUM(create_prefix)
-CREATE_ENUM(set_regedit)
-CREATE_ENUM(winekill)
+VAL(wineexec)
+VAL(winetricks)
+VAL(create_prefix)
+VAL(set_regedit)
+VAL(winekill)