summaryrefslogtreecommitdiff
path: root/soh/include
diff options
context:
space:
mode:
authorbriaguya <70942617+briaguya0@users.noreply.github.com>2025-10-09 19:50:51 -0400
committerGitHub <noreply@github.com>2025-10-09 16:50:51 -0700
commit57c368aa2c7ecb2c7d85f1f52ea7c0ea7d5c2d69 (patch)
tree8de6f16c10b94f66b5c2a6231c1c4c961b2c68a7 /soh/include
parent7700b34646abc7e5edb83f0d2a7d0f8ad52e3419 (diff)
update lus includes for new LUS file structure (#5820)
* Bump LUS to include FileDropMgr's new registration system and initial cursor visibility changes. * New LUS ref. * Remove default on for cursor always visible. Add option to camera controls next to enable mouse input for autocapture. Set autocapture on startup. * next LUS * clang again * Add "EnableMouse" CVar check to startup SetAutoCaptureMouse. * Back to LUS main. * lus version with fixes we need * very wip * get it building * soh otr * bump lus before fixing soh side stuff * build * still builds * mac error * bump otrexporter * bump to lus main * upstream otrexporter --------- Co-authored-by: Malkierian <malkierian@gmail.com> Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Diffstat (limited to 'soh/include')
-rw-r--r--soh/include/functions.h2
-rw-r--r--soh/include/macros.h2
-rw-r--r--soh/include/z64audio.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/soh/include/functions.h b/soh/include/functions.h
index 8deb36953..75797401e 100644
--- a/soh/include/functions.h
+++ b/soh/include/functions.h
@@ -10,7 +10,7 @@ extern "C"
{
#endif
-#include "luslog.h"
+#include <libultraship/log/luslog.h>
#include <soh/Enhancements/item-tables/ItemTableTypes.h>
#if defined(INCLUDE_GAME_PRINTF) && defined(_DEBUG)
diff --git a/soh/include/macros.h b/soh/include/macros.h
index 325fb91b6..acac5cd49 100644
--- a/soh/include/macros.h
+++ b/soh/include/macros.h
@@ -1,7 +1,7 @@
#ifndef MACROS_H
#define MACROS_H
-#include <endianness.h>
+#include <ship/utils/binarytools/endianness.h>
// Upstream TODO: Document reasoning for change
// #ifndef __GNUC__
diff --git a/soh/include/z64audio.h b/soh/include/z64audio.h
index c562b820f..cbd82fcf2 100644
--- a/soh/include/z64audio.h
+++ b/soh/include/z64audio.h
@@ -5,7 +5,7 @@
extern "C" {
#endif
-#include <endianness.h>
+#include <ship/utils/binarytools/endianness.h>
#define MK_CMD(b0,b1,b2,b3) ((((b0) & 0xFF) << 0x18) | (((b1) & 0xFF) << 0x10) | (((b2) & 0xFF) << 0x8) | (((b3) & 0xFF) << 0))