From e63d84bd7dc57b8d420ae6e548cdc832b746b126 Mon Sep 17 00:00:00 2001 From: Christopher Leggett Date: Mon, 8 Aug 2022 21:14:29 -0400 Subject: [PATCH] Adapts this branch for cmake building. --- soh/CMakeLists.txt | 15 +++++++++++++++ .../CustomMessageManager.cpp | 0 .../CustomMessageManager.h | 2 +- .../CustomMessageTypes.h | 0 soh/soh/Enhancements/randomizer/randomizer.cpp | 4 ++-- soh/soh/OTRGlobals.cpp | 4 ++-- soh/soh/z_message_OTR.cpp | 4 ++-- .../overlays/actors/ovl_player_actor/z_player.c | 2 +- 8 files changed, 23 insertions(+), 8 deletions(-) rename soh/soh/Enhancements/{custom_message => custom-message}/CustomMessageManager.cpp (100%) rename soh/soh/Enhancements/{custom_message => custom-message}/CustomMessageManager.h (99%) rename soh/soh/Enhancements/{custom_message => custom-message}/CustomMessageTypes.h (100%) diff --git a/soh/CMakeLists.txt b/soh/CMakeLists.txt index 67d5db850..5342374f0 100644 --- 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/soh/soh/Enhancements/custom_message/CustomMessageManager.cpp b/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp similarity index 100% rename from soh/soh/Enhancements/custom_message/CustomMessageManager.cpp rename to soh/soh/Enhancements/custom-message/CustomMessageManager.cpp diff --git a/soh/soh/Enhancements/custom_message/CustomMessageManager.h b/soh/soh/Enhancements/custom-message/CustomMessageManager.h similarity index 99% rename from soh/soh/Enhancements/custom_message/CustomMessageManager.h rename to soh/soh/Enhancements/custom-message/CustomMessageManager.h index c5590dc00..0681073b8 100644 --- a/soh/soh/Enhancements/custom_message/CustomMessageManager.h +++ b/soh/soh/Enhancements/custom-message/CustomMessageManager.h @@ -1,7 +1,7 @@ #pragma once #include #include -#include "z64item.h" +#include "../../../include/z64item.h" #undef MESSAGE_END diff --git a/soh/soh/Enhancements/custom_message/CustomMessageTypes.h b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h similarity index 100% rename from soh/soh/Enhancements/custom_message/CustomMessageTypes.h rename to soh/soh/Enhancements/custom-message/CustomMessageTypes.h diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index 18e73c230..eaf9f3098 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -13,8 +13,8 @@ #include "3drando/rando_main.hpp" #include #include "Lib/ImGui/imgui_internal.h" -#include -#include +#include +#include using json = nlohmann::json; using namespace std::literals::string_literals; diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp index 6470a49b3..ba61805f0 100644 --- a/soh/soh/OTRGlobals.cpp +++ b/soh/soh/OTRGlobals.cpp @@ -39,7 +39,7 @@ #include "macros.h" #include #include "Hooks.h" -#include +#include #ifdef __APPLE__ #include @@ -52,7 +52,7 @@ #endif #include -#include +#include #include OTRGlobals* OTRGlobals::Instance; diff --git a/soh/soh/z_message_OTR.cpp b/soh/soh/z_message_OTR.cpp index 4fd74e497..c6be43964 100644 --- a/soh/soh/z_message_OTR.cpp +++ b/soh/soh/z_message_OTR.cpp @@ -6,8 +6,8 @@ #include "vt.h" #include #include -#include -#include +#include +#include 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 index 17b738949..139c8a6e0 100644 --- 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 typedef struct { /* 0x00 */ u8 itemId;