Merge branch 'develop' of github.com:Malkierian/Ghostship into imgui-extract

Author: Malkierian

.github/workflows/main.yml

@@ -208,7 +208,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y ninja-build
           sudo apt-get remove -y cmake
-          git -C libultraship remote add nx https://github.com/Net64DD/libultraship.git
+          git -C libultraship remote add nx https://github.com/YoshiCrystal9/libultraship.git
           git -C libultraship fetch nx
           git -C libultraship checkout nx/main-nx
           wget https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3-linux-x86_64.sh -O /tmp/cmake.sh

.github/workflows/switch.yml

@@ -16,7 +16,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y ninja-build
           sudo apt-get remove -y cmake
-          git -C libultraship remote add nx https://github.com/Net64DD/libultraship.git
+          git -C libultraship remote add nx https://github.com/YoshiCrystal9/libultraship.git
           git -C libultraship fetch nx
           git -C libultraship checkout nx/main-nx
           wget https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3-linux-x86_64.sh -O /tmp/cmake.sh

CMakeLists.txt

@@ -136,6 +136,10 @@ set(CMAKE_C_FLAGS_DEBUG "-g -ffast-math -DDEBUG")
 set(CMAKE_CXX_FLAGS_DEBUG "-g -ffast-math -DDEBUG")
 set(CMAKE_C_FLAGS_RELEASE "-O3 -ffast-math -DNDEBUG")
 set(CMAKE_CXX_FLAGS_RELEASE "-O3 -ffast-math -DNDEBUG")
+add_compile_definitions(
+    _LARGEFILE64_SOURCE=1
+    _POSIX_C_SOURCE=200809L
+)
 else()
 set(CMAKE_C_FLAGS_RELEASE "-O1 -DNDEBUG")
 set(CMAKE_CXX_FLAGS_RELEASE "-O1 -DNDEBUG")
@@ -153,7 +157,6 @@ add_compile_definitions(
     ENABLE_RUMBLE=1
     F3D_OLD=1
     F3D_GBI=1
-    USE_GBI_TRACE=1
     GBI_FLOATS=1
     _LANGUAGE_C
     _USE_MATH_DEFINES
@@ -300,13 +303,27 @@ endif()
 # Libultraship Integration                                                     #
 #==============================================================================#
 
+# Removes MPQ/OTR support
+set(EXCLUDE_MPQ_SUPPORT TRUE CACHE BOOL "")
+set(ENABLE_EXP_AUTO_CONFIGURE_CONTROLLERS ON CACHE BOOL "")
+add_compile_definitions(EXCLUDE_MPQ_SUPPORT)
+
+if(CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch")
+    find_package(SDL2)
+endif()
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/include/libultraship
+  ${SDL2_INCLUDE_DIRS}
+  ${GLEW_INCLUDE_DIRS}
+  ${dr_libs_SOURCE_DIR}
+)
+
 add_subdirectory(libultraship ${CMAKE_CURRENT_SOURCE_DIR}/libultraship)
 add_dependencies(${PROJECT_NAME} libultraship)
 target_link_libraries(${PROJECT_NAME} PRIVATE libultraship)
-target_include_directories(${PROJECT_NAME} PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/include/libultraship
-)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "iOS")
     get_property(IOS_TOOLCHAIN_FILE GLOBAL PROPERTY IOS_TOOLCHAIN_FILE)
@@ -397,19 +414,7 @@ if(USE_NETWORKING)
     target_compile_definitions(${PROJECT_NAME} PRIVATE USE_NETWORKING)
 endif()
 
-option(USE_STANDALONE "Build as a standalone executable" OFF)
-option(BUILD_STORMLIB "Build with StormLib support" OFF)
-
-option(BUILD_SM64 "Build with Super Mario 64 support" ON)
-option(BUILD_MK64 "Build with Mario Kart 64 support" OFF)
-option(BUILD_SF64 "Build with Star Fox 64 support" OFF)
-option(BUILD_FZERO "Build with F-Zero X support" OFF)
-option(BUILD_MARIO_ARTIST "Build with Mario Artist support" OFF)
-add_subdirectory(Torch)
-target_link_libraries(${PROJECT_NAME} PRIVATE torch "${ADDITIONAL_LIBRARY_DEPENDENCIES}")
-
 if(CMAKE_SYSTEM_NAME MATCHES "NintendoSwitch")
-
 nx_generate_nacp(${PROJECT_NAME}.nacp
    NAME "${PROJECT_NAME}"
    AUTHOR "${PROJECT_TEAM}"
@@ -422,8 +427,20 @@ nx_create_nro(${PROJECT_NAME}
 )
 
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.nro DESTINATION . COMPONENT ${PROJECT_NAME})
+else()
+option(USE_STANDALONE "Build as a standalone executable" OFF)
+option(BUILD_STORMLIB "Build with StormLib support" OFF)
+
+option(BUILD_SM64 "Build with Super Mario 64 support" ON)
+option(BUILD_MK64 "Build with Mario Kart 64 support" OFF)
+option(BUILD_SF64 "Build with Star Fox 64 support" OFF)
+option(BUILD_FZERO "Build with F-Zero X support" OFF)
+option(BUILD_MARIO_ARTIST "Build with Mario Artist support" OFF)
+add_subdirectory(Torch)
+list(APPEND ADDITIONAL_LIBRARY_DEPENDENCIES torch)
 endif()
 
+target_link_libraries(${PROJECT_NAME} PRIVATE "${ADDITIONAL_LIBRARY_DEPENDENCIES}")
 ################################################################################
 # Compile and link options
 ################################################################################
@@ -518,7 +535,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
           -Wno-missing-braces
           -Wno-int-conversion
           $<$<COMPILE_LANGUAGE:C>:
-              -Werror-implicit-function-declaration
+              -Wno-implicit-function-declaration
               -Wno-incompatible-pointer-types
               -fpermissive
           >

include/macros.h

@@ -47,6 +47,12 @@
 #define ALIGNED16
 #endif
 
+#define ROUND_UP_64(v) (((v) + 63) & ~63)
+#define ROUND_UP_32(v) (((v) + 31) & ~31)
+#define ROUND_UP_16(v) (((v) + 15) & ~15)
+#define ROUND_UP_8(v) (((v) + 7) & ~7)
+#define ROUND_DOWN_16(v) ((v) & ~0xf)
+
 // no conversion needed other than cast
 #define VIRTUAL_TO_PHYSICAL(addr)   ((uintptr_t)(addr))
 #define PHYSICAL_TO_VIRTUAL(addr)   ((uintptr_t)(addr))

include/segments.h

@@ -1,7 +1,7 @@
 #ifndef SEGMENTS_H
 #define SEGMENTS_H
 
-#include "config.h"
+#include "sm64_config.h"
 
 /*
  * Memory addresses for segments. Ideally, this header file would not be

include/sm64.h

@@ -7,12 +7,13 @@
 #include <PR/ucode.h>
 #include "port/Engine.h"
 #include <libultra/os.h>
+#include "variables.h"
 
 // Global header for Super Mario 64
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "config.h"
+#include "sm64_config.h"
 #include "object_fields.h"
 #include "object_constants.h"
 #include "sounds.h"
@@ -29,7 +30,7 @@ extern "C" {
 #define GAME_VERSION GameEngine_GetGameVersion()
 #define ROM_JP (GAME_VERSION == 0xE3DAA4E)
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__SWITCH__)
 #define bzero(b,len) (memset((b), '\0', (len)), (void) 0)
 #define bcopy(b1, b2, len) (memmove((b2), (b1), (len)), (void) 0)
 #endif

include/config.h include/sm64_config.hinclude/config.h renamed to include/sm64_config.h

@@ -2,7 +2,7 @@
 #define CONFIG_H
 
 /**
- * @file config.h
+ * @file sm64_config.h
  * A catch-all file for configuring various bugfixes and other settings
  * (maybe eventually) in SM64
  */

include/types.h

@@ -7,7 +7,7 @@
 #include <libultraship.h>
 #include <libultra/gbi.h>
 #include "macros.h"
-#include "config.h"
+#include "sm64_config.h"
 
 // Certain functions are marked as having return values, but do not
 // actually return a value. This causes undefined behavior, which we'd rather