Adapts this branch for cmake building.

lilDavid · Aug 9, 2022 · e63d84b · e63d84b
1 parent 59baf24
commit e63d84b
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 8 deletions.
diff --git a/soh/CMakeLists.txt b/soh/CMakeLists.txt
@@ -215,6 +215,13 @@ set(Header_Files__soh__Enhancements__randomizer__3drando
 )
 source_group("Header Files\\soh\\Enhancements\\randomizer\\3drando" FILES ${Header_Files__soh__Enhancements__randomizer__3drando})
 
+set(Header_Files__soh__Enhancements__custom_message
+    "soh/Enhancements/custom-message/CustomMessageTypes.h"
+    "soh/Enhancements/custom-message/CustomMessageManager.h"
+)
+
+source_group("Header Files\\soh\\Enhancements\\custom-message" FILES ${Header_Files__soh__Enhancements__custom_message})
+
 set(Source_Files__soh
     "soh/GbiWrap.cpp"
     "soh/OTRAudio.h"
@@ -326,6 +333,12 @@ set(Source_Files__soh__Enhancements__randomizer__3drando__location_access
 )
 source_group("Source Files\\soh\\Enhancements\\randomizer\\3drando\\location_access" FILES ${Source_Files__soh__Enhancements__randomizer__3drando__location_access})   
 
+set(Source_Files__soh__Enhancements__custom_message
+    "soh/Enhancements/custom-message/CustomMessageManager.cpp"
+)
+
+source_group("Source Files\\soh\\Enhancements\\custom-message" FILES ${Source_Files__soh__Enhancements__custom_message})
+
 set(Source_Files__src__boot
     "src/boot/assert.c"
     "src/boot/boot_main.c"
@@ -1534,6 +1547,7 @@ set(ALL_FILES
     ${Header_Files__soh__Enhancements__debugger}
     ${Header_Files__soh__Enhancements__randomizer}
     ${Header_Files__soh__Enhancements__randomizer__3drando}
+    ${Header_Files__soh__Enhancements__custom_message}
     ${Source_Files__soh}
     ${Source_Files__soh__Enhancements}
     ${Source_Files__soh__Enhancements__cosmetics}
@@ -1542,6 +1556,7 @@ set(ALL_FILES
     ${Source_Files__soh__Enhancements__randomizer__3drando}
     ${Source_Files__soh__Enhancements__randomizer__3drando__hint_list}
     ${Source_Files__soh__Enhancements__randomizer__3drando__location_access}
+    ${Source_Files__soh__Enhancements__custom_message}
     ${Source_Files__src__boot}
     ${Source_Files__src__buffers}
     ${Source_Files__src__code}

diff --git a/...s/custom_message/CustomMessageManager.cpp → ...s/custom-message/CustomMessageManager.cpp b/...s/custom_message/CustomMessageManager.cpp → ...s/custom-message/CustomMessageManager.cpp
diff --git a/...nts/custom_message/CustomMessageManager.h → ...nts/custom-message/CustomMessageManager.h b/...nts/custom_message/CustomMessageManager.h → ...nts/custom-message/CustomMessageManager.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <string>
 #include <unordered_map>
-#include "z64item.h"
+#include "../../../include/z64item.h"
 
 #undef MESSAGE_END
 

diff --git a/...ments/custom_message/CustomMessageTypes.h → ...ments/custom-message/CustomMessageTypes.h b/...ments/custom_message/CustomMessageTypes.h → ...ments/custom-message/CustomMessageTypes.h
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -13,8 +13,8 @@
 #include "3drando/rando_main.hpp"
 #include <soh/Enhancements/debugger/ImGuiHelpers.h>
 #include "Lib/ImGui/imgui_internal.h"
-#include <soh/Enhancements/custom_message/CustomMessageManager.h>
-#include <soh/Enhancements/custom_message/CustomMessageTypes.h>
+#include <soh/Enhancements/custom-message/CustomMessageManager.h>
+#include <soh/Enhancements/custom-message/CustomMessageTypes.h>
 
 using json = nlohmann::json;
 using namespace std::literals::string_literals;

diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
@@ -39,7 +39,7 @@
 #include "macros.h"
 #include <Utils/StringHelper.h>
 #include "Hooks.h"
-#include <soh/Enhancements/custom_message/CustomMessageManager.h>
+#include <soh/Enhancements/custom-message/CustomMessageManager.h>
 
 #ifdef __APPLE__
 #include <SDL_scancode.h>
@@ -52,7 +52,7 @@
 #endif
 
 #include <Audio.h>
-#include <soh/Enhancements/custom_message/CustomMessageTypes.h>
+#include <soh/Enhancements/custom-message/CustomMessageTypes.h>
 #include <functions.h>
 
 OTRGlobals* OTRGlobals::Instance;

diff --git a/soh/soh/z_message_OTR.cpp b/soh/soh/z_message_OTR.cpp
@@ -6,8 +6,8 @@
 #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>
+#include <soh/Enhancements/custom-message/CustomMessageManager.h>
+#include <soh/Enhancements/custom-message/CustomMessageTypes.h>
 
 extern "C" MessageTableEntry* sNesMessageEntryTablePtr;
 extern "C" MessageTableEntry* sGerMessageEntryTablePtr;

diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -20,7 +20,7 @@
 #include "objects/gameplay_keep/gameplay_keep.h"
 #include "objects/object_link_child/object_link_child.h"
 #include "textures/icon_item_24_static/icon_item_24_static.h"
-#include "../../../../soh/Enhancements/custom_message/CustomMessageTypes.h"
+#include <soh/Enhancements/custom-message/CustomMessageTypes.h>
 
 typedef struct {
     /* 0x00 */ u8 itemId;