Hopefully fixes build errors on Linux-CI.

lilDavid · Jul 27, 2022 · e8d2b0c · e8d2b0c
1 parent 5a97e9f
commit e8d2b0c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/soh/soh/Enhancements/custom_message/CustomMessageManager.h b/soh/soh/Enhancements/custom_message/CustomMessageManager.h
@@ -1,13 +1,7 @@
 #pragma once
 #include <string>
 #include <unordered_map>
-
-
-#define NOGDI
-#define WIN32_LEAN_AND_MEAN
-
-
-#include <message_data_static.h>
+#include "z64item.h"
 
 #undef MESSAGE_END
 
@@ -20,6 +14,31 @@
 #define QM_YELLOW 0x46
 #define QM_BLACK 0x47
 
+#ifndef MESSAGE_DATA_STATIC_H
+
+typedef enum {
+    /*  0 */ TEXTBOX_TYPE_BLACK,
+    /*  1 */ TEXTBOX_TYPE_WOODEN,
+    /*  2 */ TEXTBOX_TYPE_BLUE,
+    /*  3 */ TEXTBOX_TYPE_OCARINA,
+    /*  4 */ TEXTBOX_TYPE_NONE_BOTTOM,
+    /*  5 */ TEXTBOX_TYPE_NONE_NO_SHADOW,
+    /* 11 */ TEXTBOX_TYPE_CREDITS = 11
+} TextBoxType;
+
+typedef enum {
+    /* 0 */ TEXTBOX_BG_CROSS
+} TextBoxBackground;
+
+typedef enum {
+    /* 0 */ TEXTBOX_POS_VARIABLE,
+    /* 1 */ TEXTBOX_POS_TOP,
+    /* 2 */ TEXTBOX_POS_MIDDLE,
+    /* 3 */ TEXTBOX_POS_BOTTOM
+} TextBoxPosition;
+
+#endif
+
 typedef struct {
     TextBoxType textBoxType;
     TextBoxPosition textBoxPos;

diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
@@ -57,6 +57,7 @@
 
 #include <Audio.h>
 #include <soh/Enhancements/custom_message/CustomMessageTypes.h>
+#include <functions.h>
 
 OTRGlobals* OTRGlobals::Instance;
 SaveManager* SaveManager::Instance;

diff --git a/soh/soh/z_message_OTR.cpp b/soh/soh/z_message_OTR.cpp
@@ -5,6 +5,7 @@
 #include "global.h"
 #include "vt.h"
 #include <Text.h>
+#include <message_data_static.h>
 #include <soh/Enhancements/custom_message/CustomMessageManager.h>
 #include <soh/Enhancements/custom_message/CustomMessageTypes.h>