mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adapts this branch for cmake building.

This commit is contained in:
Christopher Leggett 2022-08-08 21:14:29 -04:00
parent 59baf24dc6
commit e63d84bd7d
No known key found for this signature in database
GPG Key ID: 7093AE5FF7037D79
8 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
soh/CMakeLists.txt
View File

@ -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}) 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 set(Source_Files__soh
"soh/GbiWrap.cpp" "soh/GbiWrap.cpp"
"soh/OTRAudio.h" "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}) 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 set(Source_Files__src__boot
"src/boot/assert.c" "src/boot/assert.c"
"src/boot/boot_main.c" "src/boot/boot_main.c"
@ -1534,6 +1547,7 @@ set(ALL_FILES
${Header_Files__soh__Enhancements__debugger} ${Header_Files__soh__Enhancements__debugger}
${Header_Files__soh__Enhancements__randomizer} ${Header_Files__soh__Enhancements__randomizer}
${Header_Files__soh__Enhancements__randomizer__3drando} ${Header_Files__soh__Enhancements__randomizer__3drando}
${Header_Files__soh__Enhancements__custom_message}
${Source_Files__soh} ${Source_Files__soh}
${Source_Files__soh__Enhancements} ${Source_Files__soh__Enhancements}
${Source_Files__soh__Enhancements__cosmetics} ${Source_Files__soh__Enhancements__cosmetics}
@ -1542,6 +1556,7 @@ set(ALL_FILES
${Source_Files__soh__Enhancements__randomizer__3drando} ${Source_Files__soh__Enhancements__randomizer__3drando}
${Source_Files__soh__Enhancements__randomizer__3drando__hint_list} ${Source_Files__soh__Enhancements__randomizer__3drando__hint_list}
${Source_Files__soh__Enhancements__randomizer__3drando__location_access} ${Source_Files__soh__Enhancements__randomizer__3drando__location_access}
${Source_Files__soh__Enhancements__custom_message}
${Source_Files__src__boot} ${Source_Files__src__boot}
${Source_Files__src__buffers} ${Source_Files__src__buffers}
${Source_Files__src__code} ${Source_Files__src__code}

0
soh/soh/Enhancements/custom_message/CustomMessageManager.cpp → soh/soh/Enhancements/custom-message/CustomMessageManager.cpp
View File

2
soh/soh/Enhancements/custom_message/CustomMessageManager.h → soh/soh/Enhancements/custom-message/CustomMessageManager.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
#include "z64item.h" #include "../../../include/z64item.h"
#undef MESSAGE_END #undef MESSAGE_END

0
soh/soh/Enhancements/custom_message/CustomMessageTypes.h → soh/soh/Enhancements/custom-message/CustomMessageTypes.h
View File

4
soh/soh/Enhancements/randomizer/randomizer.cpp
View File

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

4
soh/soh/OTRGlobals.cpp
View File

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

4
soh/soh/z_message_OTR.cpp
View File

@ -6,8 +6,8 @@
#include "vt.h" #include "vt.h"
#include <Text.h> #include <Text.h>
#include <message_data_static.h> #include <message_data_static.h>
#include <soh/Enhancements/custom_message/CustomMessageManager.h> #include <soh/Enhancements/custom-message/CustomMessageManager.h>
#include <soh/Enhancements/custom_message/CustomMessageTypes.h> #include <soh/Enhancements/custom-message/CustomMessageTypes.h>
extern "C" MessageTableEntry* sNesMessageEntryTablePtr; extern "C" MessageTableEntry* sNesMessageEntryTablePtr;
extern "C" MessageTableEntry* sGerMessageEntryTablePtr; extern "C" MessageTableEntry* sGerMessageEntryTablePtr;

2
soh/src/overlays/actors/ovl_player_actor/z_player.c
View File

@ -20,7 +20,7 @@
#include "objects/gameplay_keep/gameplay_keep.h" #include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/object_link_child/object_link_child.h" #include "objects/object_link_child/object_link_child.h"
#include "textures/icon_item_24_static/icon_item_24_static.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 { typedef struct {
/* 0x00 */ u8 itemId; /* 0x00 */ u8 itemId;