Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into custom-messages

.gitignore

@@ -24,6 +24,10 @@ docs/doxygen/
 *.map
 *.dump
 out.txt
+*.sln
+*.vcxproj
+*.vcxproj.user
+*.vcxproj.filters
 
 # Tool artifacts
 tools/mipspro7.2_compiler/
@@ -423,3 +427,19 @@ xcuserdata/
 !*.xcworkspace/contents.xcworkspacedata
 /*.gcno
 **/xcshareddata/WorkspaceSettings.xcsettings
+
+# cmake
+CMakeLists.txt.user
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Testing
+Makefile
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+_deps
+*/extract_assets_cmake*
+/build*
+build.c

BUILDING.md

@@ -2,22 +2,62 @@
 
 ## Windows
 
- 1. Requires [Python](https://www.python.org/downloads/) >= 3.6.
+1. Requires Visual Studio 2022 Community Edition && `python3, cmake, git` (can be installed via chocolatey or manually)
- 2. Install [Visual Studio 2022 Community Edition](https://visualstudio.microsoft.com/vs/community/)
+2. Clone the Ship of Harkinian repository
- 3. In the Visual Studio Installer, install `MSVC v142 - VS 2019 C++`.
+3. Place one or more [compatible](#compatible-roms) roms in the `OTRExporter` directory with namings of your choice
- 4. Clone the Ship of Harkinian repository.
+
- 5. Place one or more [compatible](#compatible-roms) roms in the `OTRExporter` directory with namings of your choice.
+_Note: Instructions assume using powershell_
- 6. Run `OTRExporter/OTRExporter.sln`.
+```powershell
- 7. Switch the solution to `Release x64`.
+# Navigate to the Shipwright repo within powershell. ie: cd "C:\yourpath\Shipwright"
- 8. Build the solution.
+cd Shipwright
- 9. Launching `OTRExporter/extract_assets.py` will generate an `oot.otr` archive file in `OTRExporter/oot.otr`.
+
- 10. Run `soh/soh.sln`
+# Setup cmake project
- 11. Switch the solution to `Release x86` or `Release x64`.
+& 'C:\Program Files\CMake\bin\cmake' -S . -B "build/x64" -G "Visual Studio 17 2022" -T v142 -A x64 # -DCMAKE_BUILD_TYPE:STRING=Release (if you're packaging)
- 12. Build the solution.
+# Extract assets & generate OTR (run this anytime you need to regenerate OTR)
- 13. Copy the `OTRExporter/oot.otr` archive file to `soh/Release`.
+& 'C:\Program Files\CMake\bin\cmake.exe' --build .\build\x64 --target ExtractAssets # --config Release (if you're packaging)
- 14. Launch `soh.exe`.
+# Compile project
+& 'C:\Program Files\CMake\bin\cmake.exe' --build .\build\x64 # --config Release (if you're packaging)
+
+# Now you can run the executable in .\build\x64
+
+# If you need to clean the project you can run
+& 'C:\Program Files\CMake\bin\cmake.exe' --build .\build\x64 --target clean
+```
+
+### Developing SoH
+With the cmake build system you have two options for working on the project:
+
+#### Visual Studio
+To develop using Visual Studio you only need to use cmake to generate the solution file:
+```powershell
+# Generates Ship.sln at `build/x64`
+& 'C:\Program Files\CMake\bin\cmake' -S . -B "build/x64" -G "Visual Studio 17 2022" -T v142 -A x64
+```
+
+#### Visual Studio Code or another editor
+To develop using Visual Studio Code or another editor you only need to open the repository in it.
+To build you'll need to follow the instructions from the building section.
+
+_Note: If you're using Visual Studio Code, the [cpack plugin](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools) makes it very easy to just press run and debug._
+
+_Experimental: You can also use another build system entirely rathen than MSVC like [Ninja](https://ninja-build.org/) for possibly better performance._
+
+
+### Generating the distributable
+After compiling the project you can generate the distributable by running:
+```powershell
+# Go to build folder
+cd "build/x64"
+# Generate
+& 'C:\Program Files\CMake\bin\cpack.exe' -G ZIP
+```
 
 ## Linux
+1. Requires `gcc >= 10, x11, curl, python3, sdl2 >= 2.0.22, libpng, glew >= 2.2, ninja, cmake, lld`
+
+**Important: For maximum performance make sure you have ninja build tools installed!**
+
+_Note: If you're using Visual Studio Code, the [cpack plugin](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools) makes it very easy to just press run and debug._
 
 ```bash
 # Clone the repo
@@ -25,41 +65,87 @@ git clone https://github.com/HarbourMasters/Shipwright.git
 cd Shipwright
 # Copy the baserom to the OTRExporter folder
 cp <path to your ROM> OTRExporter
-# Build the docker image
+# Generate Ninja project
-sudo docker build . -t soh
+cmake -H. -Bbuild-cmake -GNinja # -DCMAKE_BUILD_TYPE:STRING=Release (if you're packaging)
-# Run the docker image with the working directory mounted to /soh
+# Extract assets & generate OTR (run this anytime you need to regenerate OTR)
-sudo docker run --rm -it -v $(pwd):/soh soh /bin/bash
+cmake --build build-cmake --target ExtractAssets
+# Compile the project
+cmake --build build-cmake # --config Release (if you're packaging)
+
+# Now you can run the executable in ./build-cmake/soh/soh.elf
+# To develop the project open the repository in VSCode (or your preferred editor)
+
+# If you need to clean the project you can run
+cmake --build build-cmake --target clean
 ```
-Inside the Docker container:
+
+### Generating a distributable
+After compiling the project you can generate a distributable by running of the following:
 ```bash
-cd soh
+# Go to build folder
-# Extract the assets/Compile the exporter/Run the exporter
+cd build-cmake
-make setup -j$(nproc) OPTFLAGS=-O2 DEBUG=0
+# Generate
-# Compile the code
+cpack -G DEB
-make -j $(nproc) OPTFLAGS=-O2 DEBUG=0
+cpack -G ZIP
+cpack -G External (creates appimage)
 ```
 
 ## macOS
+1. Requires Xcode (or xcode-tools) && `sdl2, libpng, glew, ninja, cmake` (can be installed via homebrew, macports, etc)
+
+**Important: For maximum performance make sure you have ninja build tools installed!**
+
+_Note: If you're using Visual Studio Code, the [cpack plugin](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools) makes it very easy to just press run and debug._
 
-1. Requires Xcode (or xcode-tools) && `sdl2, libpng, glew, cmake, pkgconfig, dylibbundler` (can be installed via homebrew, macports, etc)
 ```bash
 # Clone the repo
 git clone https://github.com/HarbourMasters/Shipwright.git
 cd ShipWright
 # Copy the baserom to the OTRExporter folder
 cp <path to your ROM> OTRExporter
+# Generate Ninja project
+cmake -H. -Bbuild-cmake -GNinja # -DCMAKE_BUILD_TYPE:STRING=Release (if you're packaging)
+# Extract assets & generate OTR (run this anytime you need to regenerate OTR)
+cmake --build build-cmake --target ExtractAssets
+# Compile the project
+cmake --build build-cmake # --config Release (if you're packaging)
 
-cd soh
+# Now you can run the executable in ./build-cmake/soh/soh-macos
-# Extract the assets/Compile the exporter/Run the exporter
+# To develop the project open the repository in VSCode (or your preferred editor)
-# -jX defines number of cores to use for compilation - lower or remove entirely if having issues
+
-make setup -j8 DEBUG=0
+# If you need to clean the project you can run
-# Compile the code (watch the -j parameter as above)
+cmake --build build-cmake --target clean
-make -j8 DEBUG=0
+```
-# Create macOS app bundle
+
-make appbundle
+### Generating a distributable
+After compiling the project you can generate a distributable by running of the following:
+```bash
+# Go to build folder
+cd build-cmake
+# Generate
+cpack
+```
+
+## Switch
+1. Requires that your build machine is setup with the tools necessary for your platform above
+2. Requires that you have the switch build tools installed 
+3. Clone the Ship of Harkinian repository
+4. Place one or more [compatible](#compatible-roms) roms in the `OTRExporter` directory with namings of your choice
+
+```bash
+cd Shipwright
+# Setup cmake project for your host machine
+cmake -H. -Bbuild-cmake -GNinja
+# Extract assets & generate OTR (run this anytime you need to regenerate OTR)
+cmake --build build-cmake --target ExtractAssets
+# Setup cmake project for building for Switch
+cmake -H. -Bbuild-switch -GNinja -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake
+# Build project and generate nro
+cmake --build build-switch --target soh_nro
+
+# Now you can run the executable in ./build-switch/soh/soh.nro
+# To develop the project open the repository in VSCode (or your preferred editor)
 ```
-9. Copy your OTR file to ~/Library/Application\ Support/com.shipofharkinian.soh
-10. Launch soh app in the soh folder!
 
 # Compatible Roms
 ```

CMake/Default.cmake

@@ -0,0 +1,65 @@
+################################################################################
+# Command for variable_watch. This command issues error message, if a variable
+# is changed. If variable PROPERTY_READER_GUARD_DISABLED is TRUE nothing happens
+#     variable_watch(<variable> property_reader_guard)
+################################################################################
+function(property_reader_guard VARIABLE ACCESS VALUE CURRENT_LIST_FILE STACK)
+    if("${PROPERTY_READER_GUARD_DISABLED}")
+        return()
+    endif()
+
+    if("${ACCESS}" STREQUAL "MODIFIED_ACCESS")
+        message(FATAL_ERROR
+            " Variable ${VARIABLE} is not supposed to be changed.\n"
+            " It is used only for reading target property ${VARIABLE}.\n"
+            " Use\n"
+            "     set_target_properties(\"<target>\" PROPERTIES \"${VARIABLE}\" \"<value>\")\n"
+            " or\n"
+            "     set_target_properties(\"<target>\" PROPERTIES \"${VARIABLE}_<CONFIG>\" \"<value>\")\n"
+            " instead.\n")
+    endif()
+endfunction()
+
+################################################################################
+# Create variable <name> with generator expression that expands to value of
+# target property <name>_<CONFIG>. If property is empty or not set then property
+# <name> is used instead. Variable <name> has watcher property_reader_guard that
+# doesn't allow to edit it.
+#     create_property_reader(<name>)
+# Input:
+#     name - Name of watched property and output variable
+################################################################################
+function(create_property_reader NAME)
+    set(PROPERTY_READER_GUARD_DISABLED TRUE)
+    set(CONFIG_VALUE "$<TARGET_GENEX_EVAL:${PROPS_TARGET},$<TARGET_PROPERTY:${PROPS_TARGET},${NAME}_$<UPPER_CASE:$<CONFIG>>>>")
+    set(IS_CONFIG_VALUE_EMPTY "$<STREQUAL:${CONFIG_VALUE},>")
+    set(GENERAL_VALUE "$<TARGET_GENEX_EVAL:${PROPS_TARGET},$<TARGET_PROPERTY:${PROPS_TARGET},${NAME}>>")
+    set("${NAME}" "$<IF:${IS_CONFIG_VALUE_EMPTY},${GENERAL_VALUE},${CONFIG_VALUE}>" PARENT_SCOPE)
+    variable_watch("${NAME}" property_reader_guard)
+endfunction()
+
+################################################################################
+# Set property $<name>_${PROPS_CONFIG_U} of ${PROPS_TARGET} to <value>
+#     set_config_specific_property(<name> <value>)
+# Input:
+#     name  - Prefix of property name
+#     value - New value
+################################################################################
+function(set_config_specific_property NAME VALUE)
+    set_target_properties("${PROPS_TARGET}" PROPERTIES "${NAME}_${PROPS_CONFIG_U}" "${VALUE}")
+endfunction()
+
+################################################################################
+
+create_property_reader("TARGET_NAME")
+create_property_reader("OUTPUT_DIRECTORY")
+
+set_config_specific_property("TARGET_NAME" "${PROPS_TARGET}")
+set_config_specific_property("OUTPUT_NAME" "${TARGET_NAME}")
+set_config_specific_property("ARCHIVE_OUTPUT_NAME" "${TARGET_NAME}")
+set_config_specific_property("LIBRARY_OUTPUT_NAME" "${TARGET_NAME}")
+set_config_specific_property("RUNTIME_OUTPUT_NAME" "${TARGET_NAME}")
+
+set_config_specific_property("ARCHIVE_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}")
+set_config_specific_property("LIBRARY_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}")
+set_config_specific_property("RUNTIME_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}")

CMake/DefaultCXX.cmake

@@ -0,0 +1,12 @@
+include("${CMAKE_CURRENT_LIST_DIR}/Default.cmake")
+
+set_config_specific_property("OUTPUT_DIRECTORY" "${CMAKE_SOURCE_DIR}$<$<NOT:$<STREQUAL:${CMAKE_VS_PLATFORM_NAME},Win32>>:/${CMAKE_VS_PLATFORM_NAME}>/${PROPS_CONFIG}")
+
+if(MSVC)
+    create_property_reader("DEFAULT_CXX_EXCEPTION_HANDLING")
+    create_property_reader("DEFAULT_CXX_DEBUG_INFORMATION_FORMAT")
+
+    set_target_properties("${PROPS_TARGET}" PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+    set_config_specific_property("DEFAULT_CXX_EXCEPTION_HANDLING" "/EHsc")
+    set_config_specific_property("DEFAULT_CXX_DEBUG_INFORMATION_FORMAT" "/Zi")
+endif()

CMake/Packaging-2.cmake

@@ -0,0 +1,30 @@
+set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
+set(CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY 0)
+set(CPACK_COMPONENTS_ALL "ship" "appimage")
+
+if (NOT CPACK_GENERATOR STREQUAL "External")
+  list(REMOVE_ITEM CPACK_COMPONENTS_ALL "appimage")
+endif()
+
+if (CPACK_GENERATOR MATCHES "DEB|RPM")
+# https://unix.stackexchange.com/a/11552/254512
+set(CPACK_PACKAGING_INSTALL_PREFIX "/opt/ship/bin")#/${CMAKE_PROJECT_VERSION}")
+set(CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY 0)
+elseif (CPACK_GENERATOR MATCHES "ZIP")
+set(CPACK_PACKAGING_INSTALL_PREFIX "")
+endif()
+
+if (CPACK_GENERATOR MATCHES "External")
+set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
+SET(CPACK_MONOLITHIC_INSTALL 1)
+set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/bin")
+endif()
+
+if (CPACK_GENERATOR MATCHES "Bundle")
+    set(CPACK_BUNDLE_NAME "soh")
+    set(CPACK_BUNDLE_PLIST "../soh/macosx/Info.plist")
+    set(CPACK_BUNDLE_ICON "macosx/soh.icns")
+    set(CPACK_BUNDLE_STARTUP_COMMAND "../soh/macosx/soh-macos.sh")
+    set(CPACK_BUNDLE_APPLE_CERT_APP "-")
+endif()
+

CMake/Packaging.cmake

@@ -0,0 +1,90 @@
+# these are cache variables, so they could be overwritten with -D,
+
+set(CPACK_PACKAGE_NAME "${PROJECT_NAME}"
+    CACHE STRING "The resulting package name"
+)
+
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Simple C++ application"
+    CACHE STRING "Package description for the package metadata"
+)
+set(CPACK_PACKAGE_VENDOR "Some Company")
+
+set(CPACK_VERBATIM_VARIABLES YES)
+
+set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
+SET(CPACK_OUTPUT_FILE_PREFIX "${CMAKE_SOURCE_DIR}/_packages")
+
+set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
+set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+
+set(CPACK_PACKAGE_CONTACT "YOUR@E-MAIL.net")
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER "YOUR NAME")
+
+#set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.md")
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+set(CPACK_SYSTEM_NAME ${LSB_RELEASE_CODENAME_SHORT})
+# package name for deb
+# if set, then instead of some-application-0.9.2-Linux.deb
+# you'll get some-application_0.9.2_amd64.deb (note the underscores too)
+#set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
+execute_process(COMMAND dpkg --print-architecture OUTPUT_VARIABLE ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
+set( CPACK_DEBIAN_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}-${ARCHITECTURE}.deb )
+# if you want every group to have its own package,
+# although the same happens if this is not sent (so it defaults to ONE_PER_GROUP)
+# and CPACK_DEB_COMPONENT_INSTALL is set to YES
+set(CPACK_COMPONENTS_GROUPING ALL_COMPONENTS_IN_ONE)#ONE_PER_GROUP)
+# without this you won't be able to pack only specified component
+set(CPACK_DEB_COMPONENT_INSTALL YES)
+
+set(CPACK_EXTERNAL_ENABLE_STAGING YES)
+set(CPACK_EXTERNAL_PACKAGE_SCRIPT "${PROJECT_BINARY_DIR}/appimage-generate.cmake")
+
+file(GENERATE
+  OUTPUT "${PROJECT_BINARY_DIR}/appimage-generate.cmake"
+  CONTENT [[
+include(CMakePrintHelpers)
+cmake_print_variables(CPACK_TEMPORARY_DIRECTORY)
+cmake_print_variables(CPACK_TOPLEVEL_DIRECTORY)
+cmake_print_variables(CPACK_PACKAGE_DIRECTORY)
+cmake_print_variables(CPACK_PACKAGE_FILE_NAME)
+
+find_program(LINUXDEPLOY_EXECUTABLE
+  NAMES linuxdeploy linuxdeploy-x86_64.AppImage
+  PATHS ${CPACK_PACKAGE_DIRECTORY}/linuxdeploy)
+
+if (NOT LINUXDEPLOY_EXECUTABLE)
+  message(STATUS "Downloading linuxdeploy")
+  set(LINUXDEPLOY_EXECUTABLE ${CPACK_PACKAGE_DIRECTORY}/linuxdeploy/linuxdeploy)
+  file(DOWNLOAD 
+      https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
+      ${LINUXDEPLOY_EXECUTABLE}
+      INACTIVITY_TIMEOUT 10
+      LOG ${CPACK_PACKAGE_DIRECTORY}/linuxdeploy/download.log
+      STATUS LINUXDEPLOY_DOWNLOAD)
+  execute_process(COMMAND chmod +x ${LINUXDEPLOY_EXECUTABLE} COMMAND_ECHO STDOUT)
+endif()
+
+execute_process(
+  COMMAND
+    ${CMAKE_COMMAND} -E env
+      OUTPUT=${CPACK_PACKAGE_FILE_NAME}.appimage
+      VERSION=$<IF:$<BOOL:${CPACK_PACKAGE_VERSION}>,${CPACK_PACKAGE_VERSION},0.1.0>
+    ${LINUXDEPLOY_EXECUTABLE}
+    --appimage-extract-and-run
+    --appdir=${CPACK_TEMPORARY_DIRECTORY}
+    --executable=$<TARGET_FILE:soh>
+    $<$<BOOL:$<TARGET_PROPERTY:soh,APPIMAGE_DESKTOP_FILE>>:--desktop-file=$<TARGET_PROPERTY:soh,APPIMAGE_DESKTOP_FILE>>
+    $<$<BOOL:$<TARGET_PROPERTY:soh,APPIMAGE_ICON_FILE>>:--icon-file=$<TARGET_PROPERTY:soh,APPIMAGE_ICON_FILE>>
+    --output=appimage
+    # --verbosity=2
+)
+]])
+
+endif()
+
+include(CPack)
+

CMake/Utils.cmake

@@ -0,0 +1,248 @@
+# utils file for projects came from visual studio solution with cmake-converter.
+
+################################################################################
+# Wrap each token of the command with condition
+################################################################################
+cmake_policy(PUSH)
+cmake_policy(SET CMP0054 NEW)
+macro(prepare_commands)
+    unset(TOKEN_ROLE)
+    unset(COMMANDS)
+    foreach(TOKEN ${ARG_COMMANDS})
+        if("${TOKEN}" STREQUAL "COMMAND")
+            set(TOKEN_ROLE "KEYWORD")
+        elseif("${TOKEN_ROLE}" STREQUAL "KEYWORD")
+            set(TOKEN_ROLE "CONDITION")
+        elseif("${TOKEN_ROLE}" STREQUAL "CONDITION")
+            set(TOKEN_ROLE "COMMAND")
+        elseif("${TOKEN_ROLE}" STREQUAL "COMMAND")
+            set(TOKEN_ROLE "ARG")
+        endif()
+
+        if("${TOKEN_ROLE}" STREQUAL "KEYWORD")
+            list(APPEND COMMANDS "${TOKEN}")
+        elseif("${TOKEN_ROLE}" STREQUAL "CONDITION")
+            set(CONDITION ${TOKEN})
+        elseif("${TOKEN_ROLE}" STREQUAL "COMMAND")
+            list(APPEND COMMANDS "$<$<NOT:${CONDITION}>:${DUMMY}>$<${CONDITION}:${TOKEN}>")
+        elseif("${TOKEN_ROLE}" STREQUAL "ARG")
+            list(APPEND COMMANDS "$<${CONDITION}:${TOKEN}>")
+        endif()
+    endforeach()
+endmacro()
+cmake_policy(POP)
+
+################################################################################
+# Transform all the tokens to absolute paths
+################################################################################
+macro(prepare_output)
+    unset(OUTPUT)
+    foreach(TOKEN ${ARG_OUTPUT})
+        if(IS_ABSOLUTE ${TOKEN})
+            list(APPEND OUTPUT "${TOKEN}")
+        else()
+            list(APPEND OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/${TOKEN}")
+        endif()
+    endforeach()
+endmacro()
+
+################################################################################
+# Parse add_custom_command_if args.
+#
+# Input:
+#     PRE_BUILD  - Pre build event option
+#     PRE_LINK   - Pre link event option
+#     POST_BUILD - Post build event option
+#     TARGET     - Target
+#     OUTPUT     - List of output files
+#     DEPENDS    - List of files on which the command depends
+#     COMMANDS   - List of commands(COMMAND condition1 commannd1 args1 COMMAND
+#                  condition2 commannd2 args2 ...)
+# Output:
+#     OUTPUT     - Output files
+#     DEPENDS    - Files on which the command depends
+#     COMMENT    - Comment
+#     PRE_BUILD  - TRUE/FALSE
+#     PRE_LINK   - TRUE/FALSE
+#     POST_BUILD - TRUE/FALSE
+#     TARGET     - Target name
+#     COMMANDS   - Prepared commands(every token is wrapped in CONDITION)
+#     NAME       - Unique name for custom target
+#     STEP       - PRE_BUILD/PRE_LINK/POST_BUILD
+################################################################################
+function(add_custom_command_if_parse_arguments)
+    cmake_parse_arguments("ARG" "PRE_BUILD;PRE_LINK;POST_BUILD" "TARGET;COMMENT" "DEPENDS;OUTPUT;COMMANDS" ${ARGN})
+
+    if(WIN32)
+        set(DUMMY "cd.")
+    elseif(UNIX)
+        set(DUMMY "true")
+    endif()
+
+    prepare_commands()
+    prepare_output()
+
+    set(DEPENDS "${ARG_DEPENDS}")
+    set(COMMENT "${ARG_COMMENT}")
+    set(PRE_BUILD "${ARG_PRE_BUILD}")
+    set(PRE_LINK "${ARG_PRE_LINK}")
+    set(POST_BUILD "${ARG_POST_BUILD}")
+    set(TARGET "${ARG_TARGET}")
+    if(PRE_BUILD)
+        set(STEP "PRE_BUILD")
+    elseif(PRE_LINK)
+        set(STEP "PRE_LINK")
+    elseif(POST_BUILD)
+        set(STEP "POST_BUILD")
+    endif()
+    set(NAME "${TARGET}_${STEP}")
+
+    set(OUTPUT "${OUTPUT}" PARENT_SCOPE)
+    set(DEPENDS "${DEPENDS}" PARENT_SCOPE)
+    set(COMMENT "${COMMENT}" PARENT_SCOPE)
+    set(PRE_BUILD "${PRE_BUILD}" PARENT_SCOPE)
+    set(PRE_LINK "${PRE_LINK}" PARENT_SCOPE)
+    set(POST_BUILD "${POST_BUILD}" PARENT_SCOPE)
+    set(TARGET "${TARGET}" PARENT_SCOPE)
+    set(COMMANDS "${COMMANDS}" PARENT_SCOPE)
+    set(STEP "${STEP}" PARENT_SCOPE)
+    set(NAME "${NAME}" PARENT_SCOPE)
+endfunction()
+
+################################################################################
+# Add conditional custom command
+#
+# Generating Files
+# The first signature is for adding a custom command to produce an output:
+#     add_custom_command_if(
+#         <OUTPUT output1 [output2 ...]>
+#         <COMMANDS>
+#         <COMMAND condition command1 [args1...]>
+#         [COMMAND condition command2 [args2...]]
+#         [DEPENDS [depends...]]
+#         [COMMENT comment]
+#
+# Build Events
+#     add_custom_command_if(
+#         <TARGET target>
+#         <PRE_BUILD | PRE_LINK | POST_BUILD>
+#         <COMMAND condition command1 [args1...]>
+#         [COMMAND condition command2 [args2...]]
+#         [COMMENT comment]
+#
+# Input:
+#     output     - Output files the command is expected to produce
+#     condition  - Generator expression for wrapping the command
+#     command    - Command-line(s) to execute at build time.
+#     args       - Command`s args
+#     depends    - Files on which the command depends
+#     comment    - Display the given message before the commands are executed at
+#                  build time.
+#     PRE_BUILD  - Run before any other rules are executed within the target
+#     PRE_LINK   - Run after sources have been compiled but before linking the
+#                  binary
+#     POST_BUILD - Run after all other rules within the target have been
+#                  executed
+################################################################################
+function(add_custom_command_if)
+    add_custom_command_if_parse_arguments(${ARGN})
+
+    if(OUTPUT AND TARGET)
+        message(FATAL_ERROR  "Wrong syntax. A TARGET and OUTPUT can not both be specified.")
+    endif()
+
+    if(OUTPUT)
+        add_custom_command(OUTPUT ${OUTPUT}
+                           ${COMMANDS}
+                           DEPENDS ${DEPENDS}
+                           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                           COMMENT ${COMMENT})
+    elseif(TARGET)
+        if(PRE_BUILD AND NOT ${CMAKE_GENERATOR} MATCHES "Visual Studio")
+            add_custom_target(
+                ${NAME}
+                ${COMMANDS}
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                COMMENT ${COMMENT})
+            add_dependencies(${TARGET} ${NAME})
+        else()
+            add_custom_command(
+                TARGET ${TARGET}
+                ${STEP}
+                ${COMMANDS}
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                COMMENT ${COMMENT})
+        endif()
+    else()
+        message(FATAL_ERROR "Wrong syntax. A TARGET or OUTPUT must be specified.")
+    endif()
+endfunction()
+
+################################################################################
+# Use props file for a target and configs
+#     use_props(<target> <configs...> <props_file>)
+# Inside <props_file> there are following variables:
+#     PROPS_TARGET   - <target>
+#     PROPS_CONFIG   - One of <configs...>
+#     PROPS_CONFIG_U - Uppercase PROPS_CONFIG
+# Input:
+#     target      - Target to apply props file
+#     configs     - Build configurations to apply props file
+#     props_file  - CMake script
+################################################################################
+macro(use_props TARGET CONFIGS PROPS_FILE)
+    set(PROPS_TARGET "${TARGET}")
+    foreach(PROPS_CONFIG ${CONFIGS})
+        string(TOUPPER "${PROPS_CONFIG}" PROPS_CONFIG_U)
+
+        get_filename_component(ABSOLUTE_PROPS_FILE "${PROPS_FILE}" ABSOLUTE BASE_DIR "${CMAKE_CURRENT_LIST_DIR}")
+        if(EXISTS "${ABSOLUTE_PROPS_FILE}")
+            include("${ABSOLUTE_PROPS_FILE}")
+        else()
+            message(WARNING "Corresponding cmake file from props \"${ABSOLUTE_PROPS_FILE}\" doesn't exist")
+        endif()
+    endforeach()
+endmacro()
+
+################################################################################
+# Add compile options to source file
+#     source_file_compile_options(<source_file> [compile_options...])
+# Input:
+#     source_file     - Source file
+#     compile_options - Options to add to COMPILE_FLAGS property
+################################################################################
+function(source_file_compile_options SOURCE_FILE)
+    if("${ARGC}" LESS_EQUAL "1")
+        return()
+    endif()
+
+    get_source_file_property(COMPILE_OPTIONS "${SOURCE_FILE}" COMPILE_OPTIONS)
+
+    if(COMPILE_OPTIONS)
+        list(APPEND COMPILE_OPTIONS ${ARGN})
+    else()
+        set(COMPILE_OPTIONS "${ARGN}")
+    endif()
+
+    set_source_files_properties("${SOURCE_FILE}" PROPERTIES COMPILE_OPTIONS "${COMPILE_OPTIONS}")
+endfunction()
+
+################################################################################
+# Default properties of visual studio projects
+################################################################################
+set(DEFAULT_CXX_PROPS "${CMAKE_CURRENT_LIST_DIR}/DefaultCXX.cmake")
+
+function(get_linux_lsb_release_information)
+    find_program(LSB_RELEASE_EXEC lsb_release)
+    if(NOT LSB_RELEASE_EXEC)
+        message(FATAL_ERROR "Could not detect lsb_release executable, can not gather required information")
+    endif()
+
+    execute_process(COMMAND "${LSB_RELEASE_EXEC}" --short --id OUTPUT_VARIABLE LSB_RELEASE_ID_SHORT OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(COMMAND "${LSB_RELEASE_EXEC}" --short --release OUTPUT_VARIABLE LSB_RELEASE_VERSION_SHORT OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(COMMAND "${LSB_RELEASE_EXEC}" --short --codename OUTPUT_VARIABLE LSB_RELEASE_CODENAME_SHORT OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+    set(LSB_RELEASE_ID_SHORT "${LSB_RELEASE_ID_SHORT}" PARENT_SCOPE)
+    set(LSB_RELEASE_VERSION_SHORT "${LSB_RELEASE_VERSION_SHORT}" PARENT_SCOPE)
+    set(LSB_RELEASE_CODENAME_SHORT "${LSB_RELEASE_CODENAME_SHORT}" PARENT_SCOPE)
+endfunction()

CMake/automate-vcpkg.cmake

@@ -0,0 +1,191 @@
+#------------------------------------------------------------------------------------------------------------
+#
+# Automate-VCPKG by Andre Taulien
+# ===============================
+#
+# Project Repository: https://github.com/REGoth-project/Automate-VCPKG
+# License ..........: MIT, see end of file.
+#
+# Based on: https://github.com/sutambe/cpptruths/blob/vcpkg_cmake_blog/cpp0x/vcpkg_test/CMakeLists.txt
+#
+# 
+# While [Vcpkg](https://github.com/microsoft/vcpkg) on it's own is awesome, it does add 
+# a little bit of complexity to getting a project to build. Even more if the one trying 
+# to compile your application is not too fond of the commandline. Additionally, CMake 
+# commands tend to get rather long with the toolchain path. 
+# 
+# To keep things simple for new users who just want to get the project to build, this 
+# script offers a solution.
+# 
+# Lets assume your main `CMakelists.txt` looks something like this:
+#
+#     cmake_minimum_required (VERSION 3.12.0)
+#     project (MyProject)
+#     
+#     add_executable(MyExecutable main.c)
+# 
+# To integrate Vcpkg into that `CMakelists.txt`, simple put the following lines before the 
+# call to `project(MyProject)`:
+# 
+#     include(cmake/automate-vcpkg.cmake)
+#     
+#     vcpkg_bootstrap()
+#     vcpkg_install_packages(libsquish physfs)
+# 
+# The call to `vcpkg_bootstrap()` will clone the official Vcpkg repository and bootstrap it. 
+# If it detected an existing environment variable defining a valid `VCPKG_ROOT`, it will 
+# update the existing installation of Vcpkg.
+# 
+# Arguments to `vcpkg_install_packages()` are the packages you want to install using Vcpkg.
+# 
+# If you want to keep the possibility for users to chose their own copy of Vcpkg, you can 
+# simply not run the code snippet mentioned above, something like this will work:
+# 
+#     option(SKIP_AUTOMATE_VCPKG "When ON, you will need to built the packages 
+#      required by MyProject on your own or supply your own vcpkg toolchain.")
+#     
+#     if (NOT SKIP_AUTOMATE_VCPKG)
+#       include(cmake/automate-vcpkg.cmake)
+#     
+#       vcpkg_bootstrap()
+#       vcpkg_install_packages(libsquish physfs)
+#     endif()
+#  
+# Then, the user has to supply the packages on their own, be it through Vcpkg or manually 
+# specifying their locations.
+#------------------------------------------------------------------------------------------------------------
+
+cmake_minimum_required (VERSION 3.12)
+
+if(WIN32)
+    set(VCPKG_FALLBACK_ROOT ${CMAKE_CURRENT_BINARY_DIR}/vcpkg CACHE STRING "vcpkg configuration directory to use if vcpkg was not installed on the system before")
+else()
+    set(VCPKG_FALLBACK_ROOT ${CMAKE_CURRENT_BINARY_DIR}/.vcpkg CACHE STRING  "vcpkg configuration directory to use if vcpkg was not installed on the system before")
+endif()
+
+# On Windows, Vcpkg defaults to x86, even on x64 systems. If we're 
+# doing a 64-bit build, we need to fix that.
+if (WIN32)
+
+    # Since the compiler checks haven't run yet, we need to figure
+    # out the value of CMAKE_SIZEOF_VOID_P ourselfs
+
+    include(CheckTypeSize)
+    enable_language(C)
+    check_type_size("void*" SIZEOF_VOID_P BUILTIN_TYPES_ONLY)
+    
+    if (SIZEOF_VOID_P EQUAL 8)
+        message(STATUS "Using Vcpkg triplet 'x64-windows'")
+        
+        set(VCPKG_TRIPLET x64-windows)
+    endif()
+endif()
+
+if(NOT DEFINED VCPKG_ROOT)
+    if(NOT DEFINED ENV{VCPKG_ROOT})
+	    set(VCPKG_ROOT ${VCPKG_FALLBACK_ROOT})
+    else()
+        set(VCPKG_ROOT $ENV{VCPKG_ROOT})
+    endif()
+endif()
+
+# Installs a new copy of Vcpkg or updates an existing one
+macro(vcpkg_bootstrap)
+    _install_or_update_vcpkg()
+
+    # Find out whether the user supplied their own VCPKG toolchain file
+    if(NOT DEFINED ${CMAKE_TOOLCHAIN_FILE})
+        # We know this wasn't set before so we need point the toolchain file to the newly found VCPKG_ROOT
+        set(CMAKE_TOOLCHAIN_FILE ${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake CACHE STRING "")
+    
+        # Just setting vcpkg.cmake as toolchain file does not seem to actually pull in the code
+        include(${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake)
+    
+        set(AUTOMATE_VCPKG_USE_SYSTEM_VCPKG OFF)
+    else()
+        # VCPKG_ROOT has been defined by the toolchain file already
+        set(AUTOMATE_VCPKG_USE_SYSTEM_VCPKG ON)
+    endif()
+    
+    message(STATUS "Automate VCPKG status:")
+    message(STATUS "  VCPKG_ROOT.....: ${VCPKG_ROOT}")
+    message(STATUS "  VCPKG_EXEC.....: ${VCPKG_EXEC}")
+    message(STATUS "  VCPKG_BOOTSTRAP: ${VCPKG_BOOTSTRAP}")
+endmacro()
+
+macro(_install_or_update_vcpkg)
+    if(NOT EXISTS ${VCPKG_ROOT})
+        message(STATUS "Cloning vcpkg in ${VCPKG_ROOT}")
+        execute_process(COMMAND git clone https://github.com/Microsoft/vcpkg.git ${VCPKG_ROOT})
+
+        # If a reproducible build is desired (and potentially old libraries are # ok), uncomment the
+        # following line and pin the vcpkg repository to a specific githash.
+        # execute_process(COMMAND git checkout 745a0aea597771a580d0b0f4886ea1e3a94dbca6 WORKING_DIRECTORY ${VCPKG_ROOT})
+    else()
+        # The following command has no effect if the vcpkg repository is in a detached head state.
+        message(STATUS "Auto-updating vcpkg in ${VCPKG_ROOT}")
+        execute_process(COMMAND git pull WORKING_DIRECTORY ${VCPKG_ROOT})
+    endif()
+
+    if(NOT EXISTS ${VCPKG_ROOT}/README.md)
+        message(FATAL_ERROR "***** FATAL ERROR: Could not clone vcpkg *****")
+    endif()
+
+    if(WIN32)
+        set(VCPKG_EXEC ${VCPKG_ROOT}/vcpkg.exe)
+        set(VCPKG_BOOTSTRAP ${VCPKG_ROOT}/bootstrap-vcpkg.bat)
+    else()
+        set(VCPKG_EXEC ${VCPKG_ROOT}/vcpkg)
+        set(VCPKG_BOOTSTRAP ${VCPKG_ROOT}/bootstrap-vcpkg.sh)
+    endif()
+
+    if(NOT EXISTS ${VCPKG_EXEC})
+        message("Bootstrapping vcpkg in ${VCPKG_ROOT}")
+        execute_process(COMMAND ${VCPKG_BOOTSTRAP} WORKING_DIRECTORY ${VCPKG_ROOT})
+    endif()
+
+    if(NOT EXISTS ${VCPKG_EXEC})
+        message(FATAL_ERROR "***** FATAL ERROR: Could not bootstrap vcpkg *****")
+    endif()
+   
+endmacro()
+
+# Installs the list of packages given as parameters using Vcpkg
+macro(vcpkg_install_packages)
+    
+    # Need the given list to be space-separated
+    #string (REPLACE ";" " " PACKAGES_LIST_STR "${ARGN}")
+
+    message(STATUS "Installing/Updating the following vcpkg-packages: ${PACKAGES_LIST_STR}")
+
+    if (VCPKG_TRIPLET)
+        set(ENV{VCPKG_DEFAULT_TRIPLET} "${VCPKG_TRIPLET}")
+    endif()
+
+    execute_process(
+        COMMAND ${VCPKG_EXEC} install ${ARGN}
+        WORKING_DIRECTORY ${VCPKG_ROOT}
+        )
+endmacro()
+    
+# MIT License
+# 
+# Copyright (c) 2019 REGoth-project
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.

CMakeLists.txt

@@ -0,0 +1,201 @@
+cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
+
+set(CMAKE_SYSTEM_VERSION 10.0 CACHE STRING "" FORCE)
+set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")
+#set(CMAKE_C_STANDARD 11 CACHE STRING "The C standard to use") - issue with soh compile with MSVC
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+set(MACOSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE)
+endif()
+
+project(Ship C CXX)
+
+set(PROJECT_VERSION_MAJOR "3")
+set(PROJECT_VERSION_MINOR "0")
+set(PROJECT_VERSION_PATCH "0")
+
+set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh)
+add_compile_options($<$<CXX_COMPILER_ID:MSVC>:/MP>)
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+include(cmake/automate-vcpkg.cmake)
+
+set(VCPKG_TRIPLET x64-windows-static)
+set(VCPKG_TARGET_TRIPLET x64-windows-static)
+
+vcpkg_bootstrap()
+vcpkg_install_packages(zlib bzip2 libpng)
+endif()
+
+################################################################################
+# Set target arch type if empty. Visual studio solution generator provides it.
+################################################################################
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+	if(NOT CMAKE_VS_PLATFORM_NAME)
+		set(CMAKE_VS_PLATFORM_NAME "x64")
+	endif()
+	message("${CMAKE_VS_PLATFORM_NAME} architecture in use")
+
+	if(NOT ("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64"
+		OR "${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32"))
+		message(FATAL_ERROR "${CMAKE_VS_PLATFORM_NAME} arch is not supported!")
+	endif()
+endif()
+
+################################################################################
+# Global configuration types
+################################################################################
+if (CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch")
+set(CMAKE_C_FLAGS_DEBUG "-O3 -ffast-math")
+set(CMAKE_CXX_FLAGS_DEBUG "-O3 -ffast-math")
+set(CMAKE_C_FLAGS_RELEASE "-O3 -ffast-math -DNDEBUG")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3 -ffast-math -DNDEBUG")
+else()
+set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
+set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+set(CMAKE_OBJCXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+endif()
+
+if(NOT CMAKE_BUILD_TYPE )
+	set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build." FORCE)
+endif()
+
+################################################################################
+# Global compiler options
+################################################################################
+if(MSVC)
+    # remove default flags provided with CMake for MSVC
+    set(CMAKE_C_FLAGS "")
+    set(CMAKE_C_FLAGS_DEBUG "")
+    set(CMAKE_C_FLAGS_RELEASE "")
+    set(CMAKE_CXX_FLAGS "")
+    set(CMAKE_CXX_FLAGS_DEBUG "")
+    set(CMAKE_CXX_FLAGS_RELEASE "")
+endif()
+
+################################################################################
+# Global linker options
+################################################################################
+if(MSVC)
+    # remove default flags provided with CMake for MSVC
+    set(CMAKE_EXE_LINKER_FLAGS "")
+    set(CMAKE_MODULE_LINKER_FLAGS "")
+    set(CMAKE_SHARED_LINKER_FLAGS "")
+    set(CMAKE_STATIC_LINKER_FLAGS "")
+    set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS}")
+    set(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS}")
+    set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS}")
+    set(CMAKE_STATIC_LINKER_FLAGS_DEBUG "${CMAKE_STATIC_LINKER_FLAGS}")
+    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS}")
+    set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS}")
+    set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS}")
+    set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS}")
+endif()
+
+################################################################################
+# Common utils
+################################################################################
+include(CMake/Utils.cmake)
+
+if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+    get_linux_lsb_release_information()
+    message(STATUS "Linux ${LSB_RELEASE_ID_SHORT} ${LSB_RELEASE_VERSION_SHORT} ${LSB_RELEASE_CODENAME_SHORT}")
+else()
+    message(STATUS ${CMAKE_SYSTEM_NAME})
+endif()
+
+################################################################################
+# Additional Global Settings(add specific info there)
+################################################################################
+include(CMake/GlobalSettingsInclude.cmake OPTIONAL)
+
+################################################################################
+# Use solution folders feature
+################################################################################
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+################################################################################
+# Sub-projects
+################################################################################
+add_subdirectory(libultraship/libultraship ${CMAKE_BINARY_DIR}/libultraship)
+add_subdirectory(ZAPDTR/ZAPD ${CMAKE_BINARY_DIR}/ZAPD)
+add_subdirectory(ZAPDTR/ZAPDUtils ${CMAKE_BINARY_DIR}/ZAPDUtils)
+add_subdirectory(OTRExporter)
+add_subdirectory(soh)
+if(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin|NintendoSwitch")
+add_subdirectory(OTRGui)
+endif()
+
+set_property(TARGET soh PROPERTY APPIMAGE_DESKTOP_FILE_TERMINAL YES)
+set_property(TARGET soh PROPERTY APPIMAGE_DESKTOP_FILE "${CMAKE_SOURCE_DIR}/scripts/linux/appimage/soh.desktop")
+set_property(TARGET soh PROPERTY APPIMAGE_ICON_FILE "${CMAKE_BINARY_DIR}/sohIcon.png")
+
+if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+INSTALL(PROGRAMS "${CMAKE_SOURCE_DIR}/scripts/linux/appimage/soh.sh" DESTINATION . COMPONENT appimage)
+endif()
+
+file(READ ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py filedata)
+string(REGEX REPLACE "../ZAPDTR/ZAPD.out" "${CMAKE_BINARY_DIR}/ZAPD/ZAPD.out" filedata "${filedata}")
+string(REGEX REPLACE "x64" "..\\\\\\\\x64" filedata "${filedata}")
+string(REGEX REPLACE "Release" "${CMAKE_BUILD_TYPE}" filedata "${filedata}")
+file(WRITE "${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets_cmake2.py" "${filedata}")
+file(CHMOD "${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets_cmake2.py" PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+
+find_package(Python3 COMPONENTS Interpreter)
+
+add_custom_target(
+    ExtractAssets
+    COMMAND ${CMAKE_COMMAND} -E rm -f oot.otr
+    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets_cmake2.py
+    COMMAND ${CMAKE_COMMAND} -E copy oot.otr ${CMAKE_SOURCE_DIR}
+    COMMAND ${CMAKE_COMMAND} -E copy oot.otr ${CMAKE_BINARY_DIR}/soh
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter
+    COMMENT "Running asset extraction..."
+    DEPENDS ZAPD
+
+)
+
+if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+    find_package(ImageMagick COMPONENTS convert)
+    if (ImageMagick_FOUND)
+        execute_process (
+            COMMAND ${ImageMagick_convert_EXECUTABLE} soh/macosx/sohIcon.png -resize 512x512 ${CMAKE_BINARY_DIR}/sohIcon.png
+            OUTPUT_VARIABLE outVar
+        )
+    endif()
+endif()
+
+if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+add_custom_target(CreateOSXIcons
+    COMMAND mkdir -p ${CMAKE_BINARY_DIR}/macosx/soh.iconset
+    COMMAND sips -z 16 16     soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16x16.png
+    COMMAND sips -z 32 32     soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16x16@2x.png
+    COMMAND sips -z 32 32     soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32x32.png
+    COMMAND sips -z 64 64     soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32x32@2x.png
+    COMMAND sips -z 128 128   soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128x128.png
+    COMMAND sips -z 256 256   soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128x128@2x.png
+    COMMAND sips -z 256 256   soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256x256.png
+    COMMAND sips -z 512 512   soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256x256@2x.png
+    COMMAND sips -z 512 512   soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512x512.png
+    COMMAND cp                soh/macosx/sohIcon.png ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512x512@2x.png
+    COMMAND iconutil -c icns -o ${CMAKE_BINARY_DIR}/macosx/soh.icns ${CMAKE_BINARY_DIR}/macosx/soh.iconset
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    COMMENT "Creating OSX icons ..."
+    )
+add_dependencies(soh CreateOSXIcons)
+endif()
+
+if(CMAKE_SYSTEM_NAME MATCHES "Windows|NintendoSwitch")
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/README.md DESTINATION . COMPONENT ship RENAME readme.txt )
+endif()
+
+if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+	set(CPACK_GENERATOR "External")
+elseif(CMAKE_SYSTEM_NAME MATCHES "Windows|NintendoSwitch")
+    set(CPACK_GENERATOR "ZIP")
+elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+    set(CPACK_GENERATOR "Bundle")
+endif()
+
+set(CPACK_PROJECT_CONFIG_FILE ${CMAKE_SOURCE_DIR}/CMake/Packaging-2.cmake)
+include(CMake/Packaging.cmake)

Dockerfile

@@ -5,49 +5,58 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 ENV GCCVER=10
 RUN apt-get update && \
-    apt-get upgrade -y && \
+	apt-get upgrade -y && \
-    apt-get install -y \
+	apt-get install -y \
-        binutils \
+		binutils \
-        gcc-${GCCVER} \
+		gcc-${GCCVER} \
-        g++-${GCCVER} \
+		g++-${GCCVER} \
-        p7zip-full \
+		patchelf \
-        python3 \
+		p7zip-full \
-        make \
+		python3 \
-        cmake \
+		cmake \
-        curl \
+		make \
-        git \
+		curl \
-        lld \
+		git \
-        wget \
+		lld \
-        libglew-dev \
+		libsdl2-dev \
-        libsdl2-dev \
+		zlib1g-dev \
-        zlib1g-dev \
+		libbz2-dev \
-        libbz2-dev \
+		libpng-dev \
-        libpng-dev \
+		libgles2-mesa-dev \
-        libgles2-mesa-dev && \    
+		wget \
-    update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCCVER} 10 && \
+		gpg \
-    update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${GCCVER} 10 
+		imagemagick \
-
+		ninja-build && \
+	apt-get install -y software-properties-common && \ 
+	wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \
+	apt-add-repository "deb https://apt.kitware.com/ubuntu/ focal main" && \
+	apt-get update && \
+	apt-get upgrade -y && \
+	update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCCVER} 10 && \
+	update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${GCCVER} 10 
+	
 RUN git clone https://github.com/Perlmint/glew-cmake.git && \
-    cmake glew-cmake && \
+	cmake glew-cmake && \
-    make -j$(nproc) && \
+	make -j$(nproc) && \
-    make install
+	make install
 
 ENV SDL2VER=2.0.22
 RUN curl -sLO https://libsdl.org/release/SDL2-${SDL2VER}.tar.gz && \
-    tar -xzf SDL2-${SDL2VER}.tar.gz && \
+	tar -xzf SDL2-${SDL2VER}.tar.gz && \
-    cd SDL2-${SDL2VER} && \
+	cd SDL2-${SDL2VER} && \
-    ./configure --build=x86_64-linux-gnu && \
+	./configure --build=x86_64-linux-gnu && \
-    make -j$(nproc) && make install && \
+	make -j$(nproc) && make install && \
-    rm ../SDL2-${SDL2VER}.tar.gz
+	rm ../SDL2-${SDL2VER}.tar.gz && \
+	cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/
 
 RUN \
-    ln -sf /proc/self/mounts /etc/mtab && \
+	ln -sf /proc/self/mounts /etc/mtab && \
-    mkdir -p /usr/local/share/keyring/ && \
+	mkdir -p /usr/local/share/keyring/ && \
-    wget -O /usr/local/share/keyring/devkitpro-pub.gpg https://apt.devkitpro.org/devkitpro-pub.gpg && \
+	wget -O /usr/local/share/keyring/devkitpro-pub.gpg https://apt.devkitpro.org/devkitpro-pub.gpg && \
-    echo "deb [signed-by=/usr/local/share/keyring/devkitpro-pub.gpg] https://apt.devkitpro.org stable main" > /etc/apt/sources.list.d/devkitpro.list && \
+	echo "deb [signed-by=/usr/local/share/keyring/devkitpro-pub.gpg] https://apt.devkitpro.org stable main" > /etc/apt/sources.list.d/devkitpro.list && \
-    apt-get update -y && \
+	apt-get update -y && \
-    apt-get install -y devkitpro-pacman && \
+	apt-get install -y devkitpro-pacman && \
-    yes | dkp-pacman -Syu switch-dev switch-portlibs --noconfirm
+	yes | dkp-pacman -Syu switch-dev switch-portlibs --noconfirm
 
 ENV DEVKITPRO=/opt/devkitpro
 ENV DEVKITARM=/opt/devkitpro/devkitARM

Jenkinsfile

@@ -8,20 +8,40 @@ pipeline {
     }
     
     stages {
+        stage('Generate Assets') {
+            options {
+                timeout(time: 10)
+            }
+            agent {
+                label "SoH-Mac-Builders"
+            }
+            steps {
+                checkout([
+                    $class: 'GitSCM',
+                    branches: scm.branches,
+                    doGenerateSubmoduleConfigurations: scm.doGenerateSubmoduleConfigurations,
+                    extensions: scm.extensions,
+                    userRemoteConfigs: scm.userRemoteConfigs
+                ])
+                catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+                    sh '''
+                        cp ../../ZELOOTD.z64 OTRExporter/baserom_non_mq.z64
+
+                        cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release
+                        cmake --build build-cmake --target ExtractAssets --config Release
+                    '''
+                    stash includes: 'soh/assets/**/*', name: 'assets'
+                }
+            }
+        }
         stage('Build SoH') {
             parallel {
                 stage ('Build Windows') {
-                    options {
-                        timeout(time: 20)
-                    }
                     environment {
-                        MSBUILD='C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\Msbuild\\Current\\Bin\\msbuild.exe'
-                        CONFIG='Release'
-                        OTRPLATFORM='x64'
                         PLATFORM='x64'
-                        ZIP='C:\\Program Files\\7-Zip\\7z.exe'
                         PYTHON='C:\\Users\\jenkins\\AppData\\Local\\Programs\\Python\\Python310\\python.exe'
                         CMAKE='C:\\Program Files\\CMake\\bin\\cmake.exe'
+                        CPACK='C:\\Program Files\\CMake\\bin\\cpack.exe'
                         TOOLSET='v142'
                     }
                     agent {
@@ -37,37 +57,17 @@ pipeline {
                         ])
                             
                         catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-                            bat """ 
+                            unstash 'assets'
-                            
+                            bat """                             
-                            "${env.MSBUILD}" ".\\OTRExporter\\OTRExporter.sln" -t:build -p:Configuration=${env.CONFIG};Platform=${env.OTRPLATFORM};PlatformToolset=${env.TOOLSET};RestorePackagesConfig=true /restore /nodeReuse:false /m
+                            "${env.CMAKE}" -S . -B "build\\${env.PLATFORM}" -G "Visual Studio 17 2022" -T ${env.TOOLSET} -A ${env.PLATFORM} -D Python_EXECUTABLE=${env.PYTHON} -D CMAKE_BUILD_TYPE:STRING=Release
-                            
+                            "${env.CMAKE}" --build ".\\build\\${env.PLATFORM}" --config Release
-                            xcopy "..\\..\\ZELOOTD.z64" "OTRExporter\\"
+                            cd  ".\\build\\${env.PLATFORM}"
-                            
+                            "${env.CPACK}" -G ZIP
-                            cd "OTRExporter"
-                            "${env.PYTHON}" ".\\extract_assets.py"
-                            cd "..\\"
-                            
-                            "${env.MSBUILD}" ".\\soh\\soh.sln" -t:build -p:Configuration=${env.CONFIG};Platform=${env.PLATFORM};PlatformToolset=${env.TOOLSET} /nodeReuse:false /m
-                            
-                            cd OTRGui
-                            mkdir build
-                            cd build
-                            
-                            "${env.CMAKE}" ..
-                            "${env.CMAKE}" --build . --config Release
-                            
                             cd "..\\..\\"
-                            
+
-                            move "soh\\x64\\Release\\soh.exe" ".\\"
+                            move "_packages\\*.zip" "soh.zip"
-                            move "OTRGui\\build\\assets" ".\\"
-                            move ".\\OTRExporter\\x64\\Release\\ZAPD.exe" ".\\assets\\extractor\\"
-                            move ".\\OTRGui\\build\\Release\\OTRGui.exe" ".\\"
-                            rename README.md readme.txt
-                            
-                            "${env.ZIP}" a soh.7z soh.exe OTRGui.exe assets readme.txt
-                            
                             """
-                            archiveArtifacts artifacts: 'soh.7z', followSymlinks: false, onlyIfSuccessful: true
+                            archiveArtifacts artifacts: 'soh.zip', followSymlinks: false, onlyIfSuccessful: true
                         }
                     }
                     post {
@@ -77,9 +77,6 @@ pipeline {
                     }
                 }
                 stage ('Build Linux') {
-                    options {
-                        timeout(time: 20)
-                    }
                     agent {
                         label "SoH-Linux-Builders"
                     }
@@ -92,23 +89,16 @@ pipeline {
                             userRemoteConfigs: scm.userRemoteConfigs
                         ])
                         catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+                            unstash 'assets'
                             sh '''
-                            
-                            cp ../../ZELOOTD.z64 OTRExporter/baserom_non_mq.z64
                             docker build . -t soh
                             docker run --name sohcont -dit --rm -v $(pwd):/soh soh /bin/bash
-                            docker exec sohcont scripts/linux/build.sh
+                            docker exec sohcont scripts/linux/appimage/build.sh
                             
-                            mkdir build
-                            mv soh/soh.elf build/
-                            mv OTRGui/build/OTRGui build/
-                            mv OTRGui/build/assets build/
-                            mv ZAPDTR/ZAPD.out build/assets/extractor/
                             mv README.md readme.txt
-			    
+                            mv build-cmake/*.appimage soh.appimage
-                            docker exec sohcont scripts/linux/build-appimage.sh
+
-			    
+                            7z a soh-linux.7z soh.appimage readme.txt
-                            7z a soh-linux.7z SOH-Linux.AppImage readme.txt
                             
                             '''
                         }
@@ -125,11 +115,6 @@ pipeline {
                     agent {
                         label "SoH-Mac-Builders"
                     }
-                    environment {
-                        CC = 'clang -arch arm64 -arch x86_64'
-                        CXX = 'clang++ -arch arm64 -arch x86_64'
-                        MACOSX_DEPLOYMENT_TARGET = 10.15
-                    }
                     steps {
                         checkout([
                             $class: 'GitSCM',
@@ -139,17 +124,19 @@ pipeline {
                             userRemoteConfigs: scm.userRemoteConfigs
                         ])
                         catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+                            unstash 'assets'
                             sh '''
-                            cp ../../ZELOOTD.z64 OTRExporter/baserom_non_mq.z64
+                            cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
-                            cd soh
+                            cmake --build build-cmake --config Release --
-                            make setup -j$(sysctl -n hw.physicalcpu) OPTFLAGS=-O2 DEBUG=0 LD="ld"
+                            (cd build-cmake && cpack)
-                            make -j$(sysctl -n hw.physicalcpu) DEBUG=0 OPTFLAGS=-O2 LD="ld"
+
-                            make appbundle
+                            mv README.md readme.txt		
-                            mv ../README.md readme.txt
+                            mv _packages/*.dmg SoH.dmg
-                            7z a soh-mac.7z soh.app readme.txt
+                            
+                            7z a soh-mac.7z SoH.dmg readme.txt
                             '''
                         }
-                        archiveArtifacts artifacts: 'soh/soh-mac.7z', followSymlinks: false, onlyIfSuccessful: true
+                        archiveArtifacts artifacts: 'soh-mac.7z', followSymlinks: false, onlyIfSuccessful: true
                     }
                     post {
                         always {
@@ -158,9 +145,6 @@ pipeline {
                     }
                 }
                 stage ('Build Switch') {
-                    options {
-                        timeout(time: 20)
-                    }
                     agent {
                         label "SoH-Linux-Builders"
                     }
@@ -173,14 +157,13 @@ pipeline {
                             userRemoteConfigs: scm.userRemoteConfigs
                         ])
                         catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-                            sh '''
+                            unstash 'assets'
-                            
+                            sh '''                            
-                            cp ../../ZELOOTD.z64 OTRExporter/baserom_non_mq.z64
                             docker build . -t sohswitch
                             docker run --name sohcont -dit --rm -v $(pwd):/soh sohswitch /bin/bash
                             docker exec sohcont scripts/switch/build.sh
                             
-                            mv soh/soh.nro .
+                            mv build-switch/soh/*.nro soh.nro
                             mv README.md readme.txt
                             
                             7z a soh-switch.7z soh.nro readme.txt

Makefile.switch

@@ -1,36 +0,0 @@
-#-------------------------------------------------------------------------------
-.SUFFIXES:
-#-------------------------------------------------------------------------------
-
-export SOH_TOP_DIR := $(CURDIR)
-
-.PHONY: all clean ZAPDUtils libultraship soh StormLib
-
-all: soh
-	@echo "Done!"
-
-ZAPDUtils:
-	@echo "Building $@..."
-	@$(MAKE) --no-print-directory -C $(CURDIR)/ZAPDTR/ZAPDUtils -f $(CURDIR)/ZAPDTR/ZAPDUtils/Makefile.switch
-
-StormLib:
-	@echo "Building $@..."
-	LDFLAGS="" ${DEVKITPRO}/portlibs/switch/bin/aarch64-none-elf-cmake -DCMAKE_TOOLCHAIN_FILE=${DEVKITPRO}/cmake/Switch.cmake -DCMAKE_BUILD_TYPE=Release -B $(CURDIR)/StormLib/nxbuild -S $(CURDIR)/StormLib
-	@$(MAKE) --no-print-directory -C $(CURDIR)/StormLib/nxbuild -f $(CURDIR)/StormLib/nxbuild/Makefile
-
-libultraship: StormLib ZAPDUtils
-	@echo "Building $@..."
-	@$(MAKE) --no-print-directory -C $(CURDIR)/libultraship -f $(CURDIR)/libultraship/Makefile.switch
-
-soh: libultraship
-	@echo "Building $@..."
-	@$(MAKE) --no-print-directory -C $(CURDIR)/soh -f $(CURDIR)/soh/Makefile.switch
-
-otr:
-	@echo "Building $@..."
-	@$(MAKE) --no-print-directory -C $(CURDIR)/soh -f $(CURDIR)/soh/Makefile setup
-
-clean:
-	@$(MAKE) --no-print-directory -C $(CURDIR)/ZAPDTR/ZAPDUtils -f $(CURDIR)/ZAPDTR/ZAPDUtils/Makefile.switch clean
-	@$(MAKE) --no-print-directory -C $(CURDIR)/libultraship -f $(CURDIR)/libultraship/Makefile.switch clean
-	@$(MAKE) --no-print-directory -C $(CURDIR)/soh -f $(CURDIR)/soh/Makefile.switch clean

OTRExporter/CMake/Default.cmake

@@ -0,0 +1,65 @@
+################################################################################
+# Command for variable_watch. This command issues error message, if a variable
+# is changed. If variable PROPERTY_READER_GUARD_DISABLED is TRUE nothing happens
+#     variable_watch(<variable> property_reader_guard)
+################################################################################
+function(property_reader_guard VARIABLE ACCESS VALUE CURRENT_LIST_FILE STACK)
+    if("${PROPERTY_READER_GUARD_DISABLED}")
+        return()
+    endif()
+
+    if("${ACCESS}" STREQUAL "MODIFIED_ACCESS")
+        message(FATAL_ERROR
+            " Variable ${VARIABLE} is not supposed to be changed.\n"
+            " It is used only for reading target property ${VARIABLE}.\n"
+            " Use\n"
+            "     set_target_properties(\"<target>\" PROPERTIES \"${VARIABLE}\" \"<value>\")\n"
+            " or\n"
+            "     set_target_properties(\"<target>\" PROPERTIES \"${VARIABLE}_<CONFIG>\" \"<value>\")\n"
+            " instead.\n")
+    endif()
+endfunction()
+
+################################################################################
+# Create variable <name> with generator expression that expands to value of
+# target property <name>_<CONFIG>. If property is empty or not set then property
+# <name> is used instead. Variable <name> has watcher property_reader_guard that
+# doesn't allow to edit it.
+#     create_property_reader(<name>)
+# Input:
+#     name - Name of watched property and output variable
+################################################################################
+function(create_property_reader NAME)
+    set(PROPERTY_READER_GUARD_DISABLED TRUE)
+    set(CONFIG_VALUE "$<TARGET_GENEX_EVAL:${PROPS_TARGET},$<TARGET_PROPERTY:${PROPS_TARGET},${NAME}_$<UPPER_CASE:$<CONFIG>>>>")
+    set(IS_CONFIG_VALUE_EMPTY "$<STREQUAL:${CONFIG_VALUE},>")
+    set(GENERAL_VALUE "$<TARGET_GENEX_EVAL:${PROPS_TARGET},$<TARGET_PROPERTY:${PROPS_TARGET},${NAME}>>")
+    set("${NAME}" "$<IF:${IS_CONFIG_VALUE_EMPTY},${GENERAL_VALUE},${CONFIG_VALUE}>" PARENT_SCOPE)
+    variable_watch("${NAME}" property_reader_guard)
+endfunction()
+
+################################################################################
+# Set property $<name>_${PROPS_CONFIG_U} of ${PROPS_TARGET} to <value>
+#     set_config_specific_property(<name> <value>)
+# Input:
+#     name  - Prefix of property name
+#     value - New value
+################################################################################
+function(set_config_specific_property NAME VALUE)
+    set_target_properties("${PROPS_TARGET}" PROPERTIES "${NAME}_${PROPS_CONFIG_U}" "${VALUE}")
+endfunction()
+
+################################################################################
+
+create_property_reader("TARGET_NAME")
+create_property_reader("OUTPUT_DIRECTORY")
+
+set_config_specific_property("TARGET_NAME" "${PROPS_TARGET}")
+set_config_specific_property("OUTPUT_NAME" "${TARGET_NAME}")
+set_config_specific_property("ARCHIVE_OUTPUT_NAME" "${TARGET_NAME}")
+set_config_specific_property("LIBRARY_OUTPUT_NAME" "${TARGET_NAME}")
+set_config_specific_property("RUNTIME_OUTPUT_NAME" "${TARGET_NAME}")
+
+set_config_specific_property("ARCHIVE_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}")
+set_config_specific_property("LIBRARY_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}")
+set_config_specific_property("RUNTIME_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}")

OTRExporter/CMake/DefaultCXX.cmake

@@ -0,0 +1,12 @@
+include("${CMAKE_CURRENT_LIST_DIR}/Default.cmake")
+
+set_config_specific_property("OUTPUT_DIRECTORY" "${CMAKE_SOURCE_DIR}$<$<NOT:$<STREQUAL:${CMAKE_VS_PLATFORM_NAME},Win32>>:/${CMAKE_VS_PLATFORM_NAME}>/${PROPS_CONFIG}")
+
+if(MSVC)
+    create_property_reader("DEFAULT_CXX_EXCEPTION_HANDLING")
+    create_property_reader("DEFAULT_CXX_DEBUG_INFORMATION_FORMAT")
+
+    set_target_properties("${PROPS_TARGET}" PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+    set_config_specific_property("DEFAULT_CXX_EXCEPTION_HANDLING" "/EHsc")
+    set_config_specific_property("DEFAULT_CXX_DEBUG_INFORMATION_FORMAT" "/Zi")
+endif()

OTRExporter/CMake/Utils.cmake

@@ -0,0 +1,233 @@
+# utils file for projects came from visual studio solution with cmake-converter.
+
+################################################################################
+# Wrap each token of the command with condition
+################################################################################
+cmake_policy(PUSH)
+cmake_policy(SET CMP0054 NEW)
+macro(prepare_commands)
+    unset(TOKEN_ROLE)
+    unset(COMMANDS)
+    foreach(TOKEN ${ARG_COMMANDS})
+        if("${TOKEN}" STREQUAL "COMMAND")
+            set(TOKEN_ROLE "KEYWORD")
+        elseif("${TOKEN_ROLE}" STREQUAL "KEYWORD")
+            set(TOKEN_ROLE "CONDITION")
+        elseif("${TOKEN_ROLE}" STREQUAL "CONDITION")
+            set(TOKEN_ROLE "COMMAND")
+        elseif("${TOKEN_ROLE}" STREQUAL "COMMAND")
+            set(TOKEN_ROLE "ARG")
+        endif()
+
+        if("${TOKEN_ROLE}" STREQUAL "KEYWORD")
+            list(APPEND COMMANDS "${TOKEN}")
+        elseif("${TOKEN_ROLE}" STREQUAL "CONDITION")
+            set(CONDITION ${TOKEN})
+        elseif("${TOKEN_ROLE}" STREQUAL "COMMAND")
+            list(APPEND COMMANDS "$<$<NOT:${CONDITION}>:${DUMMY}>$<${CONDITION}:${TOKEN}>")
+        elseif("${TOKEN_ROLE}" STREQUAL "ARG")
+            list(APPEND COMMANDS "$<${CONDITION}:${TOKEN}>")
+        endif()
+    endforeach()
+endmacro()
+cmake_policy(POP)
+
+################################################################################
+# Transform all the tokens to absolute paths
+################################################################################
+macro(prepare_output)
+    unset(OUTPUT)
+    foreach(TOKEN ${ARG_OUTPUT})
+        if(IS_ABSOLUTE ${TOKEN})
+            list(APPEND OUTPUT "${TOKEN}")
+        else()
+            list(APPEND OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/${TOKEN}")
+        endif()
+    endforeach()
+endmacro()
+
+################################################################################
+# Parse add_custom_command_if args.
+#
+# Input:
+#     PRE_BUILD  - Pre build event option
+#     PRE_LINK   - Pre link event option
+#     POST_BUILD - Post build event option
+#     TARGET     - Target
+#     OUTPUT     - List of output files
+#     DEPENDS    - List of files on which the command depends
+#     COMMANDS   - List of commands(COMMAND condition1 commannd1 args1 COMMAND
+#                  condition2 commannd2 args2 ...)
+# Output:
+#     OUTPUT     - Output files
+#     DEPENDS    - Files on which the command depends
+#     COMMENT    - Comment
+#     PRE_BUILD  - TRUE/FALSE
+#     PRE_LINK   - TRUE/FALSE
+#     POST_BUILD - TRUE/FALSE
+#     TARGET     - Target name
+#     COMMANDS   - Prepared commands(every token is wrapped in CONDITION)
+#     NAME       - Unique name for custom target
+#     STEP       - PRE_BUILD/PRE_LINK/POST_BUILD
+################################################################################
+function(add_custom_command_if_parse_arguments)
+    cmake_parse_arguments("ARG" "PRE_BUILD;PRE_LINK;POST_BUILD" "TARGET;COMMENT" "DEPENDS;OUTPUT;COMMANDS" ${ARGN})
+
+    if(WIN32)
+        set(DUMMY "cd.")
+    elseif(UNIX)
+        set(DUMMY "true")
+    endif()
+
+    prepare_commands()
+    prepare_output()
+
+    set(DEPENDS "${ARG_DEPENDS}")
+    set(COMMENT "${ARG_COMMENT}")
+    set(PRE_BUILD "${ARG_PRE_BUILD}")
+    set(PRE_LINK "${ARG_PRE_LINK}")
+    set(POST_BUILD "${ARG_POST_BUILD}")
+    set(TARGET "${ARG_TARGET}")
+    if(PRE_BUILD)
+        set(STEP "PRE_BUILD")
+    elseif(PRE_LINK)
+        set(STEP "PRE_LINK")
+    elseif(POST_BUILD)
+        set(STEP "POST_BUILD")
+    endif()
+    set(NAME "${TARGET}_${STEP}")
+
+    set(OUTPUT "${OUTPUT}" PARENT_SCOPE)
+    set(DEPENDS "${DEPENDS}" PARENT_SCOPE)
+    set(COMMENT "${COMMENT}" PARENT_SCOPE)
+    set(PRE_BUILD "${PRE_BUILD}" PARENT_SCOPE)
+    set(PRE_LINK "${PRE_LINK}" PARENT_SCOPE)
+    set(POST_BUILD "${POST_BUILD}" PARENT_SCOPE)
+    set(TARGET "${TARGET}" PARENT_SCOPE)
+    set(COMMANDS "${COMMANDS}" PARENT_SCOPE)
+    set(STEP "${STEP}" PARENT_SCOPE)
+    set(NAME "${NAME}" PARENT_SCOPE)
+endfunction()
+
+################################################################################
+# Add conditional custom command
+#
+# Generating Files
+# The first signature is for adding a custom command to produce an output:
+#     add_custom_command_if(
+#         <OUTPUT output1 [output2 ...]>
+#         <COMMANDS>
+#         <COMMAND condition command1 [args1...]>
+#         [COMMAND condition command2 [args2...]]
+#         [DEPENDS [depends...]]
+#         [COMMENT comment]
+#
+# Build Events
+#     add_custom_command_if(
+#         <TARGET target>
+#         <PRE_BUILD | PRE_LINK | POST_BUILD>
+#         <COMMAND condition command1 [args1...]>
+#         [COMMAND condition command2 [args2...]]
+#         [COMMENT comment]
+#
+# Input:
+#     output     - Output files the command is expected to produce
+#     condition  - Generator expression for wrapping the command
+#     command    - Command-line(s) to execute at build time.
+#     args       - Command`s args
+#     depends    - Files on which the command depends
+#     comment    - Display the given message before the commands are executed at
+#                  build time.
+#     PRE_BUILD  - Run before any other rules are executed within the target
+#     PRE_LINK   - Run after sources have been compiled but before linking the
+#                  binary
+#     POST_BUILD - Run after all other rules within the target have been
+#                  executed
+################################################################################
+function(add_custom_command_if)
+    add_custom_command_if_parse_arguments(${ARGN})
+
+    if(OUTPUT AND TARGET)
+        message(FATAL_ERROR  "Wrong syntax. A TARGET and OUTPUT can not both be specified.")
+    endif()
+
+    if(OUTPUT)
+        add_custom_command(OUTPUT ${OUTPUT}
+                           ${COMMANDS}
+                           DEPENDS ${DEPENDS}
+                           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                           COMMENT ${COMMENT})
+    elseif(TARGET)
+        if(PRE_BUILD AND NOT ${CMAKE_GENERATOR} MATCHES "Visual Studio")
+            add_custom_target(
+                ${NAME}
+                ${COMMANDS}
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                COMMENT ${COMMENT})
+            add_dependencies(${TARGET} ${NAME})
+        else()
+            add_custom_command(
+                TARGET ${TARGET}
+                ${STEP}
+                ${COMMANDS}
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                COMMENT ${COMMENT})
+        endif()
+    else()
+        message(FATAL_ERROR "Wrong syntax. A TARGET or OUTPUT must be specified.")
+    endif()
+endfunction()
+
+################################################################################
+# Use props file for a target and configs
+#     use_props(<target> <configs...> <props_file>)
+# Inside <props_file> there are following variables:
+#     PROPS_TARGET   - <target>
+#     PROPS_CONFIG   - One of <configs...>
+#     PROPS_CONFIG_U - Uppercase PROPS_CONFIG
+# Input:
+#     target      - Target to apply props file
+#     configs     - Build configurations to apply props file
+#     props_file  - CMake script
+################################################################################
+macro(use_props TARGET CONFIGS PROPS_FILE)
+    set(PROPS_TARGET "${TARGET}")
+    foreach(PROPS_CONFIG ${CONFIGS})
+        string(TOUPPER "${PROPS_CONFIG}" PROPS_CONFIG_U)
+
+        get_filename_component(ABSOLUTE_PROPS_FILE "${PROPS_FILE}" ABSOLUTE BASE_DIR "${CMAKE_CURRENT_LIST_DIR}")
+        if(EXISTS "${ABSOLUTE_PROPS_FILE}")
+            include("${ABSOLUTE_PROPS_FILE}")
+        else()
+            message(WARNING "Corresponding cmake file from props \"${ABSOLUTE_PROPS_FILE}\" doesn't exist")
+        endif()
+    endforeach()
+endmacro()
+
+################################################################################
+# Add compile options to source file
+#     source_file_compile_options(<source_file> [compile_options...])
+# Input:
+#     source_file     - Source file
+#     compile_options - Options to add to COMPILE_FLAGS property
+################################################################################
+function(source_file_compile_options SOURCE_FILE)
+    if("${ARGC}" LESS_EQUAL "1")
+        return()
+    endif()
+
+    get_source_file_property(COMPILE_OPTIONS "${SOURCE_FILE}" COMPILE_OPTIONS)
+
+    if(COMPILE_OPTIONS)
+        list(APPEND COMPILE_OPTIONS ${ARGN})
+    else()
+        set(COMPILE_OPTIONS "${ARGN}")
+    endif()
+
+    set_source_files_properties("${SOURCE_FILE}" PROPERTIES COMPILE_OPTIONS "${COMPILE_OPTIONS}")
+endfunction()
+
+################################################################################
+# Default properties of visual studio projects
+################################################################################
+set(DEFAULT_CXX_PROPS "${CMAKE_CURRENT_LIST_DIR}/DefaultCXX.cmake")

OTRExporter/CMakeLists.txt

@@ -0,0 +1,102 @@
+cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR)
+
+set(CMAKE_SYSTEM_VERSION 10.0 CACHE STRING "" FORCE)
+set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")
+#set(CMAKE_C_STANDARD 11 CACHE STRING "The C standard to use")
+set(CMAKE_C_STANDARD 11)
+
+project(OTRExporter C CXX)
+
+################################################################################
+# Set target arch type if empty. Visual studio solution generator provides it.
+################################################################################
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+	if(NOT CMAKE_VS_PLATFORM_NAME)
+		set(CMAKE_VS_PLATFORM_NAME "x64")
+	endif()
+	message("${CMAKE_VS_PLATFORM_NAME} architecture in use")
+
+	if(NOT ("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64"
+		OR "${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32"))
+		message(FATAL_ERROR "${CMAKE_VS_PLATFORM_NAME} arch is not supported!")
+	endif()
+endif()
+
+################################################################################
+# Global configuration types
+################################################################################
+set(CMAKE_CONFIGURATION_TYPES
+    "Debug"
+    "Release"
+    CACHE STRING "" FORCE
+)
+
+################################################################################
+# Global compiler options
+################################################################################
+if(MSVC)
+    # remove default flags provided with CMake for MSVC
+    set(CMAKE_C_FLAGS "")
+    set(CMAKE_C_FLAGS_DEBUG "")
+    set(CMAKE_C_FLAGS_RELEASE "")
+    set(CMAKE_CXX_FLAGS "")
+    set(CMAKE_CXX_FLAGS_DEBUG "")
+    set(CMAKE_CXX_FLAGS_RELEASE "")
+endif()
+
+################################################################################
+# Global linker options
+################################################################################
+if(MSVC)
+    # remove default flags provided with CMake for MSVC
+    set(CMAKE_EXE_LINKER_FLAGS "")
+    set(CMAKE_MODULE_LINKER_FLAGS "")
+    set(CMAKE_SHARED_LINKER_FLAGS "")
+    set(CMAKE_STATIC_LINKER_FLAGS "")
+    set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS}")
+    set(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS}")
+    set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS}")
+    set(CMAKE_STATIC_LINKER_FLAGS_DEBUG "${CMAKE_STATIC_LINKER_FLAGS}")
+    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS}")
+    set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS}")
+    set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS}")
+    set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS}")
+endif()
+
+################################################################################
+# Common utils
+################################################################################
+include(CMake/Utils.cmake)
+
+################################################################################
+# Additional Global Settings(add specific info there)
+################################################################################
+include(CMake/GlobalSettingsInclude.cmake OPTIONAL)
+
+################################################################################
+# Use solution folders feature
+################################################################################
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+################################################################################
+# Sub-projects
+################################################################################
+if (NOT TARGET libultraship)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/libultraship ${CMAKE_BINARY_DIR}/libultraship)
+endif()
+
+if (NOT TARGET ZAPD)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../ZAPDTR/ZAPD ${CMAKE_BINARY_DIR}/ZAPD)
+endif()
+
+if (NOT TARGET ZAPDUtils)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../ZAPDTR/ZAPDUtils ${CMAKE_BINARY_DIR}/ZAPDUtils)
+endif()
+
+add_subdirectory(OTRExporter)
+
+file(READ ${CMAKE_CURRENT_SOURCE_DIR}/extract_assets.py filedata)
+string(REGEX REPLACE "../ZAPDTR/ZAPD.out" "${CMAKE_BINARY_DIR}/ZAPD/ZAPD.out" filedata "${filedata}")
+file(WRITE "${CMAKE_CURRENT_SOURCE_DIR}/extract_assets_cmake.py" "${filedata}")
+file(CHMOD "${CMAKE_CURRENT_SOURCE_DIR}/extract_assets_cmake.py" PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+

OTRExporter/OTRExporter.sln

@@ -1,79 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30320.27
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OTRExporter", "OTRExporter\OTRExporter.vcxproj", "{A6103FD3-0709-4FC7-B066-1A6E056D6306}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8} = {6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libultraship", "..\libultraship\libultraship\libultraship.vcxproj", "{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZAPD", "..\ZAPDTR\ZAPD\ZAPD.vcxproj", "{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}"
-	ProjectSection(ProjectDependencies) = postProject
-		{78424708-1F6E-4D4B-920C-FB6D26847055} = {78424708-1F6E-4D4B-920C-FB6D26847055}
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8} = {6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908} = {A2E01C3E-D647-45D1-9788-043DEBC1A908}
-		{A6103FD3-0709-4FC7-B066-1A6E056D6306} = {A6103FD3-0709-4FC7-B066-1A6E056D6306}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZAPDUtils", "..\ZAPDTR\ZAPDUtils\ZAPDUtils.vcxproj", "{A2E01C3E-D647-45D1-9788-043DEBC1A908}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib", "..\StormLib\StormLib_vs19.vcxproj", "{78424708-1F6E-4D4B-920C-FB6D26847055}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A6103FD3-0709-4FC7-B066-1A6E056D6306}.Debug|x64.ActiveCfg = Debug|x64
-		{A6103FD3-0709-4FC7-B066-1A6E056D6306}.Debug|x64.Build.0 = Debug|x64
-		{A6103FD3-0709-4FC7-B066-1A6E056D6306}.Debug|x86.ActiveCfg = Debug|Win32
-		{A6103FD3-0709-4FC7-B066-1A6E056D6306}.Debug|x86.Build.0 = Debug|Win32
-		{A6103FD3-0709-4FC7-B066-1A6E056D6306}.Release|x64.ActiveCfg = Release|x64
-		{A6103FD3-0709-4FC7-B066-1A6E056D6306}.Release|x64.Build.0 = Release|x64
-		{A6103FD3-0709-4FC7-B066-1A6E056D6306}.Release|x86.ActiveCfg = Release|Win32
-		{A6103FD3-0709-4FC7-B066-1A6E056D6306}.Release|x86.Build.0 = Release|Win32
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Debug|x64.ActiveCfg = Debug|x64
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Debug|x64.Build.0 = Debug|x64
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Debug|x86.ActiveCfg = Debug|Win32
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Debug|x86.Build.0 = Debug|Win32
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Release|x64.ActiveCfg = Release|x64
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Release|x64.Build.0 = Release|x64
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Release|x86.ActiveCfg = Release|Win32
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Release|x86.Build.0 = Release|Win32
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Debug|x64.ActiveCfg = Debug|x64
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Debug|x64.Build.0 = Debug|x64
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Debug|x86.ActiveCfg = Debug|Win32
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Debug|x86.Build.0 = Debug|Win32
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Release|x64.ActiveCfg = Release|x64
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Release|x64.Build.0 = Release|x64
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Release|x86.ActiveCfg = Release|Win32
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Release|x86.Build.0 = Release|Win32
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Debug|x64.ActiveCfg = Debug|x64
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Debug|x64.Build.0 = Debug|x64
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Debug|x86.ActiveCfg = Debug|Win32
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Debug|x86.Build.0 = Debug|Win32
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Release|x64.ActiveCfg = Release|x64
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Release|x64.Build.0 = Release|x64
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Release|x86.ActiveCfg = Release|Win32
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Release|x86.Build.0 = Release|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x64.ActiveCfg = DebugUS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x64.Build.0 = DebugUS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x86.ActiveCfg = DebugAD|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x86.Build.0 = DebugAD|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x64.ActiveCfg = ReleaseUS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x64.Build.0 = ReleaseUS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x86.ActiveCfg = ReleaseAS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x86.Build.0 = ReleaseAS|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {DCE19FF1-37C0-49CD-915A-DD695E15F00B}
-	EndGlobalSection
-EndGlobal

OTRExporter/OTRExporter/CMakeLists.txt

@@ -0,0 +1,249 @@
+set(PROJECT_NAME OTRExporter)
+
+################################################################################
+# Source groups
+################################################################################
+set(Header_Files
+    "AnimationExporter.h"
+    "ArrayExporter.h"
+    "AudioExporter.h"
+    "BackgroundExporter.h"
+    "BlobExporter.h"
+    "CollisionExporter.h"
+    "command_macros_base.h"
+    "CutsceneExporter.h"
+    "DisplayListExporter.h"
+    "Exporter.h"
+    "Main.h"
+    "MtxExporter.h"
+    "PathExporter.h"
+    "PlayerAnimationExporter.h"
+    "RoomExporter.h"
+    "SkeletonExporter.h"
+    "SkeletonLimbExporter.h"
+    "TextExporter.h"
+    "TextureExporter.h"
+    "VersionInfo.h"
+    "VtxExporter.h"
+    "z64cutscene.h"
+    "z64cutscene_commands.h"
+)
+source_group("Header Files" FILES ${Header_Files})
+
+set(Source_Files
+    "AnimationExporter.cpp"
+    "ArrayExporter.cpp"
+    "AudioExporter.cpp"
+    "BackgroundExporter.cpp"
+    "BlobExporter.cpp"
+    "CollisionExporter.cpp"
+    "CutsceneExporter.cpp"
+    "DisplayListExporter.cpp"
+    "Exporter.cpp"
+    "Main.cpp"
+    "MtxExporter.cpp"
+    "PathExporter.cpp"
+    "PlayerAnimationExporter.cpp"
+    "RoomExporter.cpp"
+    "SkeletonExporter.cpp"
+    "SkeletonLimbExporter.cpp"
+    "TextExporter.cpp"
+    "TextureExporter.cpp"
+    "VersionInfo.cpp"
+    "VtxExporter.cpp"
+)
+source_group("Source Files" FILES ${Source_Files})
+
+set(ALL_FILES
+    ${Header_Files}
+    ${Source_Files}
+)
+
+################################################################################
+# Target
+################################################################################
+add_library(${PROJECT_NAME} STATIC ${ALL_FILES})
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+use_props(${PROJECT_NAME} "${CMAKE_CONFIGURATION_TYPES}" "${DEFAULT_CXX_PROPS}")
+endif()
+
+set(ROOT_NAMESPACE OTRExporter)
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+	set_target_properties(${PROJECT_NAME} PROPERTIES
+		VS_GLOBAL_KEYWORD "Win32Proj"
+	)
+	if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+		set_target_properties(${PROJECT_NAME} PROPERTIES
+			INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE"
+		)
+	elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86")
+		set_target_properties(${PROJECT_NAME} PROPERTIES
+			INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE"
+		)
+	endif()
+endif()
+################################################################################
+# MSVC runtime library
+################################################################################
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+	get_property(MSVC_RUNTIME_LIBRARY_DEFAULT TARGET ${PROJECT_NAME} PROPERTY MSVC_RUNTIME_LIBRARY)
+	if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+		string(CONCAT "MSVC_RUNTIME_LIBRARY_STR"
+			$<$<CONFIG:Debug>:
+				MultiThreadedDebug
+			>
+			$<$<CONFIG:Release>:
+				MultiThreaded
+			>
+			$<$<NOT:$<OR:$<CONFIG:Debug>,$<CONFIG:Release>>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}>
+		)
+	endif()
+	set_target_properties(${PROJECT_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY ${MSVC_RUNTIME_LIBRARY_STR})
+endif()
+################################################################################
+# Compile definitions
+################################################################################
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+	if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+		target_compile_definitions(${PROJECT_NAME} PRIVATE
+			"$<$<CONFIG:Debug>:"
+				"_DEBUG"
+			">"
+			"$<$<CONFIG:Release>:"
+				"NDEBUG"
+			">"
+			"_CONSOLE;"
+			"_CRT_SECURE_NO_WARNINGS;"
+			"UNICODE;"
+			"_UNICODE"
+			STORMLIB_NO_AUTO_LINK
+		)
+	elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86")
+		target_compile_definitions(${PROJECT_NAME} PRIVATE
+			"$<$<CONFIG:Debug>:"
+				"_DEBUG;"
+				"_CRT_SECURE_NO_WARNINGS"
+			">"
+			"$<$<CONFIG:Release>:"
+				"NDEBUG"
+			">"
+			"WIN32;"
+			"_CONSOLE;"
+			"UNICODE;"
+			"_UNICODE"
+			STORMLIB_NO_AUTO_LINK
+		)
+	endif()
+endif()
+
+if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|AppleClang")
+	target_compile_definitions(${PROJECT_NAME} PRIVATE
+		"$<$<CONFIG:Debug>:"
+				"_DEBUG"
+		">"
+		"$<$<CONFIG:Release>:"
+			"NDEBUG"
+		">"
+		"_CONSOLE;"
+		"_CRT_SECURE_NO_WARNINGS;"
+		"UNICODE;"
+		"_UNICODE"
+	)
+endif()
+################################################################################
+# Compile and link options
+################################################################################
+
+target_include_directories(${PROJECT_NAME} PRIVATE
+	${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/ZAPD/
+	${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/ZAPDUtils
+	${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/lib/tinyxml2
+	${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/libultraship
+	${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/libultraship/Lib/spdlog/include
+	${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/libultraship/Lib/Fast3D/U64
+	${CMAKE_CURRENT_SOURCE_DIR}/../../StormLib/src
+	.
+)
+
+if(MSVC)
+    if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+        target_compile_options(${PROJECT_NAME} PRIVATE
+            $<$<CONFIG:Release>:
+                /Oi;
+                /Gy
+            >
+            /permissive-;
+            /sdl;
+            /W3;
+            ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT};
+            ${DEFAULT_CXX_EXCEPTION_HANDLING}
+        )
+    elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86")
+        target_compile_options(${PROJECT_NAME} PRIVATE
+            $<$<CONFIG:Release>:
+                /Oi;
+                /Gy
+            >
+            /permissive-;
+            /sdl;
+            /W3;
+            ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT};
+            ${DEFAULT_CXX_EXCEPTION_HANDLING}
+        )
+    endif()
+    if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+        target_link_options(${PROJECT_NAME} PRIVATE
+            $<$<CONFIG:Release>:
+                /OPT:REF;
+                /OPT:ICF
+            >
+            /SUBSYSTEM:CONSOLE
+        )
+    elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86")
+        target_link_options(${PROJECT_NAME} PRIVATE
+            $<$<CONFIG:Release>:
+                /DEBUG;
+                /OPT:REF;
+                /OPT:ICF;
+                /INCREMENTAL:NO
+            >
+            /SUBSYSTEM:CONSOLE
+        )
+    endif()
+endif()
+
+if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|AppleClang")
+	target_compile_options(${PROJECT_NAME} PRIVATE
+		-Wall -Wextra -Wno-error
+        -Wno-unused-parameter
+        -Wno-unused-function
+        -Wno-unused-variable
+		-Wno-missing-field-initializers
+        -Wno-parentheses
+        -Wno-narrowing
+        $<$<COMPILE_LANGUAGE:CXX>:-Wno-deprecated-enum-enum-conversion>
+	)
+endif()
+################################################################################
+# Dependencies
+################################################################################
+add_dependencies(${PROJECT_NAME}
+    libultraship
+)
+
+# Link with other targets.
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+	if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+		set(ADDITIONAL_LIBRARY_DEPENDENCIES
+			"$<$<CONFIG:Debug>:"
+				"ZAPDUtils;"
+				"OTRLib"
+			">"
+		)
+	endif()
+endif()
+target_link_libraries(${PROJECT_NAME} PUBLIC "${ADDITIONAL_LIBRARY_DEPENDENCIES}")
+

OTRExporter/OTRExporter/Makefile

@@ -1,72 +0,0 @@
-# Only used for standalone compilation, usually inherits these from the main makefile
-
-CXX ?= g++
-AR	:= ar
-FORMAT := clang-format-11
-
-ASAN ?= 0
-DEBUG ?= 1
-OPTFLAGS ?= -O0
-LTO ?= 0
-
-WARN := -Wall -Wextra -Werror \
-	-Wno-unused-parameter \
-	-Wno-unused-function \
-	-Wno-unused-variable \
-	-Wno-error=multichar
-
-
-CXXFLAGS := $(WARN) -std=c++17 
-CPPFLAGS := -MMD
-
-ifneq ($(DEBUG),0)
-	CXXFLAGS += -g
-endif
-
-ifneq ($(ASAN),0)
-	CXXFLAGS += -fsanitize=address
-endif
-
-ifneq ($(LTO),0)
-	CXXFLAGS += -flto
-endif
-
-SRC_DIRS  := $(shell find . -type d -not -path "*build*")
-CXX_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.cpp))
-H_FILES   := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.h))
-
-O_FILES   := $(CXX_FILES:%.cpp=build/%.o)
-D_FILES   := $(O_FILES:%.o=%.d)
-LIB       := OTRExporter.a
-
-INC_DIRS := $(addprefix -I, \
-	../../ZAPDTR/ZAPD \
-	../../ZAPDTR/lib/tinyxml2 \
-	../../ZAPDTR/lib/libgfxd \
-	../../ZAPDTR/ZAPDUtils \
-	../../libultraship/libultraship \
-	../../libultraship/libultraship/Lib/spdlog/include \
-	../../libultraship/libultraship/Lib/Fast3D/U64 \
-	../../StormLib/src \
-)
-
-# create build directories
-$(shell mkdir -p $(SRC_DIRS:%=build/%))
-
-all: $(LIB)
-
-clean:
-	rm -rf build $(LIB)
-
-format:
-	$(FORMAT) -i $(CXX_FILES) $(H_FILES)
-
-.PHONY: all clean format
-
-build/%.o: %.cpp
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(OPTFLAGS) $(INC_DIRS) -c $< -o $@
-
-$(LIB): $(O_FILES)
-	$(AR) rcs $@ $^
-
--include $(D_FILES)

OTRExporter/OTRExporter/OTRExporter.vcxproj

@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="ArrayExporter.h" />
-    <ClInclude Include="AudioExporter.h" />
-    <ClInclude Include="BackgroundExporter.h" />
-    <ClInclude Include="BlobExporter.h" />
-    <ClInclude Include="CollisionExporter.h" />
-    <ClInclude Include="command_macros_base.h" />
-    <ClInclude Include="CutsceneExporter.h" />
-    <ClInclude Include="DisplayListExporter.h" />
-    <ClInclude Include="AnimationExporter.h" />
-    <ClInclude Include="Main.h" />
-    <ClInclude Include="Exporter.h" />
-    <ClInclude Include="MtxExporter.h" />
-    <ClInclude Include="SkeletonExporter.h" />
-    <ClInclude Include="SkeletonLimbExporter.h" />
-    <ClInclude Include="PathExporter.h" />
-    <ClInclude Include="PlayerAnimationExporter.h" />
-    <ClInclude Include="RoomExporter.h" />
-    <ClInclude Include="TextExporter.h" />
-    <ClInclude Include="TextureExporter.h" />
-    <ClInclude Include="VersionInfo.h" />
-    <ClInclude Include="VtxExporter.h" />
-    <ClInclude Include="z64cutscene.h" />
-    <ClInclude Include="z64cutscene_commands.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="ArrayExporter.cpp" />
-    <ClCompile Include="AudioExporter.cpp" />
-    <ClCompile Include="BackgroundExporter.cpp" />
-    <ClCompile Include="BlobExporter.cpp" />
-    <ClCompile Include="CollisionExporter.cpp" />
-    <ClCompile Include="CutsceneExporter.cpp" />
-    <ClCompile Include="DisplayListExporter.cpp" />
-    <ClCompile Include="AnimationExporter.cpp" />
-    <ClCompile Include="Main.cpp" />
-    <ClCompile Include="Exporter.cpp" />
-    <ClCompile Include="MtxExporter.cpp" />
-    <ClCompile Include="SkeletonExporter.cpp" />
-    <ClCompile Include="SkeletonLimbExporter.cpp" />
-    <ClCompile Include="PathExporter.cpp" />
-    <ClCompile Include="PlayerAnimationExporter.cpp" />
-    <ClCompile Include="RoomExporter.cpp" />
-    <ClCompile Include="TextExporter.cpp" />
-    <ClCompile Include="TextureExporter.cpp" />
-    <ClCompile Include="VersionInfo.cpp" />
-    <ClCompile Include="VtxExporter.cpp" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{a6103fd3-0709-4fc7-b066-1a6e056d6306}</ProjectGuid>
-    <RootNamespace>OTRExporter</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(SolutionDir)otrlib;$(SolutionDir)\ZAPD\ZAPD\;$(SolutionDir)\ZAPD\lib\tinyxml2;$(SolutionDir)\ZAPD\lib\libgfxd;$(SolutionDir)\ZAPD\lib\elfio;$(SolutionDir)\ZAPD\lib\assimp\include;$(SolutionDir)\ZAPD\lib\stb;$(ProjectDir);$(IncludePath)</IncludePath>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir)..\..\ZAPDTR\ZAPD;$(ProjectDir)..\..\ZAPDTR\lib\tinyxml2;$(ProjectDir)..\..\ZAPDTR\lib\libgfxd;$(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)..\..\libultraship\libultraship;$(ProjectDir)..\..\libultraship\libultraship\lib\spdlog\include;$(ProjectDir)..\..\libultraship\libultraship\Lib\Fast3D\U64;$(ProjectDir)..\..\StormLib\src\;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ProjectDir)..\..\libultraship\libultraship;$(LibraryPath)</LibraryPath>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(ProjectDir)..\..\ZAPDTR\ZAPD;$(ProjectDir)..\..\ZAPDTR\lib\tinyxml2;$(ProjectDir)..\..\ZAPDTR\lib\libgfxd;$(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)..\..\libultraship\libultraship;$(ProjectDir)..\..\libultraship\libultraship\lib\spdlog\include;$(ProjectDir)..\..\libultraship\libultraship\Lib\Fast3D\U64;$(ProjectDir)..\..\StormLib\src\;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ProjectDir)..\..\libultraship\libultraship;$(LibraryPath)</LibraryPath>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ZAPDUtils.lib;OTRLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

OTRExporter/OTRExporter/OTRExporter.vcxproj.filters

@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="CollisionExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RoomExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="TextureExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DisplayListExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Main.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PlayerAnimationExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="BackgroundExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="VtxExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ArrayExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Exporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="AnimationExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CutsceneExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="z64cutscene.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="z64cutscene_commands.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="command_macros_base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PathExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SkeletonExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SkeletonLimbExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="TextExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="BlobExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MtxExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="VersionInfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="AudioExporter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="CollisionExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RoomExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TextureExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DisplayListExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PlayerAnimationExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SkeletonExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SkeletonLimbExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="BackgroundExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="VtxExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ArrayExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Exporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="AnimationExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CutsceneExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PathExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TextExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="BlobExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MtxExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="VersionInfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="AudioExporter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>

OTRGui/CMake/Default.cmake

@@ -0,0 +1,65 @@
+################################################################################
+# Command for variable_watch. This command issues error message, if a variable
+# is changed. If variable PROPERTY_READER_GUARD_DISABLED is TRUE nothing happens
+#     variable_watch(<variable> property_reader_guard)
+################################################################################
+function(property_reader_guard VARIABLE ACCESS VALUE CURRENT_LIST_FILE STACK)
+    if("${PROPERTY_READER_GUARD_DISABLED}")
+        return()
+    endif()
+
+    if("${ACCESS}" STREQUAL "MODIFIED_ACCESS")
+        message(FATAL_ERROR
+            " Variable ${VARIABLE} is not supposed to be changed.\n"
+            " It is used only for reading target property ${VARIABLE}.\n"
+            " Use\n"
+            "     set_target_properties(\"<target>\" PROPERTIES \"${VARIABLE}\" \"<value>\")\n"
+            " or\n"
+            "     set_target_properties(\"<target>\" PROPERTIES \"${VARIABLE}_<CONFIG>\" \"<value>\")\n"
+            " instead.\n")
+    endif()
+endfunction()
+
+################################################################################
+# Create variable <name> with generator expression that expands to value of
+# target property <name>_<CONFIG>. If property is empty or not set then property
+# <name> is used instead. Variable <name> has watcher property_reader_guard that
+# doesn't allow to edit it.
+#     create_property_reader(<name>)
+# Input:
+#     name - Name of watched property and output variable
+################################################################################
+function(create_property_reader NAME)
+    set(PROPERTY_READER_GUARD_DISABLED TRUE)
+    set(CONFIG_VALUE "$<TARGET_GENEX_EVAL:${PROPS_TARGET},$<TARGET_PROPERTY:${PROPS_TARGET},${NAME}_$<UPPER_CASE:$<CONFIG>>>>")
+    set(IS_CONFIG_VALUE_EMPTY "$<STREQUAL:${CONFIG_VALUE},>")
+    set(GENERAL_VALUE "$<TARGET_GENEX_EVAL:${PROPS_TARGET},$<TARGET_PROPERTY:${PROPS_TARGET},${NAME}>>")
+    set("${NAME}" "$<IF:${IS_CONFIG_VALUE_EMPTY},${GENERAL_VALUE},${CONFIG_VALUE}>" PARENT_SCOPE)
+    variable_watch("${NAME}" property_reader_guard)
+endfunction()
+
+################################################################################
+# Set property $<name>_${PROPS_CONFIG_U} of ${PROPS_TARGET} to <value>
+#     set_config_specific_property(<name> <value>)
+# Input:
+#     name  - Prefix of property name
+#     value - New value
+################################################################################
+function(set_config_specific_property NAME VALUE)
+    set_target_properties("${PROPS_TARGET}" PROPERTIES "${NAME}_${PROPS_CONFIG_U}" "${VALUE}")
+endfunction()
+
+################################################################################
+
+create_property_reader("TARGET_NAME")
+create_property_reader("OUTPUT_DIRECTORY")
+
+set_config_specific_property("TARGET_NAME" "${PROPS_TARGET}")
+set_config_specific_property("OUTPUT_NAME" "${TARGET_NAME}")
+set_config_specific_property("ARCHIVE_OUTPUT_NAME" "${TARGET_NAME}")
+set_config_specific_property("LIBRARY_OUTPUT_NAME" "${TARGET_NAME}")
+set_config_specific_property("RUNTIME_OUTPUT_NAME" "${TARGET_NAME}")
+
+set_config_specific_property("ARCHIVE_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}")
+set_config_specific_property("LIBRARY_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}")
+set_config_specific_property("RUNTIME_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}")

OTRGui/CMake/DefaultCXX.cmake

@@ -0,0 +1,12 @@
+include("${CMAKE_CURRENT_LIST_DIR}/Default.cmake")
+
+set_config_specific_property("OUTPUT_DIRECTORY" "${CMAKE_SOURCE_DIR}$<$<NOT:$<STREQUAL:${CMAKE_VS_PLATFORM_NAME},Win32>>:/${CMAKE_VS_PLATFORM_NAME}>/${PROPS_CONFIG}")
+
+if(MSVC)
+    create_property_reader("DEFAULT_CXX_EXCEPTION_HANDLING")
+    create_property_reader("DEFAULT_CXX_DEBUG_INFORMATION_FORMAT")
+
+    set_target_properties("${PROPS_TARGET}" PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+    set_config_specific_property("DEFAULT_CXX_EXCEPTION_HANDLING" "/EHsc")
+    set_config_specific_property("DEFAULT_CXX_DEBUG_INFORMATION_FORMAT" "/Zi")
+endif()

OTRGui/CMake/Utils.cmake

@@ -0,0 +1,234 @@
+# utils file for projects came from visual studio solution with cmake-converter.
+
+################################################################################
+# Wrap each token of the command with condition
+################################################################################
+cmake_policy(PUSH)
+cmake_policy(SET CMP0054 NEW)
+macro(prepare_commands)
+    unset(TOKEN_ROLE)
+    unset(COMMANDS)
+    foreach(TOKEN ${ARG_COMMANDS})
+        if("${TOKEN}" STREQUAL "COMMAND")
+            set(TOKEN_ROLE "KEYWORD")
+        elseif("${TOKEN_ROLE}" STREQUAL "KEYWORD")
+            set(TOKEN_ROLE "CONDITION")
+        elseif("${TOKEN_ROLE}" STREQUAL "CONDITION")
+            set(TOKEN_ROLE "COMMAND")
+        elseif("${TOKEN_ROLE}" STREQUAL "COMMAND")
+            set(TOKEN_ROLE "ARG")
+        endif()
+
+        if("${TOKEN_ROLE}" STREQUAL "KEYWORD")
+            list(APPEND COMMANDS "${TOKEN}")
+        elseif("${TOKEN_ROLE}" STREQUAL "CONDITION")
+            set(CONDITION ${TOKEN})
+        elseif("${TOKEN_ROLE}" STREQUAL "COMMAND")
+            list(APPEND COMMANDS "$<$<NOT:${CONDITION}>:${DUMMY}>$<${CONDITION}:${TOKEN}>")
+        elseif("${TOKEN_ROLE}" STREQUAL "ARG")
+            list(APPEND COMMANDS "$<${CONDITION}:${TOKEN}>")
+        endif()
+    endforeach()
+endmacro()
+cmake_policy(POP)
+
+################################################################################
+# Transform all the tokens to absolute paths
+################################################################################
+macro(prepare_output)
+    unset(OUTPUT)
+    foreach(TOKEN ${ARG_OUTPUT})
+        if(IS_ABSOLUTE ${TOKEN})
+            list(APPEND OUTPUT "${TOKEN}")
+        else()
+            list(APPEND OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/${TOKEN}")
+        endif()
+    endforeach()
+endmacro()
+
+################################################################################
+# Parse add_custom_command_if args.
+#
+# Input:
+#     PRE_BUILD  - Pre build event option
+#     PRE_LINK   - Pre link event option
+#     POST_BUILD - Post build event option
+#     TARGET     - Target
+#     OUTPUT     - List of output files
+#     DEPENDS    - List of files on which the command depends
+#     COMMANDS   - List of commands(COMMAND condition1 commannd1 args1 COMMAND
+#                  condition2 commannd2 args2 ...)
+# Output:
+#     OUTPUT     - Output files
+#     DEPENDS    - Files on which the command depends
+#     COMMENT    - Comment
+#     PRE_BUILD  - TRUE/FALSE
+#     PRE_LINK   - TRUE/FALSE
+#     POST_BUILD - TRUE/FALSE
+#     TARGET     - Target name
+#     COMMANDS   - Prepared commands(every token is wrapped in CONDITION)
+#     NAME       - Unique name for custom target
+#     STEP       - PRE_BUILD/PRE_LINK/POST_BUILD
+################################################################################
+function(add_custom_command_if_parse_arguments)
+    cmake_parse_arguments("ARG" "PRE_BUILD;PRE_LINK;POST_BUILD" "TARGET;COMMENT" "DEPENDS;OUTPUT;COMMANDS" ${ARGN})
+
+    if(WIN32)
+        set(DUMMY "cd.")
+    elseif(UNIX)
+        set(DUMMY "true")
+    endif()
+
+    prepare_commands()
+    prepare_output()
+
+    set(DEPENDS "${ARG_DEPENDS}")
+    set(COMMENT "${ARG_COMMENT}")
+    set(PRE_BUILD "${ARG_PRE_BUILD}")
+    set(PRE_LINK "${ARG_PRE_LINK}")
+    set(POST_BUILD "${ARG_POST_BUILD}")
+    set(TARGET "${ARG_TARGET}")
+    if(PRE_BUILD)
+        set(STEP "PRE_BUILD")
+    elseif(PRE_LINK)
+        set(STEP "PRE_LINK")
+    elseif(POST_BUILD)
+        set(STEP "POST_BUILD")
+    endif()
+    set(NAME "${TARGET}_${STEP}")
+
+    set(OUTPUT "${OUTPUT}" PARENT_SCOPE)
+    set(DEPENDS "${DEPENDS}" PARENT_SCOPE)
+    set(COMMENT "${COMMENT}" PARENT_SCOPE)
+    set(PRE_BUILD "${PRE_BUILD}" PARENT_SCOPE)
+    set(PRE_LINK "${PRE_LINK}" PARENT_SCOPE)
+    set(POST_BUILD "${POST_BUILD}" PARENT_SCOPE)
+    set(TARGET "${TARGET}" PARENT_SCOPE)
+    set(COMMANDS "${COMMANDS}" PARENT_SCOPE)
+    set(STEP "${STEP}" PARENT_SCOPE)
+    set(NAME "${NAME}" PARENT_SCOPE)
+endfunction()
+
+################################################################################
+# Add conditional custom command
+#
+# Generating Files
+# The first signature is for adding a custom command to produce an output:
+#     add_custom_command_if(
+#         <OUTPUT output1 [output2 ...]>
+#         <COMMANDS>
+#         <COMMAND condition command1 [args1...]>
+#         [COMMAND condition command2 [args2...]]
+#         [DEPENDS [depends...]]
+#         [COMMENT comment]
+#
+# Build Events
+#     add_custom_command_if(
+#         <TARGET target>
+#         <PRE_BUILD | PRE_LINK | POST_BUILD>
+#         <COMMAND condition command1 [args1...]>
+#         [COMMAND condition command2 [args2...]]
+#         [COMMENT comment]
+#
+# Input:
+#     output     - Output files the command is expected to produce
+#     condition  - Generator expression for wrapping the command
+#     command    - Command-line(s) to execute at build time.
+#     args       - Command`s args
+#     depends    - Files on which the command depends
+#     comment    - Display the given message before the commands are executed at
+#                  build time.
+#     PRE_BUILD  - Run before any other rules are executed within the target
+#     PRE_LINK   - Run after sources have been compiled but before linking the
+#                  binary
+#     POST_BUILD - Run after all other rules within the target have been
+#                  executed
+################################################################################
+function(add_custom_command_if)
+    add_custom_command_if_parse_arguments(${ARGN})
+
+    if(OUTPUT AND TARGET)
+        message(FATAL_ERROR  "Wrong syntax. A TARGET and OUTPUT can not both be specified.")
+    endif()
+
+    if(OUTPUT)
+        add_custom_command(OUTPUT ${OUTPUT}
+                           ${COMMANDS}
+                           DEPENDS ${DEPENDS}
+                           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                           COMMENT ${COMMENT})
+    elseif(TARGET)
+        if(PRE_BUILD AND NOT ${CMAKE_GENERATOR} MATCHES "Visual Studio")
+            add_custom_target(
+                ${NAME}
+                ${COMMANDS}
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                COMMENT ${COMMENT})
+            add_dependencies(${TARGET} ${NAME})
+        else()
+            add_custom_command(
+                TARGET ${TARGET}
+                ${STEP}
+                ${COMMANDS}
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                COMMENT ${COMMENT})
+        endif()
+    else()
+        message(FATAL_ERROR "Wrong syntax. A TARGET or OUTPUT must be specified.")
+    endif()
+endfunction()
+
+################################################################################
+# Use props file for a target and configs
+#     use_props(<target> <configs...> <props_file>)
+# Inside <props_file> there are following variables:
+#     PROPS_TARGET   - <target>
+#     PROPS_CONFIG   - One of <configs...>
+#     PROPS_CONFIG_U - Uppercase PROPS_CONFIG
+# Input:
+#     target      - Target to apply props file
+#     configs     - Build configurations to apply props file
+#     props_file  - CMake script
+################################################################################
+macro(use_props TARGET CONFIGS PROPS_FILE)
+    set(PROPS_TARGET "${TARGET}")
+    foreach(PROPS_CONFIG ${CONFIGS})
+        string(TOUPPER "${PROPS_CONFIG}" PROPS_CONFIG_U)
+
+        get_filename_component(ABSOLUTE_PROPS_FILE "${PROPS_FILE}" ABSOLUTE BASE_DIR "${CMAKE_CURRENT_LIST_DIR}")
+        if(EXISTS "${ABSOLUTE_PROPS_FILE}")
+            include("${ABSOLUTE_PROPS_FILE}")
+        else()
+            message(WARNING "Corresponding cmake file from props \"${ABSOLUTE_PROPS_FILE}\" doesn't exist")
+        endif()
+    endforeach()
+endmacro()
+
+################################################################################
+# Add compile options to source file
+#     source_file_compile_options(<source_file> [compile_options...])
+# Input:
+#     source_file     - Source file
+#     compile_options - Options to add to COMPILE_FLAGS property
+################################################################################
+function(source_file_compile_options SOURCE_FILE)
+    if("${ARGC}" LESS_EQUAL "1")
+        return()
+    endif()
+
+    get_source_file_property(COMPILE_OPTIONS "${SOURCE_FILE}" COMPILE_OPTIONS)
+
+    if(COMPILE_OPTIONS)
+        list(APPEND COMPILE_OPTIONS ${ARGN})
+    else()
+        set(COMPILE_OPTIONS "${ARGN}")
+    endif()
+
+    set_source_files_properties("${SOURCE_FILE}" PROPERTIES COMPILE_OPTIONS "${COMPILE_OPTIONS}")
+endfunction()
+
+################################################################################
+# Default properties of visual studio projects
+################################################################################
+set(DEFAULT_CXX_PROPS "${CMAKE_CURRENT_LIST_DIR}/DefaultCXX.cmake")
+set(DEFAULT_Fortran_PROPS "${CMAKE_CURRENT_LIST_DIR}/DefaultFortran.cmake")

OTRGui/CMakeLists.txt

@@ -3,27 +3,61 @@ project(OTRGui)
 
 set(PLATFORM "Desktop")
 set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/build)
+#set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/build)
 set(APP_ICON_RESOURCE_WINDOWS ${CMAKE_CURRENT_SOURCE_DIR}/appicon.rc)
 
-add_subdirectory(libs/raylib)
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    set(OpenGL_GL_PREFERENCE "GLVND")
+endif()
+
+include(CMake/Utils.cmake)
+
+add_subdirectory(libs/raylib EXCLUDE_FROM_ALL)
 
 include_directories(src)
 include_directories(src/game)
 include_directories(include)
 
-include_external_msproject(ZAPD ../../ZAPDTR/ZAPD/ZAPD.vcproj)
+if (NOT TARGET libultraship)
-include_external_msproject(ZAPDUtils ../../ZAPDTR/ZAPDUtils/ZAPDUtils.vcproj)
+    add_subdirectory(../libultraship/libultraship ${CMAKE_BINARY_DIR}/libultraship)
-include_external_msproject(libultraship ../../libultraship/libultraship/libultraship.vcproj)
+endif()
-include_external_msproject(OTRExporter ../../OTRExporter/OTRExporter/OTRExporter.vcproj)
+if (NOT TARGET ZAPD)
+    add_subdirectory(../ZAPDTR/ZAPD ${CMAKE_BINARY_DIR}/ZAPD)
+endif()
+if (NOT TARGET ZAPDUtils)
+    add_subdirectory(../ZAPDTR/ZAPDUtils ${CMAKE_BINARY_DIR}/ZAPDUtils)
+endif()
+if (NOT TARGET OTRExporter)
+    add_subdirectory(../OTRExporter/OTRExporter ${CMAKE_BINARY_DIR}/OTRExporter)
+endif()
+if (NOT TARGET storm)
+    add_subdirectory(../StormLib ${CMAKE_BINARY_DIR}/StormLib)
+endif()
 
 file(GLOB_RECURSE HEADERS src/*.h)
 file(GLOB_RECURSE SOURCES src/*.cpp)
 file(GLOB_RECURSE C_SOURCES src/*.c)
 
 add_executable(${PROJECT_NAME} ${SOURCES} ${C_SOURCES} ${HEADERS} ${APP_ICON_RESOURCE_WINDOWS})
-add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -Dsrc_dir="${CMAKE_SOURCE_DIR}/assets" -Ddst_dir="${CMAKE_CURRENT_BINARY_DIR}/assets" -P "${CMAKE_CURRENT_SOURCE_DIR}/Overwrite.cmake")
+
-add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -Dsrc_dir="${CMAKE_SOURCE_DIR}/../OTRExporter/assets" -Ddst_dir="${CMAKE_CURRENT_BINARY_DIR}/assets/game" -P "${CMAKE_CURRENT_SOURCE_DIR}/Overwrite.cmake")
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
-add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -Dsrc_dir="${CMAKE_SOURCE_DIR}/../soh/assets/xml" -Ddst_dir="${CMAKE_CURRENT_BINARY_DIR}/assets/extractor/xmls" -P "${CMAKE_CURRENT_SOURCE_DIR}/Overwrite.cmake")
+use_props(${PROJECT_NAME} "${CMAKE_CONFIGURATION_TYPES}" "${DEFAULT_CXX_PROPS}")
+endif()
+
+add_custom_target(Assets ALL
+    COMMAND ${CMAKE_COMMAND} -Dsrc_dir="${CMAKE_CURRENT_SOURCE_DIR}/assets" -Ddst_dir="${CMAKE_CURRENT_BINARY_DIR}/assets" -P "${CMAKE_CURRENT_SOURCE_DIR}/Overwrite.cmake"
+    COMMAND ${CMAKE_COMMAND} -Dsrc_dir="${CMAKE_CURRENT_SOURCE_DIR}/../OTRExporter/assets" -Ddst_dir="${CMAKE_CURRENT_BINARY_DIR}/assets/game" -P "${CMAKE_CURRENT_SOURCE_DIR}/Overwrite.cmake"
+    COMMAND ${CMAKE_COMMAND} -Dsrc_dir="${CMAKE_CURRENT_SOURCE_DIR}/../soh/assets/xml" -Ddst_dir="${CMAKE_CURRENT_BINARY_DIR}/assets/extractor/xmls" -P "${CMAKE_CURRENT_SOURCE_DIR}/Overwrite.cmake"
+    )
+ 
+add_dependencies(OTRGui Assets)
 
 target_link_libraries(${PROJECT_NAME} PUBLIC raylib)
+
+INSTALL(TARGETS OTRGui DESTINATION . COMPONENT ship)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/assets
+        DESTINATION .
+	COMPONENT ship
+)
+INSTALL(TARGETS ZAPD DESTINATION assets/extractor COMPONENT ship)
+

OTRGui/Overwrite.cmake

@@ -1,10 +1,15 @@
-file(GLOB_RECURSE _file_list RELATIVE "${src_dir}" "${src_dir}/*")
+include(CMakePrintHelpers)
+
+string(REPLACE "\\ " " " sources_dir "${src_dir}")
+string(REPLACE "\\ " " " destination_dir "${dst_dir}")
+
+file(GLOB_RECURSE _file_list RELATIVE "${sources_dir}" "${sources_dir}/*")
 
 foreach( each_file ${_file_list} )
-  set(destinationfile "${dst_dir}/${each_file}")
+  set(destinationfile "${destination_dir}/${each_file}")
-  set(sourcefile "${src_dir}/${each_file}")
+  set(sourcefile "${sources_dir}/${each_file}")
   if(NOT EXISTS ${destinationfile} OR ${sourcefile} IS_NEWER_THAN ${destinationfile})
     get_filename_component(destinationdir ${destinationfile} DIRECTORY)
     file(COPY ${sourcefile} DESTINATION ${destinationdir})
   endif()
-endforeach(each_file)
+endforeach(each_file)

StormLib/CMakeLists.txt

@@ -1,8 +1,9 @@
-project(StormLib)
+set(PROJECT_NAME StormLib)
+#project(StormLib)
 cmake_minimum_required(VERSION 3.10)
 
 set(LIBRARY_NAME storm)
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
@@ -15,6 +16,13 @@ option(STORM_BUILD_TESTS
 #   "BUILD_TESTING" OFF # Stay coherent with CTest variables
 )
 
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+set(Source_Files__Windows
+           src/lzma/C/LzFindMt.c
+           src/lzma/C/Threads.c
+)
+endif()
+
 set(SRC_FILES
            src/adpcm/adpcm.cpp
            src/huffman/huff.cpp
@@ -46,6 +54,7 @@ set(SRC_FILES
            src/SFileVerify.cpp
            src/libtomcrypt/src/pk/rsa/rsa_verify_simple.c
            src/libtomcrypt/src/misc/crypt_libc.c
+           ${Source_Files__Windows}
 )
 
 if(MSVC)
@@ -333,6 +342,76 @@ if(WIN32)
     set_target_properties(${LIBRARY_NAME} PROPERTIES OUTPUT_NAME "StormLib")
 endif()
 
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+use_props(${LIBRARY_NAME} "${CMAKE_CONFIGURATION_TYPES}" "${DEFAULT_CXX_PROPS}")
+endif()
+
+################################################################################
+# Compile definitions
+################################################################################
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+       if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+               target_compile_definitions(${LIBRARY_NAME} PRIVATE
+                       "$<$<CONFIG:Debug>:"
+                               "_DEBUG;"
+                               "_CRT_SECURE_NO_WARNINGS;"
+                       ">"
+                       "$<$<CONFIG:Release>:"
+                               "NDEBUG"
+                       ">"
+                       WIN32
+                       _LIB
+                       "UNICODE;"
+                       "_UNICODE"
+               )
+       elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
+               target_compile_definitions(${LIBRARY_NAME} PRIVATE
+                       "$<$<CONFIG:Debug>:"
+                               "_DEBUG;"
+                               "_CRT_SECURE_NO_WARNINGS;"
+                       ">"
+                       "$<$<CONFIG:Release>:"
+                               "NDEBUG;"
+                       ">"
+                       "WIN32;"
+                       _LIB
+                       "UNICODE;"
+                       "_UNICODE"
+               )
+       endif()
+endif()
+
+################################################################################
+# MSVC runtime library
+################################################################################
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+        get_property(MSVC_RUNTIME_LIBRARY_DEFAULT TARGET ${LIBRARY_NAME} PROPERTY MSVC_RUNTIME_LIBRARY)
+        if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+                string(CONCAT "MSVC_RUNTIME_LIBRARY_STR"
+                        $<$<CONFIG:Debug>:
+                                MultiThreadedDebug
+                        >
+                        $<$<CONFIG:Release>:
+                                MultiThreaded
+                        >
+                        $<$<NOT:$<OR:$<CONFIG:Debug>,$<CONFIG:Release>>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}>
+                )
+        elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
+                string(CONCAT "MSVC_RUNTIME_LIBRARY_STR"
+                        $<$<CONFIG:Debug>:
+                                MultiThreadedDebug
+                        >
+                        $<$<CONFIG:Release>:
+                                MultiThreaded
+                        >
+                        $<$<NOT:$<OR:$<CONFIG:Debug>,$<CONFIG:Release>>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}>
+                )
+        endif()
+        set_target_properties(${LIBRARY_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY ${MSVC_RUNTIME_LIBRARY_STR})
+endif()
+
+
 target_link_libraries(${LIBRARY_NAME} ${LINK_LIBS})
 target_compile_definitions(${LIBRARY_NAME} INTERFACE STORMLIB_NO_AUTO_LINK) #CMake will take care of the linking
 target_include_directories(${LIBRARY_NAME} PUBLIC src/)

ZAPDTR/Makefile

@@ -1,146 +0,0 @@
-# use variables in submakes
-export
-OPTIMIZATION_ON ?= 1
-ASAN ?= 0
-DEPRECATION_ON ?= 1
-DEBUG ?= 0
-COPYCHECK_ARGS ?=
-LLD ?= 0
-WERROR ?= 0
-UNAME := $(shell uname)
-
-# Use clang++ if available, else use g++
-ifeq ($(shell command -v clang++ >/dev/null 2>&1; echo $$?),0)
-  CXX ?= clang++
-else
-  CXX ?= g++
-endif
-
-INC := -I ZAPD -I lib/elfio -I lib/libgfxd -I lib/tinyxml2 -I ZAPDUtils
-CXXFLAGS := -fpic -std=c++17 -Wall -Wextra -fno-omit-frame-pointer
-OPTFLAGS :=
-
-ifneq ($(DEBUG),0)
-  OPTIMIZATION_ON = 0
-  CXXFLAGS += -g3 -DDEVELOPMENT -D_DEBUG
-  COPYCHECK_ARGS += --devel
-  DEPRECATION_ON = 0
-endif
-
-ifneq ($(WERROR),0)
-  CXXFLAGS += -Werror
-endif
-
-ifeq ($(OPTIMIZATION_ON),0)
-  OPTFLAGS := -O0
-else
-  OPTFLAGS := -O2
-endif
-
-ifneq ($(ASAN),0)
-  CXXFLAGS += -fsanitize=address -fsanitize=pointer-compare -fsanitize=pointer-subtract -fsanitize=undefined
-endif
-ifneq ($(DEPRECATION_ON),0)
-  CXXFLAGS += -DDEPRECATION_ON
-endif
-# CXXFLAGS += -DTEXTURE_DEBUG
-
-LDFLAGS := -Llib/libgfxd -L../libultraship -L../StormLib/build \
-  -pthread -lgfxd -lultraship ZAPDUtils/ZAPDUtils.a -lstorm -lbz2 -lm -ldl
-
-LDFLAGS += $(shell pkg-config --libs glew libpng zlib) $(shell sdl2-config --libs)
-INC += $(shell pkg-config --cflags libpng)
-
-ifeq ($(UNAME), Darwin)
-  LDFLAGS += -framework OpenGL -framework Foundation
-endif
-
-ifeq ($(UNAME), Linux)
-  LDFLAGS += $(shell pkg-config --libs x11 libpulse)
-endif
-
-# Use LLD if available. Set LLD=0 to not use it
-ifeq ($(shell command -v ld.lld >/dev/null 2>&1; echo $$?),0)
-  LLD := 1
-endif
-
-ifneq ($(LLD),0)
-  LDFLAGS += -fuse-ld=lld
-endif
-
-UNAMEM := $(shell uname -m)
-ifeq ($(UNAME), Linux)
-  LDFLAGS += -Wl,-export-dynamic -lstdc++fs
-  EXPORTERS := -Wl,--whole-archive ../OTRExporter/OTRExporter/OTRExporter.a -Wl,--no-whole-archive
-endif
-
-ifeq ($(UNAME), Darwin)
-  EXPORTERS := -Wl,-force_load ../OTRExporter/OTRExporter/OTRExporter.a
-endif
-
-
-ZAPD_SRC_DIRS := $(shell find ZAPD -type d)
-SRC_DIRS = $(ZAPD_SRC_DIRS) lib/tinyxml2
-
-ZAPD_CPP_FILES := $(foreach dir,$(ZAPD_SRC_DIRS),$(wildcard $(dir)/*.cpp))
-ZAPD_H_FILES   := $(foreach dir,$(ZAPD_SRC_DIRS),$(wildcard $(dir)/*.h))
-
-CPP_FILES += $(ZAPD_CPP_FILES) lib/tinyxml2/tinyxml2.cpp
-O_FILES   := $(foreach f,$(CPP_FILES:.cpp=.o),build/$f)
-O_FILES   += build/ZAPD/BuildInfo.o
-
-# create build directories
-$(shell mkdir -p $(foreach dir,$(SRC_DIRS),build/$(dir)))
-
-
-# Main targets
-all: ZAPD.out copycheck
-
-build/ZAPD/BuildInfo.o:
-	python3 ZAPD/genbuildinfo.py $(COPYCHECK_ARGS)
-	$(CXX) $(CXXFLAGS) $(OPTFLAGS) $(INC) -c $(OUTPUT_OPTION) build/ZAPD/BuildInfo.cpp
-
-copycheck: ZAPD.out
-	python3 copycheck.py
-
-clean:
-	rm -rf build ZAPD.out
-	$(MAKE) -C lib/libgfxd clean
-	$(MAKE) -C ZAPDUtils clean
-	$(MAKE) -C ExporterTest clean
-	rm -rf ../StormLib/build
-
-rebuild: clean all
-
-format:
-	clang-format-11 -i $(ZAPD_CPP_FILES) $(ZAPD_H_FILES)
-	$(MAKE) -C ZAPDUtils format
-	$(MAKE) -C ExporterTest format
-
-.PHONY: all build/ZAPD/BuildInfo.o copycheck clean rebuild format
-
-build/%.o: %.cpp
-	$(CXX) $(CXXFLAGS) $(OPTFLAGS) $(INC) -c $(OUTPUT_OPTION) $<
-
-
-# Submakes
-lib/libgfxd/libgfxd.a:
-	$(MAKE) -C lib/libgfxd
-
-.PHONY: StormLib
-StormLib:
-	LDFLAGS="" cmake -B ../StormLib/build -S ../StormLib
-	$(MAKE) -C ../StormLib/build
-
-.PHONY: ExporterTest
-ExporterTest:
-	$(MAKE) -C ExporterTest
-
-.PHONY: ZAPDUtils
-ZAPDUtils:
-	$(MAKE) -C ZAPDUtils
-
-
-# Linking
-ZAPD.out: $(O_FILES) lib/libgfxd/libgfxd.a ExporterTest ZAPDUtils StormLib
-	$(CXX) $(CXXFLAGS) $(O_FILES) $(EXPORTERS) $(LDFLAGS) $(OUTPUT_OPTION)

ZAPDTR/ZAPD/CMakeLists.txt

@@ -0,0 +1,486 @@
+set(PROJECT_NAME ZAPD)
+
+set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")
+#set(CMAKE_C_STANDARD 11 CACHE STRING "The C standard to use")
+set(CMAKE_C_STANDARD 11)
+
+################################################################################
+# Source groups
+################################################################################
+set(Header_Files
+    "../lib/tinyxml2/tinyxml2.h"
+    "CRC32.h"
+    "Declaration.h"
+    "FileWorker.h"
+    "GameConfig.h"
+    "Globals.h"
+    "ImageBackend.h"
+    "OutputFormatter.h"
+    "WarningHandler.h"
+)
+source_group("Header Files" FILES ${Header_Files})
+
+set(Header_Files__Libraries
+    "../../libultraship/libultraship/Lib/stb/stb_image.h"
+    "../../libultraship/libultraship/Lib/stb/stb_image_write.h"
+    "ctpl_stl.h"
+)
+source_group("Header Files\\Libraries" FILES ${Header_Files__Libraries})
+
+set(Header_Files__Libraries__elfio
+    "../lib/elfio/elfio/elf_types.hpp"
+    "../lib/elfio/elfio/elfio.hpp"
+    "../lib/elfio/elfio/elfio_dump.hpp"
+    "../lib/elfio/elfio/elfio_dynamic.hpp"
+    "../lib/elfio/elfio/elfio_header.hpp"
+    "../lib/elfio/elfio/elfio_note.hpp"
+    "../lib/elfio/elfio/elfio_relocation.hpp"
+    "../lib/elfio/elfio/elfio_section.hpp"
+    "../lib/elfio/elfio/elfio_segment.hpp"
+    "../lib/elfio/elfio/elfio_strings.hpp"
+    "../lib/elfio/elfio/elfio_symbols.hpp"
+    "../lib/elfio/elfio/elfio_utils.hpp"
+)
+source_group("Header Files\\Libraries\\elfio" FILES ${Header_Files__Libraries__elfio})
+
+set(Header_Files__Libraries__libgfxd
+    "../lib/libgfxd/gbi.h"
+    "../lib/libgfxd/gfxd.h"
+    "../lib/libgfxd/priv.h"
+)
+source_group("Header Files\\Libraries\\libgfxd" FILES ${Header_Files__Libraries__libgfxd})
+
+set(Header_Files__Yaz0
+    "yaz0/readwrite.h"
+    "yaz0/yaz0.h"
+)
+source_group("Header Files\\Yaz0" FILES ${Header_Files__Yaz0})
+
+set(Header_Files__Z64
+    "OtherStructs/SkinLimbStructs.h"
+    "Overlays/ZOverlay.h"
+    "ZAnimation.h"
+    "ZArray.h"
+    "ZAudio.h"
+    "ZBackground.h"
+    "ZBlob.h"
+    "ZCollision.h"
+    "ZCutscene.h"
+    "ZCutsceneMM.h"
+    "ZDisplayList.h"
+    "ZFile.h"
+    "ZLimb.h"
+    "ZMtx.h"
+    "ZPath.h"
+    "ZPlayerAnimationData.h"
+    "ZResource.h"
+    "ZRom.h"
+    "ZScalar.h"
+    "ZSkeleton.h"
+    "ZString.h"
+    "ZSymbol.h"
+    "ZText.h"
+    "ZTexture.h"
+    "ZTextureAnimation.h"
+    "ZVector.h"
+    "ZVtx.h"
+)
+source_group("Header Files\\Z64" FILES ${Header_Files__Z64})
+
+set(Header_Files__Z64__ZRoom
+    "ZRoom/ZRoom.h"
+    "ZRoom/ZRoomCommand.h"
+)
+source_group("Header Files\\Z64\\ZRoom" FILES ${Header_Files__Z64__ZRoom})
+
+set(Header_Files__Z64__ZRoom__Commands
+    "ZRoom/Commands/EndMarker.h"
+    "ZRoom/Commands/SetActorCutsceneList.h"
+    "ZRoom/Commands/SetActorList.h"
+    "ZRoom/Commands/SetAlternateHeaders.h"
+    "ZRoom/Commands/SetAnimatedMaterialList.h"
+    "ZRoom/Commands/SetCameraSettings.h"
+    "ZRoom/Commands/SetCollisionHeader.h"
+    "ZRoom/Commands/SetCsCamera.h"
+    "ZRoom/Commands/SetCutscenes.h"
+    "ZRoom/Commands/SetEchoSettings.h"
+    "ZRoom/Commands/SetEntranceList.h"
+    "ZRoom/Commands/SetExitList.h"
+    "ZRoom/Commands/SetLightingSettings.h"
+    "ZRoom/Commands/SetLightList.h"
+    "ZRoom/Commands/SetMesh.h"
+    "ZRoom/Commands/SetMinimapChests.h"
+    "ZRoom/Commands/SetMinimapList.h"
+    "ZRoom/Commands/SetObjectList.h"
+    "ZRoom/Commands/SetPathways.h"
+    "ZRoom/Commands/SetRoomBehavior.h"
+    "ZRoom/Commands/SetRoomList.h"
+    "ZRoom/Commands/SetSkyboxModifier.h"
+    "ZRoom/Commands/SetSkyboxSettings.h"
+    "ZRoom/Commands/SetSoundSettings.h"
+    "ZRoom/Commands/SetSpecialObjects.h"
+    "ZRoom/Commands/SetStartPositionList.h"
+    "ZRoom/Commands/SetTimeSettings.h"
+    "ZRoom/Commands/SetTransitionActorList.h"
+    "ZRoom/Commands/SetWind.h"
+    "ZRoom/Commands/SetWorldMapVisited.h"
+    "ZRoom/Commands/Unused09.h"
+    "ZRoom/Commands/Unused1D.h"
+    "ZRoom/Commands/ZRoomCommandUnk.h"
+)
+source_group("Header Files\\Z64\\ZRoom\\Commands" FILES ${Header_Files__Z64__ZRoom__Commands})
+
+set(Resource_Files
+    "../../OTRExporter/CFG/SymbolMap_OoTMqDbg.txt"
+)
+source_group("Resource Files" FILES ${Resource_Files})
+
+set(Source_Files
+    "Declaration.cpp"
+    "FileWorker.cpp"
+    "GameConfig.cpp"
+    "Globals.cpp"
+    "ImageBackend.cpp"
+    "Main.cpp"
+    "OutputFormatter.cpp"
+    "WarningHandler.cpp"
+)
+source_group("Source Files" FILES ${Source_Files})
+
+set(Source_Files__Libraries__libgfxd
+    "../lib/libgfxd/gfxd.c"
+    "../lib/libgfxd/uc.c"
+    "../lib/libgfxd/uc_f3d.c"
+    "../lib/libgfxd/uc_f3db.c"
+    "../lib/libgfxd/uc_f3dex.c"
+    "../lib/libgfxd/uc_f3dex2.c"
+    "../lib/libgfxd/uc_f3dexb.c"
+)
+source_group("Source Files\\Libraries\\libgfxd" FILES ${Source_Files__Libraries__libgfxd})
+
+set(Source_Files__Yaz0
+    "yaz0/yaz0.cpp"
+)
+source_group("Source Files\\Yaz0" FILES ${Source_Files__Yaz0})
+
+set(Source_Files__Z64
+    "OtherStructs/SkinLimbStructs.cpp"
+    "Overlays/ZOverlay.cpp"
+    "ZAnimation.cpp"
+    "ZArray.cpp"
+    "ZAudio.cpp"
+    "ZAudioDecode.cpp"
+    "ZBackground.cpp"
+    "ZBlob.cpp"
+    "ZCollision.cpp"
+    "ZCutscene.cpp"
+    "ZCutsceneMM.cpp"
+    "ZDisplayList.cpp"
+    "ZFile.cpp"
+    "ZLimb.cpp"
+    "ZMtx.cpp"
+    "ZPath.cpp"
+    "ZPlayerAnimationData.cpp"
+    "ZResource.cpp"
+    "ZRom.cpp"
+    "ZScalar.cpp"
+    "ZSkeleton.cpp"
+    "ZString.cpp"
+    "ZSymbol.cpp"
+    "ZText.cpp"
+    "ZTexture.cpp"
+    "ZTextureAnimation.cpp"
+    "ZVector.cpp"
+    "ZVtx.cpp"
+)
+source_group("Source Files\\Z64" FILES ${Source_Files__Z64})
+
+set(Source_Files__Z64__ZRoom
+    "ZRoom/ZRoom.cpp"
+    "ZRoom/ZRoomCommand.cpp"
+)
+source_group("Source Files\\Z64\\ZRoom" FILES ${Source_Files__Z64__ZRoom})
+
+set(Source_Files__Z64__ZRoom__Commands
+    "ZRoom/Commands/EndMarker.cpp"
+    "ZRoom/Commands/SetActorCutsceneList.cpp"
+    "ZRoom/Commands/SetActorList.cpp"
+    "ZRoom/Commands/SetAlternateHeaders.cpp"
+    "ZRoom/Commands/SetAnimatedMaterialList.cpp"
+    "ZRoom/Commands/SetCameraSettings.cpp"
+    "ZRoom/Commands/SetCollisionHeader.cpp"
+    "ZRoom/Commands/SetCsCamera.cpp"
+    "ZRoom/Commands/SetCutscenes.cpp"
+    "ZRoom/Commands/SetEchoSettings.cpp"
+    "ZRoom/Commands/SetEntranceList.cpp"
+    "ZRoom/Commands/SetExitList.cpp"
+    "ZRoom/Commands/SetLightingSettings.cpp"
+    "ZRoom/Commands/SetLightList.cpp"
+    "ZRoom/Commands/SetMesh.cpp"
+    "ZRoom/Commands/SetMinimapChests.cpp"
+    "ZRoom/Commands/SetMinimapList.cpp"
+    "ZRoom/Commands/SetObjectList.cpp"
+    "ZRoom/Commands/SetPathways.cpp"
+    "ZRoom/Commands/SetRoomBehavior.cpp"
+    "ZRoom/Commands/SetRoomList.cpp"
+    "ZRoom/Commands/SetSkyboxModifier.cpp"
+    "ZRoom/Commands/SetSkyboxSettings.cpp"
+    "ZRoom/Commands/SetSoundSettings.cpp"
+    "ZRoom/Commands/SetSpecialObjects.cpp"
+    "ZRoom/Commands/SetStartPositionList.cpp"
+    "ZRoom/Commands/SetTimeSettings.cpp"
+    "ZRoom/Commands/SetTransitionActorList.cpp"
+    "ZRoom/Commands/SetWind.cpp"
+    "ZRoom/Commands/SetWorldMapVisited.cpp"
+    "ZRoom/Commands/Unused09.cpp"
+    "ZRoom/Commands/Unused1D.cpp"
+    "ZRoom/Commands/ZRoomCommandUnk.cpp"
+)
+source_group("Source Files\\Z64\\ZRoom\\Commands" FILES ${Source_Files__Z64__ZRoom__Commands})
+
+set(ALL_FILES
+    ${Header_Files}
+    ${Header_Files__Libraries}
+    ${Header_Files__Libraries__elfio}
+    ${Header_Files__Libraries__libgfxd}
+    ${Header_Files__Yaz0}
+    ${Header_Files__Z64}
+    ${Header_Files__Z64__ZRoom}
+    ${Header_Files__Z64__ZRoom__Commands}
+    ${Resource_Files}
+    ${Source_Files}
+    ${Source_Files__Libraries__libgfxd}
+    ${Source_Files__Yaz0}
+    ${Source_Files__Z64}
+    ${Source_Files__Z64__ZRoom}
+    ${Source_Files__Z64__ZRoom__Commands}
+    ${any__any}
+)
+
+################################################################################
+# Target
+################################################################################
+add_executable(${PROJECT_NAME} ${ALL_FILES})
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+use_props(${PROJECT_NAME} "${CMAKE_CONFIGURATION_TYPES}" "${DEFAULT_CXX_PROPS}")
+endif()
+################################################################################
+# Includes for CMake from *.props
+################################################################################
+
+set(ROOT_NAMESPACE ZAPD)
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+	if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+		set_target_properties(${PROJECT_NAME} PROPERTIES
+			INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE"
+		)
+	elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86")
+		set_target_properties(${PROJECT_NAME} PROPERTIES
+			INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE"
+		)
+	endif()
+elseif (CMAKE_SYSTEM_NAME MATCHES "Linux|Darwin")
+        set_target_properties(${PROJECT_NAME} PROPERTIES
+		OUTPUT_NAME "ZAPD.out"
+	)
+endif()
+################################################################################
+# MSVC runtime library
+################################################################################
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+	get_property(MSVC_RUNTIME_LIBRARY_DEFAULT TARGET ${PROJECT_NAME} PROPERTY MSVC_RUNTIME_LIBRARY)
+	if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+		string(CONCAT "MSVC_RUNTIME_LIBRARY_STR"
+			$<$<CONFIG:Debug>:
+				MultiThreadedDebug
+			>
+			$<$<CONFIG:Release>:
+				MultiThreaded
+			>
+			$<$<NOT:$<OR:$<CONFIG:Debug>,$<CONFIG:Release>>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}>
+		)
+	endif()
+	set_target_properties(${PROJECT_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY ${MSVC_RUNTIME_LIBRARY_STR})
+endif()
+################################################################################
+# Compile definitions
+################################################################################
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+	if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+		target_compile_definitions(${PROJECT_NAME} PRIVATE
+			"_CRT_SECURE_NO_WARNINGS;"
+			"_MBCS"
+			STORMLIB_NO_AUTO_LINK
+		)
+	elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86")
+		target_compile_definitions(${PROJECT_NAME} PRIVATE
+			"$<$<CONFIG:Debug>:"
+				"_CRT_SECURE_NO_WARNINGS"
+			">"
+			"_MBCS"
+			STORMLIB_NO_AUTO_LINK
+		)
+	endif()
+endif()
+
+################################################################################
+# Compile and link options
+################################################################################
+
+find_package(PNG REQUIRED)
+
+target_include_directories(${PROJECT_NAME} PRIVATE
+	${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/ZAPDUtils
+	${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/lib/tinyxml2
+	${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/lib/libgfxd
+	${PNG_PNG_INCLUDE_DIR}/
+	.
+	)
+
+if(MSVC)
+    if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+        target_compile_options(${PROJECT_NAME} PRIVATE
+            $<$<CONFIG:Debug>:
+                /Od;
+                /RTC1
+            >
+            $<$<CONFIG:Release>:
+                /Oi;
+                /Gy
+            >
+            /permissive-;
+            /sdl;
+            /W3;
+            ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT};
+            ${DEFAULT_CXX_EXCEPTION_HANDLING}
+        )
+    elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86")
+        target_compile_options(${PROJECT_NAME} PRIVATE
+            $<$<CONFIG:Debug>:
+                /Od
+            >
+            $<$<CONFIG:Release>:
+                /O2;
+                /Oi;
+                /Gy
+            >
+            /permissive-;
+            /sdl;
+            /W3;
+            ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT};
+            ${DEFAULT_CXX_EXCEPTION_HANDLING}
+        )
+    endif()
+    if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+        target_link_options(${PROJECT_NAME} PRIVATE
+            $<$<CONFIG:Debug>:
+                /PROFILE
+            >
+            $<$<CONFIG:Release>:
+                /OPT:REF;
+                /OPT:ICF
+            >
+            /DEBUG:FULL
+        )
+    elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86")
+        target_link_options(${PROJECT_NAME} PRIVATE
+            $<$<CONFIG:Debug>:
+                /PROFILE
+            >
+            $<$<CONFIG:Release>:
+                /OPT:REF;
+                /OPT:ICF
+            >
+            /DEBUG:FULL
+        )
+    endif()
+endif()
+
+if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|AppleClang")
+	target_compile_options(${PROJECT_NAME} PRIVATE
+		-Wall -Wextra -Wno-error
+        -Wno-unused-parameter
+        -Wno-unused-function
+        -Wno-unused-variable
+		-Wno-missing-field-initializers
+        -Wno-parentheses
+        -Wno-narrowing
+        $<$<COMPILE_LANGUAGE:CXX>:-Wno-deprecated-enum-enum-conversion>
+		-pthread
+	)
+	
+    if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+        target_link_options(${PROJECT_NAME} PRIVATE
+            -pthread
+        )
+    else()
+        target_link_options(${PROJECT_NAME} PRIVATE
+            -pthread
+            -Wl,-export-dynamic
+        )
+    endif()
+
+endif()
+
+################################################################################
+# Dependencies
+################################################################################
+add_dependencies(${PROJECT_NAME}
+    OTRExporter
+    ZAPDUtils
+    libultraship
+)
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+	if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+		set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+		set(ADDITIONAL_LIBRARY_DEPENDENCIES
+			"ZAPDUtils;"
+			"-WHOLEARCHIVE:$<TARGET_LINKER_FILE_DIR:OTRExporter>/$<TARGET_LINKER_FILE_NAME:OTRExporter>"
+			"libultraship;"
+			storm
+			PNG::PNG
+		)
+	endif()
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+	set(THREADS_PREFER_PTHREAD_FLAG ON)
+	find_package(Threads REQUIRED)
+	set(ADDITIONAL_LIBRARY_DEPENDENCIES
+		"ZAPDUtils;"
+		-Wl,-force_load $<TARGET_LINKER_FILE_DIR:OTRExporter>/$<TARGET_LINKER_FILE_NAME:OTRExporter>
+		"libultraship;"
+		PNG::PNG
+		${CMAKE_DL_LIBS}
+		Threads::Threads
+	)
+elseif(CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch")
+       set(THREADS_PREFER_PTHREAD_FLAG ON)
+       find_package(Threads REQUIRED)
+       set(ADDITIONAL_LIBRARY_DEPENDENCIES
+               "ZAPDUtils;"
+               -Wl,--whole-archive $<TARGET_LINKER_FILE_DIR:OTRExporter>/$<TARGET_LINKER_FILE_NAME:OTRExporter> -Wl,--no-whole-archive
+               "libultraship;"
+               PNG::PNG
+               Threads::Threads
+       )
+else()
+	set(THREADS_PREFER_PTHREAD_FLAG ON)
+	find_package(Threads REQUIRED)
+	set(ADDITIONAL_LIBRARY_DEPENDENCIES
+		"ZAPDUtils;"
+		-Wl,--whole-archive $<TARGET_LINKER_FILE_DIR:OTRExporter>/$<TARGET_LINKER_FILE_NAME:OTRExporter> -Wl,--no-whole-archive
+		"libultraship;"
+		PNG::PNG
+		${CMAKE_DL_LIBS}
+		Threads::Threads
+	)
+endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch")
+add_library(pathconf OBJECT pathconf.c)
+target_link_libraries(${PROJECT_NAME} PRIVATE "${ADDITIONAL_LIBRARY_DEPENDENCIES}" $<TARGET_OBJECTS:pathconf> )
+else()
+target_link_libraries(${PROJECT_NAME} PRIVATE "${ADDITIONAL_LIBRARY_DEPENDENCIES}")
+endif()

ZAPDTR/ZAPD/ZResource.cpp

@@ -348,11 +348,14 @@ std::string ZResource::GetSourceOutputHeader([[maybe_unused]] const std::string&
 			str += StringHelper::Sprintf("#define d%s \"__OTR__%s/%s\"", name.c_str(), outName.c_str(), nameStr.c_str());
 
 		if (nameSet && nameSet->find(name) == nameSet->end()) {
+			str += StringHelper::Sprintf(R"(
 #ifdef _WIN32
-			str += StringHelper::Sprintf("\nstatic const __declspec(align(2)) char %s[] = d%s;", name.c_str(), name.c_str());
+static const __declspec(align(2)) char %s[] = d%s;
 #else
-			str += StringHelper::Sprintf("\nstatic const char %s[] __attribute__((aligned (2))) = d%s;", name.c_str(), name.c_str());
+static const char %s[] __attribute__((aligned (2))) = d%s;
 #endif
+			)", name.c_str(), name.c_str(), name.c_str(), name.c_str());
+
 			if (nameSet) {
 				nameSet->insert(name);
 			}

ZAPDTR/ZAPD/pathconf.c

@@ -0,0 +1,6 @@
+#include <unistd.h>
+
+long pathconf(const char *path, int name) {
+    return -1;
+}
+

ZAPDTR/ZAPDTR.sln

@@ -1,82 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30320.27
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZAPD", "ZAPD\ZAPD.vcxproj", "{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExporterExample", "ExporterTest\ExporterTest.vcxproj", "{65608EB0-1A47-45AD-AB66-192FB64C762C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZAPDUtils", "ZAPDUtils\ZAPDUtils.vcxproj", "{A2E01C3E-D647-45D1-9788-043DEBC1A908}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		MinSizeRel|x64 = MinSizeRel|x64
-		MinSizeRel|x86 = MinSizeRel|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-		RelWithDebInfo|x64 = RelWithDebInfo|x64
-		RelWithDebInfo|x86 = RelWithDebInfo|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Debug|x64.ActiveCfg = Debug|x64
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Debug|x64.Build.0 = Debug|x64
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Debug|x86.ActiveCfg = Debug|Win32
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Debug|x86.Build.0 = Debug|Win32
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.MinSizeRel|x64.ActiveCfg = Release|x64
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.MinSizeRel|x64.Build.0 = Release|x64
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.MinSizeRel|x86.ActiveCfg = Release|Win32
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.MinSizeRel|x86.Build.0 = Release|Win32
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Release|x64.ActiveCfg = Release|x64
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Release|x64.Build.0 = Release|x64
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Release|x86.ActiveCfg = Release|Win32
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Release|x86.Build.0 = Release|Win32
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.RelWithDebInfo|x64.ActiveCfg = Release|x64
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.RelWithDebInfo|x64.Build.0 = Release|x64
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.RelWithDebInfo|x86.ActiveCfg = Release|Win32
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.RelWithDebInfo|x86.Build.0 = Release|Win32
-		{65608EB0-1A47-45AD-AB66-192FB64C762C}.Debug|x64.ActiveCfg = Debug|x64
-		{65608EB0-1A47-45AD-AB66-192FB64C762C}.Debug|x64.Build.0 = Debug|x64
-		{65608EB0-1A47-45AD-AB66-192FB64C762C}.Debug|x86.ActiveCfg = Debug|Win32
-		{65608EB0-1A47-45AD-AB66-192FB64C762C}.Debug|x86.Build.0 = Debug|Win32
-		{65608EB0-1A47-45AD-AB66-192FB64C762C}.MinSizeRel|x64.ActiveCfg = Debug|x64
-		{65608EB0-1A47-45AD-AB66-192FB64C762C}.MinSizeRel|x64.Build.0 = Debug|x64
-		{65608EB0-1A47-45AD-AB66-192FB64C762C}.MinSizeRel|x86.ActiveCfg = Debug|Win32
-		{65608EB0-1A47-45AD-AB66-192FB64C762C}.MinSizeRel|x86.Build.0 = Debug|Win32
-		{65608EB0-1A47-45AD-AB66-192FB64C762C}.Release|x64.ActiveCfg = Release|x64
-		{65608EB0-1A47-45AD-AB66-192FB64C762C}.Release|x64.Build.0 = Release|x64
-		{65608EB0-1A47-45AD-AB66-192FB64C762C}.Release|x86.ActiveCfg = Release|Win32
-		{65608EB0-1A47-45AD-AB66-192FB64C762C}.Release|x86.Build.0 = Release|Win32
-		{65608EB0-1A47-45AD-AB66-192FB64C762C}.RelWithDebInfo|x64.ActiveCfg = Release|x64
-		{65608EB0-1A47-45AD-AB66-192FB64C762C}.RelWithDebInfo|x64.Build.0 = Release|x64
-		{65608EB0-1A47-45AD-AB66-192FB64C762C}.RelWithDebInfo|x86.ActiveCfg = Release|Win32
-		{65608EB0-1A47-45AD-AB66-192FB64C762C}.RelWithDebInfo|x86.Build.0 = Release|Win32
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Debug|x64.ActiveCfg = Debug|x64
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Debug|x64.Build.0 = Debug|x64
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Debug|x86.ActiveCfg = Debug|Win32
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Debug|x86.Build.0 = Debug|Win32
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.MinSizeRel|x64.ActiveCfg = Debug|x64
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.MinSizeRel|x64.Build.0 = Debug|x64
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.MinSizeRel|x86.ActiveCfg = Debug|Win32
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.MinSizeRel|x86.Build.0 = Debug|Win32
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Release|x64.ActiveCfg = Release|x64
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Release|x64.Build.0 = Release|x64
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Release|x86.ActiveCfg = Release|Win32
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Release|x86.Build.0 = Release|Win32
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.RelWithDebInfo|x64.ActiveCfg = Release|x64
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.RelWithDebInfo|x64.Build.0 = Release|x64
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.RelWithDebInfo|x86.ActiveCfg = Release|Win32
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.RelWithDebInfo|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {C2E1CC72-7A50-3249-AFD5-DFF6FE25CDCA}
-	EndGlobalSection
-	GlobalSection(Performance) = preSolution
-		HasPerformanceSessions = true
-	EndGlobalSection
-EndGlobal

ZAPDTR/ZAPDUtils/CMakeLists.txt

@@ -0,0 +1,218 @@
+set(PROJECT_NAME ZAPDUtils)
+
+################################################################################
+# Source groups
+################################################################################
+set(Header_Files
+    "Color3b.h"
+    "StrHash.h"
+    "Vec2f.h"
+    "Vec3f.h"
+    "Vec3s.h"
+)
+source_group("Header Files" FILES ${Header_Files})
+
+set(Header_Files__Utils
+    "Utils/BinaryReader.h"
+    "Utils/BinaryWriter.h"
+    "Utils/BitConverter.h"
+    "Utils/Directory.h"
+    "Utils/File.h"
+    "Utils/MemoryStream.h"
+    "Utils/Path.h"
+    "Utils/Stream.h"
+    "Utils/StringHelper.h"
+)
+source_group("Header Files\\Utils" FILES ${Header_Files__Utils})
+
+set(Source_Files__Libraries
+    "../lib/tinyxml2/tinyxml2.cpp"
+)
+source_group("Source Files\\Libraries" FILES ${Source_Files__Libraries})
+
+set(Source_Files__Utils
+    "Utils/BinaryReader.cpp"
+    "Utils/BinaryWriter.cpp"
+    "Utils/MemoryStream.cpp"
+    "Utils/StringHelper.cpp"
+)
+source_group("Source Files\\Utils" FILES ${Source_Files__Utils})
+
+set(ALL_FILES
+    ${Header_Files}
+    ${Header_Files__Utils}
+    ${Source_Files__Libraries}
+    ${Source_Files__Utils}
+)
+
+################################################################################
+# Target
+################################################################################
+add_library(${PROJECT_NAME} STATIC ${ALL_FILES})
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+use_props(${PROJECT_NAME} "${CMAKE_CONFIGURATION_TYPES}" "${DEFAULT_CXX_PROPS}")
+endif()
+
+set(ROOT_NAMESPACE ZAPDUtils)
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+	set_target_properties(${PROJECT_NAME} PROPERTIES
+		VS_GLOBAL_KEYWORD "Win32Proj"
+	)
+	if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+		set_target_properties(${PROJECT_NAME} PROPERTIES
+			INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE"
+		)
+	elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
+		set_target_properties(${PROJECT_NAME} PROPERTIES
+			INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE"
+		)
+	endif()
+endif()
+################################################################################
+# MSVC runtime library
+################################################################################
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+	get_property(MSVC_RUNTIME_LIBRARY_DEFAULT TARGET ${PROJECT_NAME} PROPERTY MSVC_RUNTIME_LIBRARY)
+	if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+		string(CONCAT "MSVC_RUNTIME_LIBRARY_STR"
+			$<$<CONFIG:Debug>:
+				MultiThreadedDebug
+			>
+			$<$<CONFIG:Release>:
+				MultiThreaded
+			>
+			$<$<NOT:$<OR:$<CONFIG:Debug>,$<CONFIG:Release>>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}>
+		)
+	elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
+		string(CONCAT "MSVC_RUNTIME_LIBRARY_STR"
+			MultiThreaded
+		)
+	endif()
+	set_target_properties(${PROJECT_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY ${MSVC_RUNTIME_LIBRARY_STR})
+endif()
+################################################################################
+# Compile definitions
+################################################################################
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+	if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+		target_compile_definitions(${PROJECT_NAME} PRIVATE
+			"$<$<CONFIG:Debug>:"
+				"_DEBUG;"
+				"_MBCS"
+			">"
+			"$<$<CONFIG:Release>:"
+				"NDEBUG;"
+				"UNICODE;"
+				"_UNICODE"
+			">"
+			"_CONSOLE;"
+			"_CRT_SECURE_NO_WARNINGS"
+			STORMLIB_NO_AUTO_LINK
+		)
+	elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
+		target_compile_definitions(${PROJECT_NAME} PRIVATE
+			"$<$<CONFIG:Debug>:"
+				"_DEBUG"
+			">"
+			"$<$<CONFIG:Release>:"
+				"NDEBUG"
+			">"
+			"WIN32;"
+			"_CONSOLE;"
+			"_CRT_SECURE_NO_WARNINGS;"
+			"UNICODE;"
+			"_UNICODE"
+			STORMLIB_NO_AUTO_LINK
+		)
+	endif()
+endif()
+
+if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|AppleClang")
+	target_compile_definitions(${PROJECT_NAME} PRIVATE
+		"$<$<CONFIG:Debug>:"
+				"_DEBUG"
+		">"
+		"$<$<CONFIG:Release>:"
+			"NDEBUG"
+		">"
+		"_CONSOLE;"
+		"_CRT_SECURE_NO_WARNINGS;"
+		"UNICODE;"
+		"_UNICODE"
+	)
+endif()
+
+################################################################################
+# Compile and link options
+################################################################################
+if(MSVC)
+    if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+        target_compile_options(${PROJECT_NAME} PRIVATE
+            $<$<CONFIG:Release>:
+                /Oi;
+                /Gy
+            >
+            /permissive-;
+            /MP;
+            /sdl;
+            /W3;
+            ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT};
+            ${DEFAULT_CXX_EXCEPTION_HANDLING}
+        )
+    elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
+        target_compile_options(${PROJECT_NAME} PRIVATE
+            $<$<CONFIG:Debug>:
+                /O2;
+                /Ot
+            >
+            $<$<CONFIG:Release>:
+                /Gy
+            >
+            /permissive-;
+            /MP;
+            /Oi;
+            /sdl;
+            /W3;
+            ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT};
+            ${DEFAULT_CXX_EXCEPTION_HANDLING}
+        )
+    endif()
+    if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+        target_link_options(${PROJECT_NAME} PRIVATE
+            $<$<CONFIG:Release>:
+                /OPT:REF;
+                /OPT:ICF
+            >
+            /SUBSYSTEM:CONSOLE
+        )
+    elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
+        target_link_options(${PROJECT_NAME} PRIVATE
+            $<$<CONFIG:Release>:
+                /OPT:REF;
+                /OPT:ICF
+            >
+            /SUBSYSTEM:CONSOLE
+        )
+    endif()
+endif()
+
+if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|AppleClang")
+	target_compile_options(${PROJECT_NAME} PRIVATE
+		-Wall -Wextra -Wno-error
+        -Wno-unused-parameter
+        -Wno-unused-function
+        -Wno-unused-variable
+		-Wno-missing-field-initializers
+        -Wno-parentheses
+        -Wno-narrowing
+        $<$<COMPILE_LANGUAGE:CXX>:-Wno-deprecated-enum-enum-conversion>
+	)
+endif()
+################################################################################
+# Dependencies
+################################################################################
+# Link with other targets.
+
+

ZAPDTR/ZAPDUtils/Makefile

@@ -1,29 +0,0 @@
-# Only used for standalone compilation, usually inherits these from the main makefile
-CXX ?= g++
-CXXFLAGS ?= -Wall -Wextra -O2 -g -std=c++17
-
-SRC_DIRS  := $(shell find . -type d -not -path "*build*")
-CPP_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.cpp))
-H_FILES   := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.h))
-
-O_FILES   := $(foreach f,$(CPP_FILES:.cpp=.o),build/$f)
-LIB       := ZAPDUtils.a
-
-# create build directories
-$(shell mkdir -p $(foreach dir,$(SRC_DIRS),build/$(dir)))
-
-all: $(LIB)
-
-clean:
-	rm -rf build $(LIB)
-
-format:
-	clang-format-11 -i $(CPP_FILES) $(H_FILES)
-
-.PHONY: all clean format
-
-build/%.o: %.cpp
-	$(CXX) $(CXXFLAGS) $(OPTFLAGS) -c $(OUTPUT_OPTION) $<
-
-$(LIB): $(O_FILES)
-	$(AR) rcs $@ $^

ZAPDTR/ZAPDUtils/Makefile.switch

@@ -1,171 +0,0 @@
-#---------------------------------------------------------------------------------
-.SUFFIXES:
-#---------------------------------------------------------------------------------
-
-ifeq ($(strip $(DEVKITPRO)),)
-$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>/devkitpro")
-endif
-
-TOPDIR ?= $(CURDIR)
-include $(DEVKITPRO)/libnx/switch_rules
-
-#---------------------------------------------------------------------------------
-# TARGET is the name of the output
-# BUILD is the directory where object files & intermediate files will be placed
-# SOURCES is a list of directories containing source code
-# DATA is a list of directories containing data files
-# INCLUDES is a list of directories containing header files
-# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional)
-#
-# NO_ICON: if set to anything, do not use icon.
-# NO_NACP: if set to anything, no .nacp file is generated.
-# APP_TITLE is the name of the app stored in the .nacp file (Optional)
-# APP_AUTHOR is the author of the app stored in the .nacp file (Optional)
-# APP_VERSION is the version of the app stored in the .nacp file (Optional)
-# APP_TITLEID is the titleID of the app stored in the .nacp file (Optional)
-# ICON is the filename of the icon (.jpg), relative to the project folder.
-#   If not set, it attempts to use one of the following (in this order):
-#     - <Project name>.jpg
-#     - icon.jpg
-#     - <libnx folder>/default_icon.jpg
-#
-# CONFIG_JSON is the filename of the NPDM config file (.json), relative to the project folder.
-#   If not set, it attempts to use one of the following (in this order):
-#     - <Project name>.json
-#     - config.json
-#   If a JSON file is provided or autodetected, an ExeFS PFS0 (.nsp) is built instead
-#   of a homebrew executable (.nro). This is intended to be used for sysmodules.
-#   NACP building is skipped as well.
-#---------------------------------------------------------------------------------
-TARGET		:=	ZAPDUtils
-BUILD		:=	build
-SOURCES		:=	Utils
-DATA		:=
-INCLUDES	:=
-
-#-------------------------------------------------------------------------------
-# source files
-#-------------------------------------------------------------------------------
-SOURCEFILES_C :=
-
-SOURCEFILES_CPP :=
-
-#---------------------------------------------------------------------------------
-# options for code generation
-#---------------------------------------------------------------------------------
-ARCH	:=	-march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE
-
-CFLAGS	:=	-g -Wall -O2 -ffunction-sections \
-			$(ARCH) $(DEFINES)
-
-CFLAGS	+=	$(INCLUDE) -D__SWITCH__
-
-CXXFLAGS	:= $(CFLAGS) -fno-rtti -fexceptions -std=gnu++20
-CFLAGS  +=  -std=gnu11
-
-ASFLAGS	:=	-g $(ARCH)
-LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
-
-LIBS	:= -lnx
-
-#---------------------------------------------------------------------------------
-# list of directories containing libraries, this must be the top level containing
-# include and lib
-#---------------------------------------------------------------------------------
-LIBDIRS	:= $(PORTLIBS) $(LIBNX)
-
-
-#---------------------------------------------------------------------------------
-# no real need to edit anything past this point unless you need to add additional
-# rules for different file extensions
-#---------------------------------------------------------------------------------
-ifneq ($(BUILD),$(notdir $(CURDIR)))
-#---------------------------------------------------------------------------------
-
-export OUTPUT	:=	$(CURDIR)/lib/lib$(TARGET).a
-export TOPDIR	:=	$(CURDIR)
-
-export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
-			$(foreach dir,$(DATA),$(CURDIR)/$(dir)) \
-			$(foreach sf,$(SOURCEFILES_C),$(CURDIR)/$(dir $(sf))) \
-			$(foreach sf,$(SOURCEFILES_CPP),$(CURDIR)/$(dir $(sf)))
-
-export DEPSDIR	:=	$(CURDIR)/$(BUILD)
-
-CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c))) \
-			$(foreach f,$(SOURCEFILES_C),$(notdir $(f)))
-CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp))) \
-			$(foreach f,$(SOURCEFILES_CPP),$(notdir $(f)))
-SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
-BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
-
-#---------------------------------------------------------------------------------
-# use CXX for linking C++ projects, CC for standard C
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(CPPFILES)),)
-#---------------------------------------------------------------------------------
-	export LD	:=	$(CC)
-#---------------------------------------------------------------------------------
-else
-#---------------------------------------------------------------------------------
-	export LD	:=	$(CXX)
-#---------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------
-
-export OFILES_BIN	:=	$(addsuffix .o,$(BINFILES))
-export OFILES_SRC	:=	$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
-export OFILES 	:=	$(OFILES_BIN) $(OFILES_SRC)
-export HFILES_BIN	:=	$(addsuffix .h,$(subst .,_,$(BINFILES)))
-
-export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
-			$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-			-I$(CURDIR)/$(BUILD)
-
-export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib)
-
-.PHONY: $(BUILD) clean all
-
-#---------------------------------------------------------------------------------
-all: $(BUILD)
-
-lib:
-	@[ -d $@ ] || mkdir -p $@
-
-$(BUILD) : lib
-	@[ -d $@ ] || mkdir -p $@
-	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.switch
-
-#---------------------------------------------------------------------------------
-clean:
-	@echo clean ...
-	@rm -rf build lib
-
-#---------------------------------------------------------------------------------
-else
-.PHONY:	all
-
-DEPENDS	:=	$(OFILES:.o=.d)
-
-#---------------------------------------------------------------------------------
-# main targets
-#---------------------------------------------------------------------------------
-
-$(OUTPUT)	:	$(OFILES)
-
-$(OFILES_SRC)	: $(HFILES)
-$(OFILES_SRC)	: $(HFILES_BIN)
-
-#---------------------------------------------------------------------------------
-# you need a rule like this for each extension you use as binary data
-#---------------------------------------------------------------------------------
-%.bin.o	%_bin.h :	%.bin
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	@$(bin2o)
-
--include $(DEPENDS)
-
-#---------------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------------

ZAPDTR/ZAPDUtils/Utils/Directory.h

@@ -1,8 +1,9 @@
 #pragma once
 
-#include <iostream>
 #include <string>
 #include <vector>
+#include "StringHelper.h"
+#include <iostream>
 
 #if __has_include(<filesystem>)
 #include <filesystem>
@@ -12,8 +13,6 @@ namespace fs = std::filesystem;
 namespace fs = std::experimental::filesystem;
 #endif
 
-#include "StringHelper.h"
-
 #undef GetCurrentDirectory
 #undef CreateDirectory
 
@@ -21,7 +20,7 @@ class Directory
 {
 public:
 	#ifndef PATH_HACK
-	static std::string GetCurrentDirectory() { return fs::current_path().u8string().c_str(); }
+	static std::string GetCurrentDirectory() { return fs::current_path().string(); }
 	#endif
 
 	static bool Exists(const fs::path& path) { return fs::exists(path); }

libultraship/Makefile

@@ -1,149 +0,0 @@
-# Only used for standalone compilation, usually inherits these from the main makefile
-
-CXX ?= g++
-CC ?= gcc
-AR := ar
-FORMAT := clang-format-11
-UNAME := $(shell uname)
-
-ASAN ?= 0
-DEBUG ?= 1
-OPTFLAGS ?= -O0
-X11 ?= 0
-LTO ?= 0
-
-# flag to save whether the compiler being used is clang or gcc by checking CXX --version
-CXX_IS_CLANG ?= $(shell $(CXX) --version | grep -c clang)
-ifeq ($(CXX_IS_CLANG),1)
-	MXX := $(CXX)
-else
-	MXX ?= clang++
-endif
-
-
-WARN := -Wall -Wextra -Werror \
-	-Wno-unused-variable \
-	-Wno-unused-parameter \
-	-Wno-unused-function \
-	-Wno-parentheses \
-	-Wno-narrowing \
-	-Wno-missing-field-initializers \
-	-Wno-error=multichar \
-	-Wno-delete-non-abstract-non-virtual-dtor \
-	-Wno-unused-private-field \
-	-Wno-deprecated-copy-with-user-provided-copy \
-	-Wno-deprecated-declarations \
-	-Wno-unknown-warning-option
-
-CWARN :=
-CXXWARN := -Wno-deprecated-enum-enum-conversion -Wno-deprecated-copy
-
-ifneq ($(CXX_IS_CLANG),1)
-	WARN += -Wno-error=stringop-overflow
-	CXXWARN += -Wno-error=maybe-uninitialized
-endif
-
-CXXFLAGS := $(WARN) $(CXXWARN) -std=c++20 -D_GNU_SOURCE -DENABLE_OPENGL -DSPDLOG_ACTIVE_LEVEL=0
-CFLAGS := $(WARN) $(CWARN) -std=c99 -D_GNU_SOURCE -DENABLE_OPENGL -DSPDLOG_ACTIVE_LEVEL=0
-CPPFLAGS := -MMD $(shell pkg-config --cflags sdl2 glew)
-
-MMFLAGS := -Wno-deprecated-declarations -ObjC++ -fobjc-weak -fobjc-arc
-
-ifeq ($(X11), 1)
-CXXFLAGS += -DX11_SUPPORTED
-CFLAGS += -DX11_SUPPORTED
-endif
-
-# if not using clang, ask clang to use gcc standard library
-ifneq ($(CXX_IS_CLANG),1)
-	STD_ISYSTEM=$(shell ${CXX} -xc++ -E -v - < /dev/null 2>&1  | grep "> search starts here" -A2 | tail -n 2 | head -n 1)
-	CXX_ISYSTEM=$(shell ${CXX} -xc++ -E -v - < /dev/null 2>&1  | grep "> search starts here" -A2 | tail -n 2 | tail -n 1)
-	MMFLAGS += -stdlib++-isystem ${STD_ISYSTEM} -cxx-isystem ${CXX_ISYSTEM}
-endif
-
-ifneq ($(DEBUG),0)
-	CXXFLAGS += -g -D_DEBUG
-	CFLAGS += -g -D_DEBUG
-endif
-
-ifneq ($(ASAN),0)
-	CXXFLAGS += -fsanitize=address
-	CFLAGS += -fsanitize=address
-endif
-
-ifneq ($(LTO),0)
-	CXXFLAGS += -flto
-	CFLAGS += -flto
-endif
-
-SRC_DIRS  := $(shell find . -type d -not -path "*build*")
-
-CXX_FILES := \
-	$(shell find libultraship/Factories -name "*.cpp") \
-	$(shell find libultraship/Lib/Fast3D -name "*.cpp") \
-	$(shell find libultraship -maxdepth 1 -name "*.cpp") \
-	$(shell find libultraship/Lib/ImGui -maxdepth 1 -name "*.cpp") \
-	$(shell find libultraship/Lib/Mercury -maxdepth 1 -name "*.cpp") \
-	libultraship/Lib/ImGui/backends/imgui_impl_opengl3.cpp \
-	libultraship/Lib/ImGui/backends/imgui_impl_sdl.cpp \
-	libultraship/Lib/StrHash64.cpp \
-	libultraship/Lib/tinyxml2/tinyxml2.cpp
-
-C_FILES := \
-	libultraship/mixer.c \
-	libultraship/Lib/stb/stb_impl.c
-
-MM_FILES := \
-	libultraship/OSXFolderManager.mm
-
-FMT_FILES := $(shell find libultraship/ -type f \( -name "*.cpp" -o -name "*.h" \) -a -not -path "libultraship/Lib/*")
-
-O_FILES   := \
-	$(CXX_FILES:%.cpp=build/%.o) \
-	$(C_FILES:%.c=build/%.o)
-
-ifeq ($(UNAME), Darwin) #APPLE
-	O_FILES += $(MM_FILES:%.mm=build/%.o)
-endif
-
-D_FILES   := $(O_FILES:%.o=%.d)
-
-LIB       := libultraship.a
-
-INC_DIRS := $(addprefix -I, \
-	../ZAPDTR/ZAPDUtils \
-	libultraship/Lib/Fast3D/U64 \
-	libultraship/Lib/spdlog \
-	libultraship/Lib/spdlog/include \
-	libultraship/Lib/ImGui \
-	libultraship/Lib/Mercury \
-	libultraship \
-	../StormLib/src \
-)
-
-# create build directories
-$(shell mkdir -p $(SRC_DIRS:%=build/%))
-
-all: $(LIB)
-
-clean:
-	rm -rf build $(LIB)
-
-format:
-	$(FORMAT) -i $(FMT_FILES)
-
-.PHONY: all clean format
-
-build/%.o: %.cpp
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(OPTFLAGS) $(INC_DIRS) -c $< -o $@
-
-build/%.o: %.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) $(OPTFLAGS) $(INC_DIRS) -c $< -o $@
-
-build/%.o: %.mm
-	$(MXX) $(MMFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(INC_DIRS) -c $< -o $@
-
-$(LIB): $(O_FILES)
-	$(AR) rcs $@ $^
-
--include $(D_FILES)

libultraship/Makefile.switch

@@ -1,192 +0,0 @@
-#---------------------------------------------------------------------------------
-.SUFFIXES:
-#---------------------------------------------------------------------------------
-
-ifeq ($(strip $(DEVKITPRO)),)
-$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>/devkitpro")
-endif
-
-TOPDIR ?= $(CURDIR)
-include $(DEVKITPRO)/libnx/switch_rules
-
-#---------------------------------------------------------------------------------
-# TARGET is the name of the output
-# BUILD is the directory where object files & intermediate files will be placed
-# SOURCES is a list of directories containing source code
-# DATA is a list of directories containing data files
-# INCLUDES is a list of directories containing header files
-# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional)
-#
-# NO_ICON: if set to anything, do not use icon.
-# NO_NACP: if set to anything, no .nacp file is generated.
-# APP_TITLE is the name of the app stored in the .nacp file (Optional)
-# APP_AUTHOR is the author of the app stored in the .nacp file (Optional)
-# APP_VERSION is the version of the app stored in the .nacp file (Optional)
-# APP_TITLEID is the titleID of the app stored in the .nacp file (Optional)
-# ICON is the filename of the icon (.jpg), relative to the project folder.
-#   If not set, it attempts to use one of the following (in this order):
-#     - <Project name>.jpg
-#     - icon.jpg
-#     - <libnx folder>/default_icon.jpg
-#
-# CONFIG_JSON is the filename of the NPDM config file (.json), relative to the project folder.
-#   If not set, it attempts to use one of the following (in this order):
-#     - <Project name>.json
-#     - config.json
-#   If a JSON file is provided or autodetected, an ExeFS PFS0 (.nsp) is built instead
-#   of a homebrew executable (.nro). This is intended to be used for sysmodules.
-#   NACP building is skipped as well.
-#---------------------------------------------------------------------------------
-TARGET		:=	ultraship
-BUILD		:=	build
-SOURCES		:= \
-		libultraship/Factories   \
-		libultraship/Lib/Fast3D  \
-		libultraship/Lib/ImGui   \
-		libultraship/Lib/Mercury \
-		libultraship
-DATA		:=
-INCLUDES	:=	\
-		../ZAPDTR/ZAPDUtils \
-		../StormLib/src \
-		libultraship/Lib/Fast3D/U64 \
-		libultraship/Lib/ImGui \
-		libultraship/Lib/spdlog \
-		libultraship/Lib/spdlog/include \
-		libultraship
-
-#-------------------------------------------------------------------------------
-# source files
-#-------------------------------------------------------------------------------
-
-SOURCEFILES_C :=    \
-		libultraship/mixer.c \
-		libultraship/Lib/stb/stb_impl.c \
-
-SOURCEFILES_CPP :=	\
-	libultraship/Lib/ImGui/backends/imgui_impl_opengl3.cpp \
-	libultraship/Lib/ImGui/backends/imgui_impl_sdl.cpp \
-	libultraship/Lib/StrHash64.cpp \
-	libultraship/Lib/tinyxml2/tinyxml2.cpp
-
-#---------------------------------------------------------------------------------
-# options for code generation
-#---------------------------------------------------------------------------------
-ARCH	:=	-march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE -ffast-math -O3
-
-CFLAGS	:=	-Wall -ffunction-sections \
-			$(ARCH) $(DEFINES) \
-            -DSPDLOG_NO_THREAD_ID \
-		    -DSTBI_NO_THREAD_LOCALS
-
-CFLAGS	+=	$(INCLUDE) -D__SWITCH__ -DENABLE_OPENGL
-
-CXXFLAGS	:= $(CFLAGS) -std=gnu++20
-CFLAGS  +=  -std=gnu11
-
-ASFLAGS	:=	-g $(ARCH)
-LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
-
-LIBS	:= -lnx
-
-#---------------------------------------------------------------------------------
-# list of directories containing libraries, this must be the top level containing
-# include and lib
-#---------------------------------------------------------------------------------
-LIBDIRS	:= $(PORTLIBS) $(LIBNX)
-
-
-#---------------------------------------------------------------------------------
-# no real need to edit anything past this point unless you need to add additional
-# rules for different file extensions
-#---------------------------------------------------------------------------------
-ifneq ($(BUILD),$(notdir $(CURDIR)))
-#---------------------------------------------------------------------------------
-
-export OUTPUT	:=	$(CURDIR)/lib/lib$(TARGET).a
-export TOPDIR	:=	$(CURDIR)
-
-export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
-			$(foreach dir,$(DATA),$(CURDIR)/$(dir)) \
-			$(foreach sf,$(SOURCEFILES_C),$(CURDIR)/$(dir $(sf))) \
-			$(foreach sf,$(SOURCEFILES_CPP),$(CURDIR)/$(dir $(sf)))
-
-export DEPSDIR	:=	$(CURDIR)/$(BUILD)
-
-CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c))) \
-			$(foreach f,$(SOURCEFILES_C),$(notdir $(f)))
-CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp))) \
-			$(foreach f,$(SOURCEFILES_CPP),$(notdir $(f)))
-SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
-BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
-
-#---------------------------------------------------------------------------------
-# use CXX for linking C++ projects, CC for standard C
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(CPPFILES)),)
-#---------------------------------------------------------------------------------
-	export LD	:=	$(CC)
-#---------------------------------------------------------------------------------
-else
-#---------------------------------------------------------------------------------
-	export LD	:=	$(CXX)
-#---------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------
-
-export OFILES_BIN	:=	$(addsuffix .o,$(BINFILES))
-export OFILES_SRC	:=	$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
-export OFILES 	:=	$(OFILES_BIN) $(OFILES_SRC)
-export HFILES_BIN	:=	$(addsuffix .h,$(subst .,_,$(BINFILES)))
-
-export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
-			$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-			-I$(CURDIR)/$(BUILD)
-
-export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib)
-
-.PHONY: $(BUILD) clean all
-
-#---------------------------------------------------------------------------------
-all: $(BUILD)
-
-lib:
-	@[ -d $@ ] || mkdir -p $@
-
-$(BUILD) : lib
-	@[ -d $@ ] || mkdir -p $@
-	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.switch
-
-#---------------------------------------------------------------------------------
-clean:
-	@echo clean ...
-	@rm -rf build lib
-
-#---------------------------------------------------------------------------------
-else
-.PHONY:	all
-
-DEPENDS	:=	$(OFILES:.o=.d)
-
-#---------------------------------------------------------------------------------
-# main targets
-#---------------------------------------------------------------------------------
-
-$(OUTPUT)	:	$(OFILES)
-
-$(OFILES_SRC)	: $(HFILES)
-$(OFILES_SRC)	: $(HFILES_BIN)
-
-#---------------------------------------------------------------------------------
-# you need a rule like this for each extension you use as binary data
-#---------------------------------------------------------------------------------
-%.bin.o	%_bin.h :	%.bin
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	@$(bin2o)
-
--include $(DEPENDS)
-
-#---------------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------------

libultraship/libultraship.sln

@@ -1,64 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30320.27
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libultraship", "libultraship\libultraship.vcxproj", "{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "TestApp\TestApp.vcxproj", "{3C4A8151-48D1-4518-BE1A-24016A5B800F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8} = {6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZAPD", "..\ZAPDTR\ZAPD\ZAPD.vcxproj", "{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZAPDUtils", "..\ZAPDTR\ZAPDUtils\ZAPDUtils.vcxproj", "{A2E01C3E-D647-45D1-9788-043DEBC1A908}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Debug|x64.ActiveCfg = Debug|x64
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Debug|x64.Build.0 = Debug|x64
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Debug|x86.ActiveCfg = Debug|Win32
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Debug|x86.Build.0 = Debug|Win32
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Release|x64.ActiveCfg = Release|x64
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Release|x64.Build.0 = Release|x64
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Release|x86.ActiveCfg = Release|Win32
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Release|x86.Build.0 = Release|Win32
-		{3C4A8151-48D1-4518-BE1A-24016A5B800F}.Debug|x64.ActiveCfg = Debug|x64
-		{3C4A8151-48D1-4518-BE1A-24016A5B800F}.Debug|x64.Build.0 = Debug|x64
-		{3C4A8151-48D1-4518-BE1A-24016A5B800F}.Debug|x86.ActiveCfg = Debug|Win32
-		{3C4A8151-48D1-4518-BE1A-24016A5B800F}.Debug|x86.Build.0 = Debug|Win32
-		{3C4A8151-48D1-4518-BE1A-24016A5B800F}.Release|x64.ActiveCfg = Release|x64
-		{3C4A8151-48D1-4518-BE1A-24016A5B800F}.Release|x64.Build.0 = Release|x64
-		{3C4A8151-48D1-4518-BE1A-24016A5B800F}.Release|x86.ActiveCfg = Release|Win32
-		{3C4A8151-48D1-4518-BE1A-24016A5B800F}.Release|x86.Build.0 = Release|Win32
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Debug|x64.ActiveCfg = Debug|x64
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Debug|x64.Build.0 = Debug|x64
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Debug|x86.ActiveCfg = Debug|Win32
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Debug|x86.Build.0 = Debug|Win32
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Release|x64.ActiveCfg = Release|x64
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Release|x64.Build.0 = Release|x64
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Release|x86.ActiveCfg = Release|Win32
-		{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}.Release|x86.Build.0 = Release|Win32
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Debug|x64.ActiveCfg = Debug|x64
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Debug|x64.Build.0 = Debug|x64
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Debug|x86.ActiveCfg = Debug|Win32
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Debug|x86.Build.0 = Debug|Win32
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Release|x64.ActiveCfg = Release|x64
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Release|x64.Build.0 = Release|x64
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Release|x86.ActiveCfg = Release|Win32
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {DCE19FF1-37C0-49CD-915A-DD695E15F00B}
-	EndGlobalSection
-EndGlobal

libultraship/libultraship/AudioPlayer.h

@@ -14,3 +14,11 @@ namespace Ship {
 		constexpr int GetSampleRate() const { return 44100; }
 	};
 }
+
+#ifdef _WIN32
+#include "WasapiAudioPlayer.h"
+#elif defined(__linux)
+#include "PulseAudioPlayer.h"
+#else
+#include "SDLAudioPlayer.h"
+#endif

libultraship/libultraship/CMakeLists.txt

@@ -0,0 +1,656 @@
+set(PROJECT_NAME libultraship)
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    enable_language(OBJCXX)
+    #set(CMAKE_OBJCXX_FLAGS "-Wno-deprecated-declarations -ObjC++")
+endif()
+
+################################################################################
+# Source groups
+################################################################################
+set(Header_Files__Resources__Factories
+    "Factories/AnimationFactory.h"
+    "Factories/ArrayFactory.h"
+    "Factories/AudioFactory.h"
+    "Factories/BlobFactory.h"
+    "Factories/CollisionHeaderFactory.h"
+    "Factories/CutsceneFactory.h"
+    "Factories/DisplayListFactory.h"
+    "Factories/MaterialFactory.h"
+    "Factories/MtxFactory.h"
+    "Factories/PathFactory.h"
+    "Factories/PlayerAnimationFactory.h"
+    "Factories/ResourceLoader.h"
+    "Factories/SceneFactory.h"
+    "Factories/SkeletonFactory.h"
+    "Factories/SkeletonLimbFactory.h"
+    "Factories/TextFactory.h"
+    "Factories/TextureFactory.h"
+    "Factories/VtxFactory.h"
+)
+source_group("Header Files\\Resources\\Factories" FILES ${Header_Files__Resources__Factories})
+
+set(Header_Files__Resources__Files
+    "Animation.h"
+    "Array.h"
+    "Audio.h"
+    "Blob.h"
+    "CollisionHeader.h"
+    "Cutscene.h"
+    "DisplayList.h"
+    "Material.h"
+    "Matrix.h"
+    "Model.h"
+    "Path.h"
+    "PlayerAnimation.h"
+    "Scene.h"
+    "Skeleton.h"
+    "SkeletonLimb.h"
+    "Text.h"
+    "Texture.h"
+    "Vertex.h"
+)
+source_group("Header Files\\Resources\\Files" FILES ${Header_Files__Resources__Files})
+
+set(Source_Files__Audio
+    "abi.h"
+    "AudioPlayer.h"
+    "mixer.c"
+    "mixer.h"
+    "SDLAudioPlayer.cpp"
+    "SDLAudioPlayer.h"
+)
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+set(Source_Files__Audio__extra
+    "WasapiAudioPlayer.cpp"
+    "WasapiAudioPlayer.h"
+)
+else()
+set(Source_Files__Audio__extra
+    "PulseAudioPlayer.cpp"
+    "PulseAudioPlayer.h"
+)
+endif ()
+
+source_group("Source Files\\Audio" FILES ${Source_Files__Audio} ${Source_Files__Audio__extra})
+
+set(Source_Files__Controller
+    "ControlDeck.cpp"
+    "ControlDeck.h"
+    "Controller.cpp"
+    "Controller.h"
+    "ControllerAttachment.cpp"
+    "ControllerAttachment.h"
+    "InputEditor.cpp"
+    "InputEditor.h"
+    "KeyboardController.cpp"
+    "KeyboardController.h"
+    "SDLController.cpp"
+    "SDLController.h"
+    "UltraController.h"
+    "VirtualController.h"
+)
+source_group("Source Files\\Controller" FILES ${Source_Files__Controller})
+
+set(Source_Files__Controller__Attachment
+    "ControllerAttachment.cpp"
+    "ControllerAttachment.h"
+    "MemoryPack.cpp"
+    "MemoryPack.h"
+    "RumblePack.cpp"
+    "RumblePack.h"
+)
+source_group("Source Files\\Controller\\Attachment" FILES ${Source_Files__Controller__Attachment})
+
+set(Source_Files__CustomImpl
+    "GameOverlay.cpp"
+    "GameOverlay.h"
+    "Console.cpp"
+    "Console.h"
+    "ImGuiImpl.cpp"
+    "ImGuiImpl.h"
+)
+source_group("Source Files\\CustomImpl" FILES ${Source_Files__CustomImpl})
+
+set(Source_Files__CustomImpl__Hooks
+    "Hooks.h"
+)
+source_group("Source Files\\CustomImpl\\Hooks" FILES ${Source_Files__CustomImpl__Hooks})
+
+set(Source_Files__CustomImpl__Utils
+    "Utils.cpp"
+    "Utils.h"
+)
+source_group("Source Files\\CustomImpl\\Utils" FILES ${Source_Files__CustomImpl__Utils})
+
+set(Source_Files__Globals
+    "Cvar.cpp"
+    "Cvar.h"
+    "GlobalCtx2.cpp"
+    "GlobalCtx2.h"
+    "LUSMacros.h"
+    "Window.cpp"
+    "Window.h"
+    "WindowShim.cpp"
+    "WindowShim.h"
+)
+source_group("Source Files\\Globals" FILES ${Source_Files__Globals})
+
+set(Source_Files__Lib
+    "Lib/mINI/src/mini/ini.h"
+    "Lib/StrHash64.cpp"
+    "Lib/StrHash64.h"
+    "Lib/tinyxml2/tinyxml2.cpp"
+    "stox.cpp"
+    "stox.h"
+)
+source_group("Source Files\\Lib" FILES ${Source_Files__Lib})
+
+set(Source_Files__Lib__Fast3D
+    "Lib/Fast3D/gfx_cc.cpp"
+    "Lib/Fast3D/gfx_cc.h"
+    "Lib/Fast3D/gfx_opengl.cpp"
+    "Lib/Fast3D/gfx_opengl.h"
+    "Lib/Fast3D/gfx_pc.cpp"
+    "Lib/Fast3D/gfx_pc.h"
+    "Lib/Fast3D/gfx_rendering_api.h"
+    "Lib/Fast3D/gfx_screen_config.h"
+    "Lib/Fast3D/gfx_sdl.h"
+    "Lib/Fast3D/gfx_sdl2.cpp"
+    "Lib/Fast3D/gfx_window_manager_api.h"
+)
+source_group("Source Files\\Lib\\Fast3D" FILES ${Source_Files__Lib__Fast3D})
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+set(Source_Files__Lib__Fast3D__extra
+    "Lib/Fast3D/gfx_direct3d11.cpp"
+    "Lib/Fast3D/gfx_direct3d11.h"
+    "Lib/Fast3D/gfx_direct3d12.cpp"
+    "Lib/Fast3D/gfx_direct3d12.h"
+    "Lib/Fast3D/gfx_direct3d12_guids.h"
+    "Lib/Fast3D/gfx_direct3d_common.cpp"
+    "Lib/Fast3D/gfx_direct3d_common.h"
+    "Lib/Fast3D/gfx_dxgi.cpp"
+    "Lib/Fast3D/gfx_dxgi.h"
+)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+set(Source_Files__Lib__Fast3D__extra
+    "Lib/Fast3D/gfx_glx.cpp"
+    "Lib/Fast3D/gfx_glx.h"
+)
+endif()
+source_group("Source Files\\Lib\\Fast3D\\extra" FILES ${Source_Files__Lib__Fast3D__extra})
+
+set(Source_Files__Lib__ImGui
+    "Lib/ImGui/backends/imgui_impl_opengl3.cpp"
+    "Lib/ImGui/backends/imgui_impl_opengl3.h"
+    "Lib/ImGui/backends/imgui_impl_sdl.cpp"
+    "Lib/ImGui/backends/imgui_impl_sdl.h"
+    "Lib/ImGui/imconfig.h"
+    "Lib/ImGui/imgui.cpp"
+    "Lib/ImGui/imgui.h"
+    "Lib/ImGui/imgui_demo.cpp"
+    "Lib/ImGui/imgui_draw.cpp"
+    "Lib/ImGui/imgui_internal.h"
+    "Lib/ImGui/imgui_tables.cpp"
+    "Lib/ImGui/imgui_widgets.cpp"
+    "Lib/ImGui/imstb_rectpack.h"
+    "Lib/ImGui/imstb_textedit.h"
+    "Lib/ImGui/imstb_truetype.h"
+)
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+set(Source_Files__Lib__ImGui__Windows
+    "Lib/ImGui/backends/imgui_impl_dx11.cpp"
+    "Lib/ImGui/backends/imgui_impl_dx11.h"
+    "Lib/ImGui/backends/imgui_impl_win32.cpp"
+    "Lib/ImGui/backends/imgui_impl_win32.h"
+)
+endif ()
+source_group("Source Files\\Lib\\ImGui" FILES ${Source_Files__Lib__ImGui} ${Source_Files__Lib__ImGui__Windows})
+
+set(Source_Files__Lib__Mercury
+    "Lib/Mercury/Mercury.cpp"
+    "Lib/Mercury/Mercury.h"
+)
+source_group("Source Files\\Lib\\Mercury" FILES ${Source_Files__Lib__Mercury})
+
+set(Source_Files__Lib__stb
+    "Lib/stb/stb_image.h"
+    "Lib/stb/stb_image_write.h"
+    "Lib/stb/stb_impl.c"
+)
+source_group("Source Files\\Lib\\stb" FILES ${Source_Files__Lib__stb})
+
+set(Source_Files__Lib__dr_libs
+    "Lib/dr_libs/mp3.h"
+    "Lib/dr_libs/wav.h"
+)
+source_group("Source Files\\Lib\\dr_libs" FILES ${Source_Files__Lib__dr_libs})
+
+set(Source_Files__Lib__tinyxml2
+    "Lib/tinyxml2/tinyxml2.h"
+)
+source_group("Source Files\\Lib\\tinyxml2" FILES ${Source_Files__Lib__tinyxml2})
+
+set(Source_Files__Logging
+    "luslog.cpp"
+    "luslog.h"
+)
+source_group("Source Files\\Logging" FILES ${Source_Files__Logging})
+
+set(Source_Files__Resources
+    "GameVersions.h"
+    "Resource.cpp"
+    "Resource.h"
+    "ResourceMgr.cpp"
+    "ResourceMgr.h"
+)
+source_group("Source Files\\Resources" FILES ${Source_Files__Resources})
+
+set(Source_Files__Resources__Factories
+    "Factories/AnimationFactory.cpp"
+    "Factories/ArrayFactory.cpp"
+    "Factories/AudioFactory.cpp"
+    "Factories/BlobFactory.cpp"
+    "Factories/CollisionHeaderFactory.cpp"
+    "Factories/CutsceneFactory.cpp"
+    "Factories/DisplayListFactory.cpp"
+    "Factories/MaterialFactory.cpp"
+    "Factories/MtxFactory.cpp"
+    "Factories/PathFactory.cpp"
+    "Factories/PlayerAnimationFactory.cpp"
+    "Factories/ResourceLoader.cpp"
+    "Factories/SceneFactory.cpp"
+    "Factories/SkeletonFactory.cpp"
+    "Factories/SkeletonLimbFactory.cpp"
+    "Factories/TextFactory.cpp"
+    "Factories/TextureFactory.cpp"
+    "Factories/VtxFactory.cpp"
+)
+source_group("Source Files\\Resources\\Factories" FILES ${Source_Files__Resources__Factories})
+
+set(Source_Files__Resources__Files
+    "Animation.cpp"
+    "Array.cpp"
+    "Audio.cpp"
+    "Blob.cpp"
+    "CollisionHeader.cpp"
+    "Cutscene.cpp"
+    "DisplayList.cpp"
+    "Material.cpp"
+    "Matrix.cpp"
+    "Model.cpp"
+    "Path.cpp"
+    "PlayerAnimation.cpp"
+    "Scene.cpp"
+    "Skeleton.cpp"
+    "SkeletonLimb.cpp"
+    "Text.cpp"
+    "Texture.cpp"
+    "Vertex.cpp"
+)
+source_group("Source Files\\Resources\\Files" FILES ${Source_Files__Resources__Files})
+
+set(Source_Files__Resources__mpq
+    "Archive.cpp"
+    "Archive.h"
+    "File.cpp"
+    "File.h"
+)
+source_group("Source Files\\Resources\\mpq" FILES ${Source_Files__Resources__mpq})
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+set(Source_Files__Darwin
+    "OSXFolderManager.mm"
+    "OSXFolderManager.h"
+)
+source_group("Source Files\\Darwin" FILES ${Source_Files__Darwin})
+endif()
+
+if (CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch")
+set(Source_Files__NintendoSwitch
+       "SwitchImpl.cpp"
+       "SwitchImpl.h"
+)
+source_group("Source Files\\NintendoSwitch" FILES ${Source_Files__NintendoSwitch})
+endif()
+
+set(ALL_FILES
+    ${Header_Files__Resources__Factories}
+    ${Header_Files__Resources__Files}
+    ${Source_Files__Audio}
+    ${Source_Files__Audio__extra}
+    ${Source_Files__Controller}
+    ${Source_Files__Controller__Attachment}
+    ${Source_Files__CustomImpl}
+    ${Source_Files__CustomImpl__Hooks}
+    ${Source_Files__CustomImpl__Utils}
+    ${Source_Files__Globals}
+    ${Source_Files__Lib}
+    ${Source_Files__Lib__Fast3D}
+    ${Source_Files__Lib__Fast3D__extra}
+    ${Source_Files__Lib__ImGui}
+    ${Source_Files__Lib__ImGui__Windows}
+    ${Source_Files__Lib__Mercury}
+    ${Source_Files__Lib__stb}
+    ${Source_Files__Lib__dr_libs}
+    ${Source_Files__Lib__tinyxml2}
+    ${Source_Files__Logging}
+    ${Source_Files__Resources}
+    ${Source_Files__Resources__Factories}
+    ${Source_Files__Resources__Files}
+    ${Source_Files__Resources__mpq}
+    ${Source_Files__Darwin}
+    ${Source_Files__NintendoSwitch}
+)
+
+################################################################################
+# Target
+################################################################################
+add_library(${PROJECT_NAME} STATIC ${ALL_FILES})
+
+if (NOT TARGET storm)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../StormLib ${CMAKE_BINARY_DIR}/StormLib EXCLUDE_FROM_ALL)
+endif()
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+use_props(${PROJECT_NAME} "${CMAKE_CONFIGURATION_TYPES}" "${DEFAULT_CXX_PROPS}")
+endif()
+
+set(ROOT_NAMESPACE libultraship)
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+	set_target_properties(${PROJECT_NAME} PROPERTIES
+		VS_GLOBAL_KEYWORD "Win32Proj"
+	)
+	if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+		set_target_properties(${PROJECT_NAME} PROPERTIES
+			INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE"
+		)
+	elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
+		set_target_properties(${PROJECT_NAME} PROPERTIES
+			INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE"
+		)
+	endif()
+endif()
+################################################################################
+# MSVC runtime library
+################################################################################
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+	get_property(MSVC_RUNTIME_LIBRARY_DEFAULT TARGET ${PROJECT_NAME} PROPERTY MSVC_RUNTIME_LIBRARY)
+	if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+		string(CONCAT "MSVC_RUNTIME_LIBRARY_STR"
+			$<$<CONFIG:Debug>:
+				MultiThreadedDebug
+			>
+			$<$<CONFIG:Release>:
+				MultiThreaded
+			>
+			$<$<NOT:$<OR:$<CONFIG:Debug>,$<CONFIG:Release>>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}>
+		)
+	elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
+		string(CONCAT "MSVC_RUNTIME_LIBRARY_STR"
+			$<$<CONFIG:Debug>:
+				MultiThreadedDebug
+			>
+			$<$<CONFIG:Release>:
+				MultiThreaded
+			>
+			$<$<NOT:$<OR:$<CONFIG:Debug>,$<CONFIG:Release>>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}>
+		)
+	endif()
+	set_target_properties(${PROJECT_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY ${MSVC_RUNTIME_LIBRARY_STR})
+endif()
+################################################################################
+# Compile definitions
+################################################################################
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+	if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+		target_compile_definitions(${PROJECT_NAME} PRIVATE
+			"$<$<CONFIG:Debug>:"
+				"_DEBUG"
+			">"
+			"$<$<CONFIG:Release>:"
+				"NDEBUG"
+			">"
+			"SPDLOG_ACTIVE_LEVEL=0;"
+			"WIN32;"
+			"_CONSOLE;"
+			"_CRT_SECURE_NO_WARNINGS;"
+			"ENABLE_DX11;"
+			"ENABLE_OPENGL;"
+			"%(PreprocessorDefinitions)GLEW_STATIC;"
+			"UNICODE;"
+			"_UNICODE"
+			STORMLIB_NO_AUTO_LINK
+		)
+	elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
+		target_compile_definitions(${PROJECT_NAME} PRIVATE
+			"$<$<CONFIG:Debug>:"
+				"_DEBUG"
+			">"
+			"$<$<CONFIG:Release>:"
+				"NDEBUG"
+			">"
+			"SPDLOG_ACTIVE_LEVEL=0;"
+			"WIN32;"
+			"_CONSOLE;"
+			"_CRT_SECURE_NO_WARNINGS;"
+			"ENABLE_OPENGL;"
+			"ENABLE_DX11;"
+			"%(PreprocessorDefinitions)GLEW_STATIC;"
+			"UNICODE;"
+			"_UNICODE"
+			STORMLIB_NO_AUTO_LINK
+		)
+	endif()
+endif()
+
+if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|AppleClang")
+	target_compile_definitions(${PROJECT_NAME} PRIVATE
+		"$<$<CONFIG:Debug>:"
+				"_DEBUG"
+			">"
+			"$<$<CONFIG:Release>:"
+				"NDEBUG"
+			">"
+			"ENABLE_OPENGL;"
+            "SPDLOG_ACTIVE_LEVEL=0;"
+	)
+endif()
+################################################################################
+# Compile and link options
+################################################################################
+if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows|NintendoSwitch")
+    find_package(SDL2)
+    find_package(GLEW)
+    find_package(X11)
+    if (NOT GLEW_FOUND)
+        if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows|Darwin")
+            include (FetchContent)
+            FetchContent_Declare(
+                glew
+                GIT_REPOSITORY https://github.com/Perlmint/glew-cmake.git
+                SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../external/glew
+            )
+            FetchContent_MakeAvailable(glew)
+            add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../external/glew/build/cmake ${CMAKE_BINARY_DIR}/glew EXCLUDE_FROM_ALL)
+        endif()
+    endif()
+
+    if (NOT GLEW_FOUND)
+       set(GLEW-INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/../../external/glew/include)
+    else()
+        set(GLEW-INCLUDE  ${GLEW_INCLUDE_DIRS})
+    endif()
+    set(SDL2-INCLUDE ${SDL2_INCLUDE_DIRS})
+elseif (CMAKE_SYSTEM_NAME MATCHES "NintendoSwitch")
+    find_package(SDL2)
+else()
+    set(GLEW-INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/Lib/GLEW/)
+    set(SDL2-INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/Lib/SDL/)
+endif()
+
+target_include_directories(${PROJECT_NAME} PRIVATE
+	${CMAKE_CURRENT_SOURCE_DIR}/Lib/spdlog/include/
+	${CMAKE_CURRENT_SOURCE_DIR}/Lib/Fast3D/U64/
+	${CMAKE_CURRENT_SOURCE_DIR}/Lib/Fast3D/U64/PR
+	${SDL2-INCLUDE}
+	${GLEW-INCLUDE}
+	${SWITCH-INCLUDE}
+	${CMAKE_CURRENT_SOURCE_DIR}/Lib/ImGui/
+	${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/ZAPDUtils
+	${CMAKE_CURRENT_SOURCE_DIR}/../../StormLib/src
+	.
+	)
+
+if(MSVC)
+    if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+        target_compile_options(${PROJECT_NAME} PRIVATE
+            $<$<CONFIG:Release>:
+                /std:c++latest;
+                /Oi;
+                /Gy
+            >
+            /permissive-;
+            /MP;
+            /sdl;
+            /W3;
+            ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT};
+            ${DEFAULT_CXX_EXCEPTION_HANDLING}
+        )
+    elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
+        target_compile_options(${PROJECT_NAME} PRIVATE
+            $<$<CONFIG:Debug>:
+                /Od;
+                /Oi-;
+                /W2
+            >
+            $<$<CONFIG:Release>:
+                /Oi;
+                /Gy;
+                /W3
+            >
+            /permissive-;
+            /MP;
+            /sdl;
+            ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT};
+            ${DEFAULT_CXX_EXCEPTION_HANDLING}
+        )
+    endif()
+    if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+        target_link_options(${PROJECT_NAME} PRIVATE
+            $<$<CONFIG:Release>:
+                /OPT:REF;
+                /OPT:ICF
+            >
+            /SUBSYSTEM:CONSOLE
+        )
+    elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
+        target_link_options(${PROJECT_NAME} PRIVATE
+            $<$<CONFIG:Release>:
+                /OPT:REF;
+                /OPT:ICF
+            >
+            /SUBSYSTEM:CONSOLE
+        )
+    endif()
+endif()
+
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+	target_compile_options(${PROJECT_NAME} PRIVATE
+		-Wall
+		-Wextra
+		-Wno-error
+		-Wno-unused-variable
+		-Wno-unused-parameter
+		-Wno-unused-function
+		-Wno-parentheses
+		-Wno-narrowing
+		-Wno-missing-field-initializers
+	)
+endif()
+################################################################################
+# Dependencies
+################################################################################
+# Link with other targets.
+
+find_package(OpenGL QUIET)
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    find_package(X11)
+    find_package(PulseAudio)
+endif()
+
+if (NOT GLEW_FOUND)
+    set(GLEW-LIB glew_s)
+else()
+    set(GLEW-LIB  GLEW::GLEW)
+endif()
+ 
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+        target_link_libraries(${PROJECT_NAME}
+            "glew32s;"
+            "opengl32;"
+            "storm;"
+        )
+    elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
+        target_link_libraries(${PROJECT_NAME}
+            "glew32s;"
+            "opengl32;"
+            "storm;"
+        )
+    endif()
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    find_package(SDL2)
+    find_package(GLEW)
+    find_package(OpenGL QUIET)
+    find_Library(OSX_FOUNDATION Foundation)
+    set(THREADS_PREFER_PTHREAD_FLAG ON)
+    find_package(Threads REQUIRED)
+    target_link_libraries(${PROJECT_NAME}
+       "storm;"
+        SDL2::SDL2
+        GLEW::GLEW
+        ${OPENGL_opengl_LIBRARY}
+        ${CMAKE_DL_LIBS}
+        Threads::Threads
+	${OSX_FOUNDATION}
+    )
+elseif(CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch")
+    set(THREADS_PREFER_PTHREAD_FLAG ON)
+    find_package(Threads REQUIRED)
+    target_link_libraries(${PROJECT_NAME}
+        storm
+        SDL2::SDL2
+        Threads::Threads
+    )
+else()
+    target_link_libraries(${PROJECT_NAME}
+        SDL2::SDL2
+        ${PULSEAUDIO_LIBRARY}
+        ${GLEW-LIB}
+        ${OPENGL_glx_LIBRARY}
+        ${OPENGL_opengl_LIBRARY}
+        ${X11_LIBRARIES}
+        storm
+    )
+endif()
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
+        add_library(glew32s STATIC IMPORTED )
+        set_property(TARGET glew32s PROPERTY
+            IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/Lib/GLEW/x64/glew32s.lib  )
+        set_property(TARGET glew32s PROPERTY
+            IMPORTED_IMPLIB ${CMAKE_CURRENT_SOURCE_DIR}/Lib/GLEW/x64/glew32s.lib)
+    elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
+        add_library(glew32s STATIC IMPORTED )
+        set_property(TARGET glew32s PROPERTY
+            IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/Lib/GLEW/x86/glew32s.lib  )
+        set_property(TARGET glew32s PROPERTY
+            IMPORTED_IMPLIB ${CMAKE_CURRENT_SOURCE_DIR}/Lib/GLEW/x86/glew32s.lib)
+    endif()
+endif()

libultraship/libultraship/Console.cpp

@@ -10,115 +10,116 @@
 #include "Utils/StringHelper.h"
 #include "Lib/ImGui/imgui_internal.h"
 
-std::map<ImGuiKey, std::string> Bindings;
+namespace Ship {
-std::map<ImGuiKey, std::string> BindingToggle;
+	std::map<ImGuiKey, std::string> Bindings;
+	std::map<ImGuiKey, std::string> BindingToggle;
 
-static bool HelpCommand(const std::vector<std::string>&) {
+	static bool HelpCommand(const std::vector<std::string>&) {
-	INFO("SoH Commands:");
+		INFO("SoH Commands:");
-	for(const auto& cmd : SohImGui::console->Commands) {
+		for (const auto& cmd : SohImGui::console->Commands) {
-		INFO("%s", (" - " + cmd.first).c_str());
+			INFO("%s", (" - " + cmd.first).c_str());
+		}
+		return CMD_SUCCESS;
 	}
-	return CMD_SUCCESS;
-}
 
-static bool ClearCommand(const std::vector<std::string>&) {
+	static bool ClearCommand(const std::vector<std::string>&) {
-	SohImGui::console->Log[SohImGui::console->selected_channel].clear();
+		SohImGui::console->Log[SohImGui::console->selected_channel].clear();
-	return CMD_SUCCESS;
+		return CMD_SUCCESS;
-}
+	}
 
-std::string toLowerCase(std::string in) {
+	std::string toLowerCase(std::string in) {
-	std::string cpy(in);
+		std::string cpy(in);
-	std::transform(cpy.begin(), cpy.end(), cpy.begin(), ::tolower);
+		std::transform(cpy.begin(), cpy.end(), cpy.begin(), ::tolower);
-	return cpy;
+		return cpy;
-}
+	}
 
-static bool BindCommand(const std::vector<std::string>& args) {
+	static bool BindCommand(const std::vector<std::string>& args) {
-	if(args.size() > 2) {
+		if (args.size() > 2) {
-		const ImGuiIO* io = &ImGui::GetIO();;
+			const ImGuiIO* io = &ImGui::GetIO();;
-		for (size_t k = 0; k < std::size(io->KeysData); k++) {
+			for (size_t k = 0; k < std::size(io->KeysData); k++) {
-			std::string key(ImGui::GetKeyName(k));
+				std::string key(ImGui::GetKeyName(k));
 
-			if(toLowerCase(args[1]) == toLowerCase(key)) {
+				if (toLowerCase(args[1]) == toLowerCase(key)) {
-				std::vector<std::string> tmp;
+					std::vector<std::string> tmp;
-				const char* const delim = " ";
+					const char* const delim = " ";
-				std::ostringstream imploded;
+					std::ostringstream imploded;
-				std::copy(args.begin() + 2, args.end(), std::ostream_iterator<std::string>(imploded, delim));
+					std::copy(args.begin() + 2, args.end(), std::ostream_iterator<std::string>(imploded, delim));
-				Bindings[k] = imploded.str();
+					Bindings[k] = imploded.str();
-				INFO("Binding '%s' to %s", args[1].c_str(), Bindings[k].c_str());
+					INFO("Binding '%s' to %s", args[1].c_str(), Bindings[k].c_str());
-				break;
+					break;
+				}
+			}
+		}
+		return CMD_SUCCESS;
+	}
+
+	static bool BindToggleCommand(const std::vector<std::string>& args) {
+		if (args.size() > 2) {
+			const ImGuiIO* io = &ImGui::GetIO();;
+			for (size_t k = 0; k < std::size(io->KeysData); k++) {
+				std::string key(ImGui::GetKeyName(k));
+
+				if (toLowerCase(args[1]) == toLowerCase(key)) {
+					BindingToggle[k] = args[2];
+					INFO("Binding toggle '%s' to %s", args[1].c_str(), BindingToggle[k].c_str());
+					break;
+				}
+			}
+		}
+		return CMD_SUCCESS;
+	}
+
+	std::string BuildUsage(const CommandEntry& entry) {
+		std::string usage;
+		for (const auto& arg : entry.arguments)
+			usage += StringHelper::Sprintf(arg.optional ? "[%s] " : "<%s> ", arg.info.c_str());
+		return usage;
+	}
+
+	void Console::Init() {
+		this->InputBuffer = new char[MAX_BUFFER_SIZE];
+		strcpy(this->InputBuffer, "");
+		this->FilterBuffer = new char[MAX_BUFFER_SIZE];
+		strcpy(this->FilterBuffer, "");
+		this->Commands["help"] = { HelpCommand, "Shows all the commands" };
+		this->Commands["clear"] = { ClearCommand, "Clear the console history" };
+		this->Commands["bind"] = { BindCommand, "Binds key to commands" };
+		this->Commands["bind-toggle"] = { BindToggleCommand, "Bind key as a bool toggle" };
+	}
+
+	void Console::Update() {
+		for (auto [key, cmd] : Bindings) {
+			if (ImGui::IsKeyPressed(key)) Dispatch(cmd);
+		}
+		for (auto [key, var] : BindingToggle) {
+			if (ImGui::IsKeyPressed(key)) {
+				CVar* cvar = CVar_Get(var.c_str());
+				Dispatch("set " + var + " " + std::to_string(cvar == nullptr ? 0 : !static_cast<bool>(cvar->value.valueS32)));
 			}
 		}
 	}
-	return CMD_SUCCESS;
-}
 
-static bool BindToggleCommand(const std::vector<std::string>& args) {
+	void Console::Draw() {
-	if (args.size() > 2) {
+		bool input_focus = false;
-		const ImGuiIO* io = &ImGui::GetIO();;
+		if (!this->opened) return;
-		for (size_t k = 0; k < std::size(io->KeysData); k++) {
-			std::string key(ImGui::GetKeyName(k));
 
-			if (toLowerCase(args[1]) == toLowerCase(key)) {
+		ImGui::SetNextWindowSize(ImVec2(520, 600), ImGuiCond_FirstUseEver);
-				BindingToggle[k] = args[2];
+		ImGui::Begin("Console", nullptr, ImGuiWindowFlags_NoFocusOnAppearing);
-				INFO("Binding toggle '%s' to %s", args[1].c_str(), BindingToggle[k].c_str());
-				break;
-			}
-		}
-	}
-	return CMD_SUCCESS;
-}
-
-std::string BuildUsage(const CommandEntry& entry) {
-	std::string usage;
-	for (const auto& arg : entry.arguments)
-		usage += StringHelper::Sprintf(arg.optional ? "[%s] " : "<%s> ", arg.info.c_str());
-	return usage;
-}
-
-void Console::Init() {
-	this->InputBuffer = new char[MAX_BUFFER_SIZE];
-	strcpy(this->InputBuffer, "");
-	this->FilterBuffer = new char[MAX_BUFFER_SIZE];
-	strcpy(this->FilterBuffer, "");
-	this->Commands["help"]  = { HelpCommand, "Shows all the commands" };
-	this->Commands["clear"] = { ClearCommand, "Clear the console history" };
-	this->Commands["bind"]  = { BindCommand, "Binds key to commands" };
-	this->Commands["bind-toggle"] = { BindToggleCommand, "Bind key as a bool toggle" };
-}
-
-void Console::Update() {
-	for(auto [key, cmd] : Bindings) {
-		if (ImGui::IsKeyPressed(key)) Dispatch(cmd);
-	}
-	for (auto [key, var] : BindingToggle) {
-		if (ImGui::IsKeyPressed(key)) {
-			CVar* cvar = CVar_Get(var.c_str());
-			Dispatch("set " + var + " " + std::to_string(cvar == nullptr ? 0 : !static_cast<bool>(cvar->value.valueS32)));
-		}
-	}
-}
-
-void Console::Draw() {
-	bool input_focus = false;
-	if (!this->opened) return;
-
-	ImGui::SetNextWindowSize(ImVec2(520, 600), ImGuiCond_FirstUseEver);
-	ImGui::Begin("Console", nullptr, ImGuiWindowFlags_NoFocusOnAppearing);
 		const ImVec2 pos = ImGui::GetWindowPos();
 		const ImVec2 size = ImGui::GetWindowSize();
 		// SohImGui::ShowCursor(ImGui::IsWindowHovered(ImGuiHoveredFlags_RootAndChildWindows | ImGuiHoveredFlags_RectOnly), SohImGui::Dialogues::dConsole);
 
 		// Renders autocomplete window
-		if(this->OpenAutocomplete) {
+		if (this->OpenAutocomplete) {
 			ImGui::SetNextWindowSize(ImVec2(350, std::min(static_cast<int>(this->Autocomplete.size()), 3) * 20.f), ImGuiCond_Once);
 			ImGui::SetNextWindowPos(ImVec2(pos.x + 8, pos.y + size.y - 1));
 			ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(3, 3));
-			ImGui::Begin("##WndAutocomplete", nullptr, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoMove );
+			ImGui::Begin("##WndAutocomplete", nullptr, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoMove);
 			ImGui::BeginChild("AC_Child", ImVec2(0, 0), false, ImGuiWindowFlags_HorizontalScrollbar);
 			ImGui::PushStyleColor(ImGuiCol_FrameBgActive, ImVec4(.3f, .3f, .3f, 1.0f));
 			if (ImGui::BeginTable("AC_History", 1)) {
-				for (const auto &cmd : this->Autocomplete) {
+				for (const auto& cmd : this->Autocomplete) {
-					std::string usage   = BuildUsage(this->Commands[cmd]);
+					std::string usage = BuildUsage(this->Commands[cmd]);
 					std::string preview = cmd + " - " + this->Commands[cmd].description;
 					std::string autocomplete = (usage == NULLSTR ? cmd : usage);
 					ImGui::TableNextRow();
@@ -186,53 +187,53 @@ void Console::Draw() {
 		// Renders console history
 		const float footer_height_to_reserve = ImGui::GetStyle().ItemSpacing.y + ImGui::GetFrameHeightWithSpacing();
 		ImGui::BeginChild("ScrollingRegion", ImVec2(0, -footer_height_to_reserve), false, ImGuiWindowFlags_HorizontalScrollbar);
-			ImGui::PushStyleColor(ImGuiCol_FrameBgActive, ImVec4(.3f, .3f, .3f, 1.0f));
+		ImGui::PushStyleColor(ImGuiCol_FrameBgActive, ImVec4(.3f, .3f, .3f, 1.0f));
-			if (ImGui::BeginTable("History", 1)) {
+		if (ImGui::BeginTable("History", 1)) {
 
-				if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_DownArrow)))
+			if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_DownArrow)))
-					if (this->selectedId < (int)this->Log.size() - 1) ++this->selectedId;
+				if (this->selectedId < (int)this->Log.size() - 1)++this->selectedId;
-				if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_UpArrow)))
+			if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_UpArrow)))
-					if (this->selectedId > 0) --this->selectedId;
+				if (this->selectedId > 0)--this->selectedId;
 
-				const std::vector<ConsoleLine> channel = this->Log[this->selected_channel];
+			const std::vector<ConsoleLine> channel = this->Log[this->selected_channel];
-				for (int i = 0; i < static_cast<int>(channel.size()); i++) {
+			for (int i = 0; i < static_cast<int>(channel.size()); i++) {
-					ConsoleLine line = channel[i];
+				ConsoleLine line = channel[i];
-					if(!this->filter.empty() && line.text.find(this->filter) == std::string::npos) continue;
+				if (!this->filter.empty() && line.text.find(this->filter) == std::string::npos) continue;
-					if(this->level_filter != NULLSTR && line.priority != (std::find(priority_filters.begin(), priority_filters.end(), this->level_filter) - priority_filters.begin()) - 1) continue;
+				if (this->level_filter != NULLSTR && line.priority != (std::find(priority_filters.begin(), priority_filters.end(), this->level_filter) - priority_filters.begin()) - 1) continue;
-					std::string id = line.text + "##" + std::to_string(i);
+				std::string id = line.text + "##" + std::to_string(i);
-					ImGui::TableNextRow();
+				ImGui::TableNextRow();
-					ImGui::TableSetColumnIndex(0);
+				ImGui::TableSetColumnIndex(0);
-					const bool is_selected = (this->selectedId == i) || std::find(this->selectedEntries.begin(), this->selectedEntries.end(), i) != this->selectedEntries.end();
+				const bool is_selected = (this->selectedId == i) || std::find(this->selectedEntries.begin(), this->selectedEntries.end(), i) != this->selectedEntries.end();
-					ImGui::PushStyleColor(ImGuiCol_Text, this->priority_colors[line.priority]);
+				ImGui::PushStyleColor(ImGuiCol_Text, this->priority_colors[line.priority]);
-					if (ImGui::Selectable(id.c_str(), is_selected)) {
+				if (ImGui::Selectable(id.c_str(), is_selected)) {
-						if (ImGui::IsKeyDown(ImGui::GetKeyIndex(ImGuiKey_LeftCtrl)) && !is_selected)
+					if (ImGui::IsKeyDown(ImGui::GetKeyIndex(ImGuiKey_LeftCtrl)) && !is_selected)
-							this->selectedEntries.push_back(i);
+						this->selectedEntries.push_back(i);
 
-						else this->selectedEntries.clear();
+					else this->selectedEntries.clear();
-						this->selectedId = is_selected ? -1 : i;
+					this->selectedId = is_selected ? -1 : i;
-					}
-					ImGui::PopStyleColor();
-					if (is_selected) ImGui::SetItemDefaultFocus();
 				}
-				ImGui::EndTable();
+				ImGui::PopStyleColor();
+				if (is_selected) ImGui::SetItemDefaultFocus();
 			}
-			ImGui::PopStyleColor();
+			ImGui::EndTable();
-			if (ImGui::GetScrollY() >= ImGui::GetScrollMaxY())
+		}
-				ImGui::SetScrollHereY(1.0f);
+		ImGui::PopStyleColor();
+		if (ImGui::GetScrollY() >= ImGui::GetScrollMaxY())
+			ImGui::SetScrollHereY(1.0f);
 		ImGui::EndChild();
 
 		// Renders input textfield
 		constexpr ImGuiInputTextFlags flags = ImGuiInputTextFlags_EnterReturnsTrue | ImGuiInputTextFlags_CallbackEdit |
-			                                  ImGuiInputTextFlags_CallbackCompletion | ImGuiInputTextFlags_CallbackHistory;
+			ImGuiInputTextFlags_CallbackCompletion | ImGuiInputTextFlags_CallbackHistory;
 		ImGui::PushItemWidth(-53);
-		if(ImGui::InputTextWithHint("##CMDInput", ">", this->InputBuffer, MAX_BUFFER_SIZE, flags, &Console::CallbackStub, this)) {
+		if (ImGui::InputTextWithHint("##CMDInput", ">", this->InputBuffer, MAX_BUFFER_SIZE, flags, &Console::CallbackStub, this)) {
 			input_focus = true;
-			if(this->InputBuffer[0] != '\0' && this->InputBuffer[0] != ' ')
+			if (this->InputBuffer[0] != '\0' && this->InputBuffer[0] != ' ')
 				this->Dispatch(std::string(this->InputBuffer));
 			memset(this->InputBuffer, 0, MAX_BUFFER_SIZE);
 		}
 
-		if(this->CMDHint != NULLSTR) {
+		if (this->CMDHint != NULLSTR) {
 			if (ImGui::IsItemFocused()) {
 				ImGui::SetNextWindowPos(ImVec2(pos.x, pos.y + size.y));
 				ImGui::SameLine();
@@ -246,38 +247,38 @@ void Console::Draw() {
 
 		ImGui::SameLine();
 		ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetContentRegionAvail().x - 50);
-		if(ImGui::Button("Submit") && !input_focus && this->InputBuffer[0] != '\0' && this->InputBuffer[0] != ' '){
+		if (ImGui::Button("Submit") && !input_focus && this->InputBuffer[0] != '\0' && this->InputBuffer[0] != ' ') {
-				this->Dispatch(std::string(this->InputBuffer));
+			this->Dispatch(std::string(this->InputBuffer));
 			memset(this->InputBuffer, 0, MAX_BUFFER_SIZE);
 		}
 
 		ImGui::SetItemDefaultFocus();
 		if (input_focus) ImGui::SetKeyboardFocusHere(-1);
 		ImGui::PopItemWidth();
-	ImGui::End();
+		ImGui::End();
-}
-
-void Console::Dispatch(const std::string& line) {
-	this->CMDHint = NULLSTR;
-	this->History.push_back(line);
-	this->Log[this->selected_channel].push_back({ "> " + line } );
-	const std::vector<std::string> cmd_args = StringHelper::Split(line, " ");
-	if (this->Commands.contains(cmd_args[0])) {
-		const CommandEntry entry = this->Commands[cmd_args[0]];
-		if(!entry.handler(cmd_args) && !entry.arguments.empty())
-			this->Log[this->selected_channel].push_back({ "[SOH] Usage: " + cmd_args[0] + " " + BuildUsage(entry), ERROR_LVL});
-		return;
 	}
-	this->Log[this->selected_channel].push_back({ "[SOH] Command not found", ERROR_LVL });
-}
 
-int Console::CallbackStub(ImGuiInputTextCallbackData* data) {
+	void Console::Dispatch(const std::string& line) {
-	const auto instance = static_cast<Console*>(data->UserData);
+		this->CMDHint = NULLSTR;
-	const bool empty_history = instance->History.empty();
+		this->History.push_back(line);
-	const int  history_index = instance->HistoryIndex;
+		this->Log[this->selected_channel].push_back({ "> " + line });
-	std::string history;
+		const std::vector<std::string> cmd_args = StringHelper::Split(line, " ");
+		if (this->Commands.contains(cmd_args[0])) {
+			const CommandEntry entry = this->Commands[cmd_args[0]];
+			if (!entry.handler(cmd_args) && !entry.arguments.empty())
+				this->Log[this->selected_channel].push_back({ "[SOH] Usage: " + cmd_args[0] + " " + BuildUsage(entry), ERROR_LVL });
+			return;
+		}
+		this->Log[this->selected_channel].push_back({ "[SOH] Command not found", ERROR_LVL });
+	}
 
-	switch(data->EventKey) {
+	int Console::CallbackStub(ImGuiInputTextCallbackData* data) {
+		const auto instance = static_cast<Console*>(data->UserData);
+		const bool empty_history = instance->History.empty();
+		const int  history_index = instance->HistoryIndex;
+		std::string history;
+
+		switch (data->EventKey) {
 		case ImGuiKey_Tab:
 			instance->Autocomplete.clear();
 			for (auto& [cmd, entry] : instance->Commands)
@@ -287,7 +288,7 @@ int Console::CallbackStub(ImGuiInputTextCallbackData* data) {
 			break;
 		case ImGuiKey_UpArrow:
 			if (empty_history) break;
-			if(history_index < static_cast<int>(instance->History.size()) - 1) instance->HistoryIndex += 1;
+			if (history_index < static_cast<int>(instance->History.size()) - 1) instance->HistoryIndex += 1;
 			data->DeleteChars(0, data->BufTextLen);
 			data->InsertChars(0, instance->History[instance->HistoryIndex].c_str());
 			instance->CMDHint = NULLSTR;
@@ -296,7 +297,7 @@ int Console::CallbackStub(ImGuiInputTextCallbackData* data) {
 			if (empty_history) break;
 			if (history_index > -1) instance->HistoryIndex -= 1;
 			data->DeleteChars(0, data->BufTextLen);
-			if(history_index >= 0)
+			if (history_index >= 0)
 				data->InsertChars(0, instance->History[history_index].c_str());
 			instance->CMDHint = NULLSTR;
 			break;
@@ -316,16 +317,17 @@ int Console::CallbackStub(ImGuiInputTextCallbackData* data) {
 				}
 				instance->CMDHint = NULLSTR;
 			}
+		}
+		return 0;
 	}
-	return 0;
-}
 
-void Console::Append(const std::string& channel, Priority priority, const char* fmt, ...) {
+	void Console::Append(const std::string& channel, Priority priority, const char* fmt, ...) {
-	char buf[1024];
+		char buf[1024];
-	va_list args;
+		va_list args;
-	va_start(args, fmt);
+		va_start(args, fmt);
-	vsnprintf(buf, IM_ARRAYSIZE(buf), fmt, args);
+		vsnprintf(buf, IM_ARRAYSIZE(buf), fmt, args);
-	buf[IM_ARRAYSIZE(buf) - 1] = 0;
+		buf[IM_ARRAYSIZE(buf) - 1] = 0;
-	va_end(args);
+		va_end(args);
-	this->Log[channel].push_back({ std::string(buf), priority });
+		this->Log[channel].push_back({ std::string(buf), priority });
-}
+	}
+}

libultraship/libultraship/Console.h

@@ -7,75 +7,77 @@
 
 #include "Lib/ImGui/imgui.h"
 
-#define LOG(msg, ...) SohImGui::console->Append("Main", Priority::LOG_LVL, msg, ##__VA_ARGS__)
+namespace Ship {
-#define INFO(msg, ...) SohImGui::console->Append("Main", Priority::INFO_LVL, msg, ##__VA_ARGS__)
+	#define LOG(msg, ...) SohImGui::console->Append("Main", Ship::Priority::LOG_LVL, msg, ##__VA_ARGS__)
-#define WARNING(msg, ...) SohImGui::console->Append("Main", Priority::WARNING_LVL, msg, ##__VA_ARGS__)
+	#define INFO(msg, ...) SohImGui::console->Append("Main", Ship::Priority::INFO_LVL, msg, ##__VA_ARGS__)
-#define ERROR(msg, ...) SohImGui::console->Append("Main", Priority::ERROR_LVL, msg, ##__VA_ARGS__)
+	#define WARNING(msg, ...) SohImGui::console->Append("Main", Ship::Priority::WARNING_LVL, msg, ##__VA_ARGS__)
-#define CMD_SUCCESS true
+	#define ERROR(msg, ...) SohImGui::console->Append("Main", Ship::Priority::ERROR_LVL, msg, ##__VA_ARGS__)
-#define CMD_FAILED false
+	#define CMD_SUCCESS true
-#define MAX_BUFFER_SIZE 255
+	#define CMD_FAILED false
-#define NULLSTR "None"
+	#define MAX_BUFFER_SIZE 255
+	#define NULLSTR "None"
 
-typedef std::function<bool(std::vector<std::string> args)> CommandHandler;
+	typedef std::function<bool(std::vector<std::string> args)> CommandHandler;
 
-enum Priority {
+	enum Priority {
-	INFO_LVL,
+		INFO_LVL,
-	LOG_LVL,
+		LOG_LVL,
-	WARNING_LVL,
+		WARNING_LVL,
-	ERROR_LVL
+		ERROR_LVL
-};
-
-enum class ArgumentType {
-	TEXT, NUMBER, PLAYER_POS, PLAYER_ROT
-};
-
-struct CommandArgument {
-	std::string info;
-	ArgumentType type = ArgumentType::NUMBER;
-	bool optional = false;
-};
-
-struct CommandEntry {
-	CommandHandler handler;
-	std::string description;
-	std::vector<CommandArgument> arguments;
-};
-
-struct ConsoleLine {
-	std::string text;
-	Priority priority = Priority::INFO_LVL;
-	std::string channel = "Main";
-};
-
-class Console {
-	int selectedId = -1;
-	std::vector<int> selectedEntries;
-	std::string filter;
-	std::string level_filter = NULLSTR;
-	std::vector<std::string> log_channels = { "Main", "SoH Logging"};
-	std::vector<std::string> priority_filters = { "None", "Info", "Log", "Warning", "Error" };
-	std::vector<ImVec4> priority_colors = {
-		ImVec4(1.0f, 1.0f, 1.0f, 1.0f),
-		ImVec4(0.2f, 1.0f, 0.2f, 1.0f),
-		ImVec4(0.9f, 0.8f, 0.4f, 0.01f),
-		ImVec4(1.0f, 0.2f, 0.2f, 1.0f)
 	};
-public:
+
-	std::map<std::string, std::vector<ConsoleLine>> Log;
+	enum class ArgumentType {
-	std::map<std::string, CommandEntry> Commands;
+		TEXT, NUMBER, PLAYER_POS, PLAYER_ROT
-	std::vector<std::string> Autocomplete;
+	};
-	std::vector<std::string> History;
+
-	std::string CMDHint = NULLSTR;
+	struct CommandArgument {
-	char* FilterBuffer = nullptr;
+		std::string info;
-	char* InputBuffer = nullptr;
+		ArgumentType type = ArgumentType::NUMBER;
-	bool OpenAutocomplete = false;
+		bool optional = false;
-	int HistoryIndex = -1;
+	};
-	std::string selected_channel = "Main";
+
-	bool opened = false;
+	struct CommandEntry {
-	void Init();
+		CommandHandler handler;
-	void Update();
+		std::string description;
-	void Draw();
+		std::vector<CommandArgument> arguments;
-	void Append(const std::string& channel, Priority priority, const char* fmt, ...) IM_FMTARGS(4);
+	};
-	void Dispatch(const std::string& line);
+
-	static int CallbackStub(ImGuiInputTextCallbackData* data);
+	struct ConsoleLine {
-};
+		std::string text;
+		Priority priority = Priority::INFO_LVL;
+		std::string channel = "Main";
+	};
+
+	class Console {
+		int selectedId = -1;
+		std::vector<int> selectedEntries;
+		std::string filter;
+		std::string level_filter = NULLSTR;
+		std::vector<std::string> log_channels = { "Main", "SoH Logging" };
+		std::vector<std::string> priority_filters = { "None", "Info", "Log", "Warning", "Error" };
+		std::vector<ImVec4> priority_colors = {
+			ImVec4(1.0f, 1.0f, 1.0f, 1.0f),
+			ImVec4(0.2f, 1.0f, 0.2f, 1.0f),
+			ImVec4(0.9f, 0.8f, 0.4f, 0.01f),
+			ImVec4(1.0f, 0.2f, 0.2f, 1.0f)
+		};
+	public:
+		std::map<std::string, std::vector<ConsoleLine>> Log;
+		std::map<std::string, CommandEntry> Commands;
+		std::vector<std::string> Autocomplete;
+		std::vector<std::string> History;
+		std::string CMDHint = NULLSTR;
+		char* FilterBuffer = nullptr;
+		char* InputBuffer = nullptr;
+		bool OpenAutocomplete = false;
+		int HistoryIndex = -1;
+		std::string selected_channel = "Main";
+		bool opened = false;
+		void Init();
+		void Update();
+		void Draw();
+		void Append(const std::string& channel, Priority priority, const char* fmt, ...) IM_FMTARGS(4);
+		void Dispatch(const std::string& line);
+		static int CallbackStub(ImGuiInputTextCallbackData* data);
+	};
+}

libultraship/libultraship/ControlDeck.cpp

@@ -7,148 +7,170 @@
 #include "SDLController.h"
 #include <Utils/StringHelper.h>
 
-uint8_t* controllerBits;
+namespace Ship {
+    uint8_t* controllerBits;
 
-void Ship::ControlDeck::Init(uint8_t* bits) {
+    void ControlDeck::Init(uint8_t* bits) {
-	ScanPhysicalDevices();
+        ScanPhysicalDevices();
-	controllerBits = bits;
+        controllerBits = bits;
-}
+    }
 
-void Ship::ControlDeck::ScanPhysicalDevices() {
+    void ControlDeck::ScanPhysicalDevices() {
 
-	virtualDevices.clear();
+        virtualDevices.clear();
-	physicalDevices.clear();
+        physicalDevices.clear();
 
-	for (int i = 0; i < SDL_NumJoysticks(); i++) {
+        for (int i = 0; i < SDL_NumJoysticks(); i++) {
-		if (SDL_IsGameController(i)) {
+            if (SDL_IsGameController(i)) {
-			auto sdl = std::make_shared<SDLController>(i);
+                auto sdl = std::make_shared<SDLController>(i);
-			sdl->Open();
+                sdl->Open();
-			physicalDevices.push_back(sdl);
+                physicalDevices.push_back(sdl);
-		}
+            }
-	}
+        }
 
-	physicalDevices.push_back(std::make_shared<VirtualController>("Auto", "Auto", true));
+        physicalDevices.push_back(std::make_shared<VirtualController>("Auto", "Auto", true));
-	physicalDevices.push_back(std::make_shared<KeyboardController>());
+        physicalDevices.push_back(std::make_shared<KeyboardController>());
-	physicalDevices.push_back(std::make_shared<VirtualController>("Disconnected", "None", false));
+        physicalDevices.push_back(std::make_shared<VirtualController>("Disconnected", "None", false));
 
-	for (const auto& device : physicalDevices) {
+        for (const auto& device : physicalDevices) {
-		for (int i = 0; i < MAXCONTROLLERS; i++) {
+            for (int i = 0; i < MAXCONTROLLERS; i++) {
-			device->CreateDefaultBinding(i);
+                device->CreateDefaultBinding(i);
-		}
+            }
-	}
+        }
 
-	for (int i = 0; i < MAXCONTROLLERS; i++) {
+        for (int i = 0; i < MAXCONTROLLERS; i++) {
-		virtualDevices.push_back(i == 0 ? 0 : static_cast<int>(physicalDevices.size()) - 1);
+            virtualDevices.push_back(i == 0 ? 0 : static_cast<int>(physicalDevices.size()) - 1);
-	}
+        }
 
-	LoadControllerSettings();
+        LoadControllerSettings();
-}
+    }
 
-void Ship::ControlDeck::SetPhysicalDevice(int slot, int deviceSlot) {
+    void ControlDeck::SetPhysicalDevice(int slot, int deviceSlot) {
-	const std::shared_ptr<Controller> backend = physicalDevices[deviceSlot];
+        const std::shared_ptr<Controller> backend = physicalDevices[deviceSlot];
-	virtualDevices[slot] = deviceSlot;
+        virtualDevices[slot] = deviceSlot;
-	*controllerBits |= (backend->Connected()) << slot;
+        *controllerBits |= (backend->Connected()) << slot;
-}
+    }
 
-void Ship::ControlDeck::WriteToPad(OSContPad* pad) const {
+    void ControlDeck::WriteToPad(OSContPad* pad) const {
-	for (size_t i = 0; i < virtualDevices.size(); i++) {
+        for (size_t i = 0; i < virtualDevices.size(); i++) {
-		const std::shared_ptr<Controller> backend = physicalDevices[virtualDevices[i]];
+            const std::shared_ptr<Controller> backend = physicalDevices[virtualDevices[i]];
-		if (backend->GetGuid() == "Auto") {
+            if (backend->GetGuid() == "Auto") {
-			for (const auto& device : physicalDevices) {
+                for (const auto& device : physicalDevices) {
-				device->Read(&pad[i], i);
+                    device->Read(&pad[i], i);
-			}
+                }
-			continue;
+                continue;
-		}
+            }
-		backend->Read(&pad[i], i);
+            backend->Read(&pad[i], i);
-	}
+        }
-}
+    }
 
 #define NESTED(key, ...) StringHelper::Sprintf("Controllers.%s.Slot_%d." key, device->GetGuid().c_str(), slot, __VA_ARGS__)
 
-void Ship::ControlDeck::LoadControllerSettings() {
+    void ControlDeck::LoadControllerSettings() {
-	std::shared_ptr<Mercury> Config = GlobalCtx2::GetInstance()->GetConfig();
+        std::shared_ptr<Mercury> Config = GlobalCtx2::GetInstance()->GetConfig();
 
-	for (auto const& val : Config->rjson["Controllers"]["Deck"].items()) {
+        for (auto const& val : Config->rjson["Controllers"]["Deck"].items()) {
-		int slot = std::stoi(val.key().substr(5));
+            int slot = std::stoi(val.key().substr(5));
 
-		for (size_t dev = 0; dev < physicalDevices.size(); dev++) {
+            for (size_t dev = 0; dev < physicalDevices.size(); dev++) {
-			std::string guid = physicalDevices[dev]->GetGuid();
+                std::string guid = physicalDevices[dev]->GetGuid();
-			if(guid != val.value()) continue;
+                if (guid != val.value()) continue;
 
-			virtualDevices[slot] = dev;
+                virtualDevices[slot] = dev;
-		}
+            }
-	}
+        }
 
-	for (size_t i = 0; i < virtualDevices.size(); i++) {
+        for (size_t i = 0; i < virtualDevices.size(); i++) {
-		std::shared_ptr<Controller> backend = physicalDevices[virtualDevices[i]];
+            std::shared_ptr<Controller> backend = physicalDevices[virtualDevices[i]];
-		Config->setString(StringHelper::Sprintf("Controllers.Deck.Slot_%d", (int)i), backend->GetGuid());
+            Config->setString(StringHelper::Sprintf("Controllers.Deck.Slot_%d", (int)i), backend->GetGuid());
-	}
+        }
 
-	for (const auto& device : physicalDevices) {
+        for (const auto& device : physicalDevices) {
 
-		std::string guid = device->GetGuid();
+            std::string guid = device->GetGuid();
 
-		for (int slot = 0; slot < MAXCONTROLLERS; slot++) {
+            for (int slot = 0; slot < MAXCONTROLLERS; slot++) {
 
-			if (!(Config->rjson["Controllers"].contains(guid) && Config->rjson["Controllers"][guid].contains(StringHelper::Sprintf("Slot_%d", slot)))) continue;
+                if (!(Config->rjson["Controllers"].contains(guid) && Config->rjson["Controllers"][guid].contains(StringHelper::Sprintf("Slot_%d", slot)))) continue;
 
-			auto& profile = device->profiles[slot];
+                auto& profile = device->profiles[slot];
-			auto  rawProfile = Config->rjson["Controllers"][guid][StringHelper::Sprintf("Slot_%d", slot)];
+                auto  rawProfile = Config->rjson["Controllers"][guid][StringHelper::Sprintf("Slot_%d", slot)];
 
-			profile.Mappings.clear();
+                profile.Mappings.clear();
-			profile.Thresholds.clear();
+                profile.Thresholds.clear();
-			profile.UseRumble = Config->getBool(NESTED("Rumble.Enabled", ""));
+                profile.UseRumble = Config->getBool(NESTED("Rumble.Enabled", ""));
-			profile.RumbleStrength = Config->getFloat(NESTED("Rumble.Strength", ""));
+                profile.RumbleStrength = Config->getFloat(NESTED("Rumble.Strength", ""));
-			profile.UseGyro = Config->getBool(NESTED("Gyro.Enabled", ""));
+                profile.UseGyro = Config->getBool(NESTED("Gyro.Enabled", ""));
 
-			for (auto const& val : rawProfile["Thresholds"].items()) {
+                for (auto const& val : rawProfile["Thresholds"].items()) {
-				profile.Thresholds[static_cast<ControllerThresholds>(std::stoi(val.key()))] = val.value();
+                    profile.Thresholds[static_cast<ControllerThresholds>(std::stoi(val.key()))] = val.value();
-			}
+                }
 
-			for (auto const& val : rawProfile["Mappings"].items()) {
+                for (auto const& val : rawProfile["Mappings"].items()) {
-				device->SetButtonMapping(slot, std::stoi(val.key().substr(4)), val.value());
+                    device->SetButtonMapping(slot, std::stoi(val.key().substr(4)), val.value());
-			}
+                }
-		}
+            }
-	}
+        }
-}
+    }
 
-void Ship::ControlDeck::SaveControllerSettings() {
+    void ControlDeck::SaveControllerSettings() {
-	std::shared_ptr<Mercury> Config = GlobalCtx2::GetInstance()->GetConfig();
+        std::shared_ptr<Mercury> Config = GlobalCtx2::GetInstance()->GetConfig();
 
-	for (size_t i = 0; i < virtualDevices.size(); i++) {
+        for (size_t i = 0; i < virtualDevices.size(); i++) {
-		std::shared_ptr<Controller> backend = physicalDevices[virtualDevices[i]];
+            std::shared_ptr<Controller> backend = physicalDevices[virtualDevices[i]];
-		Config->setString(StringHelper::Sprintf("Controllers.Deck.Slot_%d", (int)i), backend->GetGuid());
+            Config->setString(StringHelper::Sprintf("Controllers.Deck.Slot_%d", (int)i), backend->GetGuid());
-	}
+        }
 
-	for (const auto& device : physicalDevices) {
+        for (const auto& device : physicalDevices) {
 
-		int slot = 0;
+            int slot = 0;
-		std::string guid = device->GetGuid();
+            std::string guid = device->GetGuid();
 
-		for (const auto& profile : device->profiles) {
+            for (const auto& profile : device->profiles) {
 
-			if (!device->Connected()) continue;
+                if (!device->Connected()) continue;
 
-			auto  rawProfile = Config->rjson["Controllers"][guid][StringHelper::Sprintf("Slot_%d", slot)];
+                auto  rawProfile = Config->rjson["Controllers"][guid][StringHelper::Sprintf("Slot_%d", slot)];
-			Config->setBool(NESTED("Rumble.Enabled", ""), profile.UseRumble);
+                Config->setBool(NESTED("Rumble.Enabled", ""), profile.UseRumble);
-			Config->setFloat(NESTED("Rumble.Strength", ""), profile.RumbleStrength);
+                Config->setFloat(NESTED("Rumble.Strength", ""), profile.RumbleStrength);
-			Config->setBool(NESTED("Gyro.Enabled", ""), profile.UseGyro);
+                Config->setBool(NESTED("Gyro.Enabled", ""), profile.UseGyro);
 
-			for (auto const& val : rawProfile["Mappings"].items()) {
+                for (auto const& val : rawProfile["Mappings"].items()) {
-				Config->setInt(NESTED("Mappings.%s", val.key().c_str()), -1);
+                    Config->setInt(NESTED("Mappings.%s", val.key().c_str()), -1);
-			}
+                }
 
-			for (auto const& [key, val] : profile.Thresholds) {
+                for (auto const& [key, val] : profile.Thresholds) {
-				Config->setFloat(NESTED("Thresholds.%d", key), val);
+                    Config->setFloat(NESTED("Thresholds.%d", key), val);
-			}
+                }
 
-			for (auto const& [key, val] : profile.Mappings) {
+                for (auto const& [key, val] : profile.Mappings) {
-				Config->setInt(NESTED("Mappings.BTN_%d", val), key);
+                    Config->setInt(NESTED("Mappings.BTN_%d", val), key);
-			}
+                }
 
-			slot++;
+                slot++;
-		}
+            }
-	}
+        }
 
-	Config->save();
+        Config->save();
-}
+    }
+
+    std::shared_ptr<Controller> ControlDeck::GetPhysicalDevice(int deviceSlot) {
+        return physicalDevices[deviceSlot];
+    }
+
+    size_t ControlDeck::GetNumPhysicalDevices() {
+        return physicalDevices.size();
+    }
+
+    int ControlDeck::GetVirtualDevice(int slot) {
+        return virtualDevices[slot];
+    }
+
+    size_t ControlDeck::GetNumVirtualDevices() {
+        return virtualDevices.size();
+    }
+
+    std::shared_ptr<Controller> ControlDeck::GetPhysicalDeviceFromVirtualSlot(int slot) {
+        return GetPhysicalDevice(GetVirtualDevice(slot));
+    }
+}

libultraship/libultraship/ControlDeck.h

@@ -2,19 +2,24 @@
 
 #include "Controller.h"
 #include <vector>
-#include <string>
 
 namespace Ship {
 
 	class ControlDeck {
 	public:
-		std::vector<int> virtualDevices;
-		std::vector<std::shared_ptr<Controller>> physicalDevices = {};
 		void Init(uint8_t* controllerBits);
 		void ScanPhysicalDevices();
 		void WriteToPad(OSContPad* pad) const;
 		void LoadControllerSettings();
 		void SaveControllerSettings();
 		void SetPhysicalDevice(int slot, int deviceSlot);
+		std::shared_ptr<Ship::Controller> GetPhysicalDevice(int deviceSlot);
+		std::shared_ptr<Ship::Controller> GetPhysicalDeviceFromVirtualSlot(int slot);
+		size_t GetNumPhysicalDevices();
+		int GetVirtualDevice(int slot);
+		size_t GetNumVirtualDevices();
+	private:
+		std::vector<int> virtualDevices;
+		std::vector<std::shared_ptr<Controller>> physicalDevices = {};
 	};
 }

libultraship/libultraship/Cvar.cpp

@@ -1,11 +1,11 @@
 #include "Cvar.h"
 #include <map>
-#include <string>
+#include <string.h>
 #include <functional>
 #include <memory>
 #include <utility>
-#include <PR/ultra64/gbi.h>
+#include <Utils/File.h>
-#include "imgui_internal.h"
+#include "GlobalCtx2.h"
 
 std::map<std::string, std::unique_ptr<CVar>, std::less<>> cvars;
 
@@ -96,7 +96,7 @@ extern "C" void CVar_SetS32(const char* name, int32_t value) {
     cvar->value.valueS32 = value;
 }
 
-void CVar_SetFloat(const char* name, float value) {
+extern "C" void CVar_SetFloat(const char* name, float value) {
     auto& cvar = cvars[name];
     if (!cvar) {
         cvar = std::make_unique<CVar>();
@@ -111,7 +111,11 @@ extern "C" void CVar_SetString(const char* name, const char* value) {
         cvar = std::make_unique<CVar>();
     }
     cvar->type = CVarType::String;
-    cvar->value.valueStr = ImStrdup(value);
+#ifdef _MSC_VER
+    cvar->value.valueStr = _strdup(value);
+#else
+    cvar->value.valueStr = strdup(value);
+#endif
 }
 
 extern "C" void CVar_RegisterRGBA(const char* name, Color_RGBA8 defaultValue) {
@@ -133,3 +137,126 @@ extern "C" void CVar_RegisterString(const char* name, const char* defaultValue)
     if (!CVar_Get(name))
         CVar_SetString(name, defaultValue);
 }
+
+template <typename Numeric> bool is_number(const std::string& s) {
+    Numeric n;
+    return ((std::istringstream(s) >> n >> std::ws).eof());
+}
+
+void CVar_LoadLegacy() {
+    auto cvarsConfig = Ship::GlobalCtx2::GetPathRelativeToAppDirectory("cvars.cfg");
+    if (File::Exists(cvarsConfig)) {
+        const auto lines = File::ReadAllLines(cvarsConfig);
+
+        for (const std::string& line : lines) {
+            std::vector<std::string> cfg = StringHelper::Split(line, " = ");
+            if (line.empty()) continue;
+            if (cfg.size() < 2) continue;
+
+            if (cfg[1].find("\"") == std::string::npos && (cfg[1].find("#") != std::string::npos))
+            {
+                std::string value(cfg[1]);
+                value.erase(std::remove_if(value.begin(), value.end(), [](char c) { return c == '#'; }), value.end());
+                auto splitTest = StringHelper::Split(value, "\r")[0];
+
+                uint32_t val = std::stoul(splitTest, nullptr, 16);
+                Color_RGBA8 clr;
+                clr.r = val >> 24;
+                clr.g = val >> 16;
+                clr.b = val >> 8;
+                clr.a = val & 0xFF;
+                CVar_SetRGBA(cfg[0].c_str(), clr);
+            }
+
+            if (cfg[1].find("\"") != std::string::npos) {
+                std::string value(cfg[1]);
+                value.erase(std::remove(value.begin(), value.end(), '\"'), value.end());
+#ifdef _MSC_VER
+                CVar_SetString(cfg[0].c_str(), _strdup(value.c_str()));
+#else
+                CVar_SetString(cfg[0].c_str(), strdup(value.c_str()));
+#endif
+            }
+            if (is_number<float>(cfg[1])) {
+                CVar_SetFloat(cfg[0].c_str(), std::stof(cfg[1]));
+            }
+            if (is_number<int>(cfg[1])) {
+                CVar_SetS32(cfg[0].c_str(), std::stoi(cfg[1]));
+            }
+        }
+
+        fs::remove(cvarsConfig);
+    }
+}
+
+
+extern "C" void CVar_Load() {
+    std::shared_ptr<Mercury> pConf = Ship::GlobalCtx2::GetInstance()->GetConfig();
+    pConf->reload();
+
+    for (const auto& item : pConf->rjson["CVars"].items()) {
+        auto value = item.value();
+        switch (value.type()) {
+        case nlohmann::detail::value_t::array:
+            break;
+        case nlohmann::detail::value_t::object:
+            if (value["Type"].get<std::string>() == mercuryRGBAObjectType) {
+                Color_RGBA8 clr;
+                clr.r = value["R"].get<uint8_t>();
+                clr.g = value["G"].get<uint8_t>();
+                clr.b = value["B"].get<uint8_t>();
+                clr.a = value["A"].get<uint8_t>();
+                CVar_SetRGBA(item.key().c_str(), clr);
+            }
+
+            break;
+        case nlohmann::detail::value_t::string:
+            CVar_SetString(item.key().c_str(), value.get<std::string>().c_str());
+            break;
+        case nlohmann::detail::value_t::boolean:
+            CVar_SetS32(item.key().c_str(), value.get<bool>());
+            break;
+        case nlohmann::detail::value_t::number_unsigned:
+        case nlohmann::detail::value_t::number_integer:
+            CVar_SetS32(item.key().c_str(), value.get<int>());
+            break;
+        case nlohmann::detail::value_t::number_float:
+            CVar_SetFloat(item.key().c_str(), value.get<float>());
+            break;
+        default:;
+        }
+        if (item.key() == "gOpenMenuBar") {
+            int bp = 0;
+        }
+    }
+
+    CVar_LoadLegacy();
+}
+
+extern "C" void CVar_Save()
+{
+    std::shared_ptr<Mercury> pConf = Ship::GlobalCtx2::GetInstance()->GetConfig();
+
+    for (const auto& cvar : cvars) {
+        const std::string key = StringHelper::Sprintf("CVars.%s", cvar.first.c_str());
+
+        if (cvar.second->type == CVarType::String && cvar.second->value.valueStr != nullptr)
+            pConf->setString(key, std::string(cvar.second->value.valueStr));
+        else if (cvar.second->type == CVarType::S32)
+            pConf->setInt(key, cvar.second->value.valueS32);
+        else if (cvar.second->type == CVarType::Float)
+            pConf->setFloat(key, cvar.second->value.valueFloat);
+        else if (cvar.second->type == CVarType::RGBA)
+        {
+            auto keyStr = key.c_str();
+            Color_RGBA8 clr = cvar.second->value.valueRGBA;
+            pConf->setUInt(StringHelper::Sprintf("%s.R", keyStr), clr.r);
+            pConf->setUInt(StringHelper::Sprintf("%s.G", keyStr), clr.r);
+            pConf->setUInt(StringHelper::Sprintf("%s.B", keyStr), clr.r);
+            pConf->setUInt(StringHelper::Sprintf("%s.A", keyStr), clr.r);
+            pConf->setString(StringHelper::Sprintf("%s.Type", keyStr), mercuryRGBAObjectType);
+        }
+    }
+
+    pConf->save();
+}

libultraship/libultraship/Cvar.h

@@ -32,22 +32,24 @@ extern "C" CVar * CVar_Get(const char* name);
 extern "C"
 {
 #endif
-//#include <ultra64.h>
 
-int32_t CVar_GetS32(const char* name, int32_t defaultValue);
+    float CVar_GetFloat(const char* name, float defaultValue);
-float CVar_GetFloat(const char* name, float defaultValue);
+    void CVar_SetFloat(const char* name, float value);
-const char* CVar_GetString(const char* name, const char* defaultValue);
+	int32_t CVar_GetS32(const char* name, int32_t defaultValue);
-void CVar_SetS32(const char* name, int32_t value);
+	void CVar_SetS32(const char* name, int32_t value);
-void CVar_SetString(const char* name, const char* value);
+	const char* CVar_GetString(const char* name, const char* defaultValue);
+	void CVar_SetString(const char* name, const char* value);
+	Color_RGB8 CVar_GetRGB(const char* name, Color_RGB8 defaultValue);
+	Color_RGBA8 CVar_GetRGBA(const char* name, Color_RGBA8 defaultValue);
+	void CVar_SetRGBA(const char* name, Color_RGBA8 value);
 
-Color_RGB8 CVar_GetRGB(const char* name, Color_RGB8 defaultValue);
+	void CVar_RegisterS32(const char* name, int32_t defaultValue);
-Color_RGBA8 CVar_GetRGBA(const char* name, Color_RGBA8 defaultValue);
+	void CVar_RegisterFloat(const char* name, float defaultValue);
-void CVar_SetRGBA(const char* name, Color_RGBA8 value);
+	void CVar_RegisterString(const char* name, const char* defaultValue);
+	void CVar_RegisterRGBA(const char* name, Color_RGBA8 defaultValue);
 
-void CVar_RegisterS32(const char* name, int32_t defaultValue);
+	void CVar_Load();
-void CVar_RegisterFloat(const char* name, float defaultValue);
+	void CVar_Save();
-void CVar_RegisterString(const char* name, const char* defaultValue);
-void CVar_RegisterRGBA(const char* name, Color_RGBA8 defaultValue);
 
 #ifdef __cplusplus
 };
@@ -56,11 +58,8 @@ void CVar_RegisterRGBA(const char* name, Color_RGBA8 defaultValue);
 #ifdef __cplusplus
 #include <map>
 #include <string>
-#include <functional>
 #include <memory>
 
-//extern "C" CVar * CVar_Get(const char* name);
 extern std::map<std::string, std::unique_ptr<CVar>, std::less<>> cvars;
-void CVar_SetFloat(const char* name, float value);
 #endif
 #endif

libultraship/libultraship/Environment.cpp

@@ -1,16 +0,0 @@
-#include "Environment.h"
-
-#include <map>
-#include <string>
-
-std::map<std::string, std::string> environmentVars;
-
-namespace SohUtils {
-    void saveEnvironmentVar(const std::string& key, const std::string& value) {
-        environmentVars[key] = value;
-    }
-
-    std::string getEnvironmentVar(const std::string& key) {
-        return environmentVars[key];
-    }
-}

libultraship/libultraship/Environment.h

@@ -1,8 +0,0 @@
-#pragma once
-
-#include <string>
-
-namespace SohUtils {
-    void saveEnvironmentVar(const std::string& key, const std::string& value);
-    std::string getEnvironmentVar(const std::string& key);
-}

libultraship/libultraship/GameOverlay.cpp

@@ -6,223 +6,229 @@
 #include "ResourceMgr.h"
 #include "Console.h"
 #include "ImGuiImpl.h"
-#include "TextureMod.h"
 #include "Lib/ImGui/imgui_internal.h"
 #include "Utils/StringHelper.h"
 
-void Ship::GameOverlay::LoadFont(const std::string& name, const std::string& path, float fontSize) {
+namespace Ship {
-	ImGuiIO& io = ImGui::GetIO();
+	void GameOverlay::LoadFont(const std::string& name, const std::string& path, float fontSize) {
-	std::shared_ptr<Archive> base = GlobalCtx2::GetInstance()->GetResourceManager()->GetArchive();
+		ImGuiIO& io = ImGui::GetIO();
-	std::shared_ptr<File> font = std::make_shared<File>();
+		std::shared_ptr<Archive> base = GlobalCtx2::GetInstance()->GetResourceManager()->GetArchive();
-	base->LoadFile(path, false, font);
+		std::shared_ptr<File> font = std::make_shared<File>();
-	if (font->bIsLoaded) {
+		base->LoadFile(path, false, font);
-		char* font_data = new char[font->dwBufferSize];
+		if (font->bIsLoaded) {
-		memcpy(font_data, font->buffer.get(), font->dwBufferSize);
+			char* font_data = new char[font->dwBufferSize];
-		Fonts[name] = io.Fonts->AddFontFromMemoryTTF(font_data, font->dwBufferSize, fontSize);
+			memcpy(font_data, font->buffer.get(), font->dwBufferSize);
+			Fonts[name] = io.Fonts->AddFontFromMemoryTTF(font_data, font->dwBufferSize, fontSize);
+		}
 	}
-}
 
-void Ship::GameOverlay::TextDraw(float x, float y, bool shadow, ImVec4 color, const char* fmt, ...) {
+	void GameOverlay::TextDraw(float x, float y, bool shadow, ImVec4 color, const char* fmt, ...) {
-	char buf[1024];
+		char buf[1024];
-	va_list args;
+		va_list args;
-	va_start(args, fmt);
+		va_start(args, fmt);
-	vsnprintf(buf, IM_ARRAYSIZE(buf), fmt, args);
+		vsnprintf(buf, IM_ARRAYSIZE(buf), fmt, args);
-	buf[IM_ARRAYSIZE(buf) - 1] = 0;
+		buf[IM_ARRAYSIZE(buf) - 1] = 0;
-	va_end(args);
+		va_end(args);
 
-	ImGui::PushStyleColor(ImGuiCol_Text, color);
+		ImGui::PushStyleColor(ImGuiCol_Text, color);
-	ImGui::PushFont(Fonts[this->CurrentFont]);
+		ImGui::PushFont(Fonts[this->CurrentFont]);
-	if (shadow) {
+		if (shadow) {
-		ImGui::SetCursorPos(ImVec2(x + 1, y + 1));
+			ImGui::SetCursorPos(ImVec2(x + 1, y + 1));
-		ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(.0f, .0f, .0f, color.w));
+			ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(.0f, .0f, .0f, color.w));
+			ImGui::Text(buf, args);
+		}
+		ImGui::PopStyleColor();
+		ImGui::SetCursorPos(ImVec2(x, y));
 		ImGui::Text(buf, args);
+		ImGui::PopFont();
+		ImGui::PopStyleColor();
 	}
-	ImGui::PopStyleColor();
-	ImGui::SetCursorPos(ImVec2(x, y));
-	ImGui::Text(buf, args);
-	ImGui::PopFont();
-	ImGui::PopStyleColor();
-}
 
-void Ship::GameOverlay::TextDrawNotification(float duration, bool shadow, const char* fmt, ...) {
+	void GameOverlay::TextDrawNotification(float duration, bool shadow, const char* fmt, ...) {
-	char buf[1024];
+		char buf[1024];
-	va_list args;
+		va_list args;
-	va_start(args, fmt);
+		va_start(args, fmt);
-	vsnprintf(buf, IM_ARRAYSIZE(buf), fmt, args);
+		vsnprintf(buf, IM_ARRAYSIZE(buf), fmt, args);
-	buf[IM_ARRAYSIZE(buf) - 1] = 0;
+		buf[IM_ARRAYSIZE(buf) - 1] = 0;
-	va_end(args);
+		va_end(args);
-	this->RegisteredOverlays[StringHelper::Sprintf("NotificationID:%d%d", rand(), this->RegisteredOverlays.size())] = new Overlay({ OverlayType::NOTIFICATION, ImStrdup(buf), duration, duration });
+		this->RegisteredOverlays[StringHelper::Sprintf("NotificationID:%d%d", rand(), this->RegisteredOverlays.size())] = new Overlay({ OverlayType::NOTIFICATION, ImStrdup(buf), duration, duration });
-	NeedsCleanup = true;
+		NeedsCleanup = true;
-}
-
-void Ship::GameOverlay::CleanupNotifications() {
-	if(!NeedsCleanup) return;
-	for (auto it = this->RegisteredOverlays.begin(); it != this->RegisteredOverlays.end(); ) {
-		if (it->second->type == OverlayType::NOTIFICATION && it->second->duration <= 0.0f) {
-			it = this->RegisteredOverlays.erase(it);
-		} else {
-			++it;
-		}
 	}
-	NeedsCleanup = false;
-}
 
-float Ship::GameOverlay::GetScreenWidth() {
+	void GameOverlay::CleanupNotifications() {
-	const ImGuiViewport* viewport = ImGui::GetMainViewport();
+		if (!NeedsCleanup) return;
-	return viewport->Size.x;
+		for (auto it = this->RegisteredOverlays.begin(); it != this->RegisteredOverlays.end(); ) {
-}
+			if (it->second->type == OverlayType::NOTIFICATION && it->second->duration <= 0.0f) {
-
+				it = this->RegisteredOverlays.erase(it);
-float Ship::GameOverlay::GetScreenHeight() {
-	const ImGuiViewport* viewport = ImGui::GetMainViewport();
-	return viewport->Size.y;
-}
-
-float Ship::GameOverlay::GetStringWidth(const char* text) {
-	return CalculateTextSize(text).x;
-}
-
-ImVec2 Ship::GameOverlay::CalculateTextSize(const char* text, const char* text_end, bool hide_text_after_double_hash, float wrap_width) {
-	ImGuiContext& g = *GImGui;
-
-	const char* text_display_end;
-	if (hide_text_after_double_hash)
-		text_display_end = ImGui::FindRenderedTextEnd(text, text_end);      // Hide anything after a '##' string
-	else
-		text_display_end = text_end;
-
-	GameOverlay* overlay = SohImGui::overlay;
-
-	ImFont* font = overlay->CurrentFont == "Default" ? g.Font : overlay->Fonts[overlay->CurrentFont];
-	const float font_size = font->FontSize;
-	if (text == text_display_end)
-		return ImVec2(0.0f, font_size);
-	ImVec2 text_size = font->CalcTextSizeA(font_size, FLT_MAX, wrap_width, text, text_display_end, NULL);
-
-	// Round
-	// FIXME: This has been here since Dec 2015 (7b0bf230) but down the line we want this out.
-	// FIXME: Investigate using ceilf or e.g.
-	// - https://git.musl-libc.org/cgit/musl/tree/src/math/ceilf.c
-	// - https://embarkstudios.github.io/rust-gpu/api/src/libm/math/ceilf.rs.html
-	text_size.x = IM_FLOOR(text_size.x + 0.99999f);
-
-	return text_size;
-}
-
-void Ship::GameOverlay::Init() {
-	this->LoadFont("Press Start 2P", "assets/ship_of_harkinian/fonts/PressStart2P-Regular.ttf", 12.0f);
-	this->LoadFont("Fipps", "assets/ship_of_harkinian/fonts/Fipps-Regular.otf", 32.0f);
-	const std::string DefaultFont = this->Fonts.begin()->first;
-	if(!this->Fonts.empty()) {
-		const std::string font = CVar_GetString("gOverlayFont", ImStrdup(DefaultFont.c_str()));
-		for (auto& [name, _] : this->Fonts) {
-			if (font.starts_with(name)) {
-				this->CurrentFont = name;
-				break;
 			}
-			this->CurrentFont = DefaultFont;
+			else {
-		}
+				++it;
-	}
-	SohImGui::console->Commands["overlay"] = { OverlayCommand, "Draw an overlay using a cvar value" };
-}
-
-void Ship::GameOverlay::DrawSettings() {
-	ImGui::Text("Overlays Text Font");
-	if (ImGui::BeginCombo("##TextFont", this->CurrentFont.c_str())) {
-		for (auto& [name, font] : this->Fonts) {
-			if (ImGui::Selectable(name.c_str(), name == this->CurrentFont)) {
-				this->CurrentFont = name;
-				CVar_SetString("gOverlayFont", ImStrdup(name.c_str()));
-				SohImGui::needs_save = true;
 			}
-
-		}
-		ImGui::EndCombo();
-	}
-}
-
-
-void Ship::GameOverlay::Draw() {
-	const ImGuiViewport* viewport = ImGui::GetMainViewport();
-
-	ImGui::SetNextWindowPos(viewport->Pos, ImGuiCond_Always);
-	ImGui::SetNextWindowSize(viewport->Size, ImGuiCond_Always);
-	ImGui::Begin("SoHOverlay", nullptr, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoBackground |
-		ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoInputs);
-
-	this->CleanupNotifications();
-
-	float textY = 50;
-	float notY = 0;
-
-	for (auto &[key, overlay] : this->RegisteredOverlays) {
-
-		if (overlay->type == OverlayType::TEXT) {
-			const char* text = ImStrdup(overlay->value);
-			const CVar* var = CVar_Get(text);
-			ImVec4 color = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
-
-			switch (var->type) {
-			case CVarType::Float:
-				this->TextDraw(30, textY, true, color, "%s %.2f", text, var->value.valueFloat);
-				break;
-			case CVarType::S32:
-				this->TextDraw(30, textY, true, color, "%s %d", text, var->value.valueS32);
-				break;
-			case CVarType::String:
-				this->TextDraw(30, textY, true, color, "%s %s", text, var->value.valueStr);
-				break;
-			case CVarType::RGBA:
-				this->TextDraw(30, textY, true, color, "#%08X", text, var->value.valueRGBA);
-				break;
-			}
-
-			free((void*) text);
-			textY += 30;
-		}
-
-		if (overlay->type == OverlayType::NOTIFICATION && overlay->duration > 0) {
-			const char* text = overlay->value;
-			const float duration = overlay->duration / overlay->fadeTime;
-
-			const ImVec4 color = ImVec4(1.0f, 1.0f, 1.0f, duration);
-			const float textWidth = this->GetStringWidth(overlay->value);
-
-			this->TextDraw(GetScreenWidth() - textWidth - 40, GetScreenHeight() - 40 - notY, true, color, text);
-			notY += 30;
-			overlay->duration -= .05f;
 		}
+		NeedsCleanup = false;
 	}
 
-	ImGui::End();
+	float GameOverlay::GetScreenWidth() {
-}
+		const ImGuiViewport* viewport = ImGui::GetMainViewport();
-
+		return viewport->Size.x;
-
-bool Ship::OverlayCommand(const std::vector<std::string>& args) {
-	if (args.size() < 3) {
-		return CMD_FAILED;
 	}
 
-	if (CVar_Get(args[2].c_str()) != nullptr) {
+	float GameOverlay::GetScreenHeight() {
-		const char* key = args[2].c_str();
+		const ImGuiViewport* viewport = ImGui::GetMainViewport();
+		return viewport->Size.y;
+	}
+
+	float GameOverlay::GetStringWidth(const char* text) {
+		return CalculateTextSize(text).x;
+	}
+
+	ImVec2 GameOverlay::CalculateTextSize(const char* text, const char* text_end, bool hide_text_after_double_hash, float wrap_width) {
+		ImGuiContext& g = *GImGui;
+
+		const char* text_display_end;
+		if (hide_text_after_double_hash)
+			text_display_end = ImGui::FindRenderedTextEnd(text, text_end);      // Hide anything after a '##' string
+		else
+			text_display_end = text_end;
+
 		GameOverlay* overlay = SohImGui::overlay;
-		if (args[1] == "add") {
+
-			if (!overlay->RegisteredOverlays.contains(key)) {
+		ImFont* font = overlay->CurrentFont == "Default" ? g.Font : overlay->Fonts[overlay->CurrentFont];
-				overlay->RegisteredOverlays[key] = new Overlay({ OverlayType::TEXT, ImStrdup(key), -1.0f });
+		const float font_size = font->FontSize;
-				INFO("Added overlay: %s ", key);
+		if (text == text_display_end)
-			} else {
+			return ImVec2(0.0f, font_size);
-				ERROR("Overlay already exists: %s", key);
+		ImVec2 text_size = font->CalcTextSizeA(font_size, FLT_MAX, wrap_width, text, text_display_end, NULL);
-			}
+
-		} else if (args[1] == "remove") {
+		// Round
-			if (overlay->RegisteredOverlays.contains(key)) {
+		// FIXME: This has been here since Dec 2015 (7b0bf230) but down the line we want this out.
-				overlay->RegisteredOverlays.erase(key);
+		// FIXME: Investigate using ceilf or e.g.
-				INFO("Removed overlay: %s ", key);
+		// - https://git.musl-libc.org/cgit/musl/tree/src/math/ceilf.c
-			} else {
+		// - https://embarkstudios.github.io/rust-gpu/api/src/libm/math/ceilf.rs.html
-				ERROR("Overlay not found: %s ", key);
+		text_size.x = IM_FLOOR(text_size.x + 0.99999f);
-			}
+
-		}
+		return text_size;
-	} else {
-		ERROR("CVar %s does not exist", args[2].c_str());
 	}
 
-	return CMD_SUCCESS;
+	void GameOverlay::Init() {
-}
+		this->LoadFont("Press Start 2P", "assets/ship_of_harkinian/fonts/PressStart2P-Regular.ttf", 12.0f);
+		this->LoadFont("Fipps", "assets/ship_of_harkinian/fonts/Fipps-Regular.otf", 32.0f);
+		const std::string DefaultFont = this->Fonts.begin()->first;
+		if (!this->Fonts.empty()) {
+			const std::string font = CVar_GetString("gOverlayFont", ImStrdup(DefaultFont.c_str()));
+			for (auto& [name, _] : this->Fonts) {
+				if (font.starts_with(name)) {
+					this->CurrentFont = name;
+					break;
+				}
+				this->CurrentFont = DefaultFont;
+			}
+		}
+		SohImGui::console->Commands["overlay"] = { OverlayCommand, "Draw an overlay using a cvar value" };
+	}
+
+	void GameOverlay::DrawSettings() {
+		ImGui::Text("Overlays Text Font");
+		if (ImGui::BeginCombo("##TextFont", this->CurrentFont.c_str())) {
+			for (auto& [name, font] : this->Fonts) {
+				if (ImGui::Selectable(name.c_str(), name == this->CurrentFont)) {
+					this->CurrentFont = name;
+					CVar_SetString("gOverlayFont", ImStrdup(name.c_str()));
+					SohImGui::needs_save = true;
+				}
+
+			}
+			ImGui::EndCombo();
+		}
+	}
+
+
+	void GameOverlay::Draw() {
+		const ImGuiViewport* viewport = ImGui::GetMainViewport();
+
+		ImGui::SetNextWindowPos(viewport->Pos, ImGuiCond_Always);
+		ImGui::SetNextWindowSize(viewport->Size, ImGuiCond_Always);
+		ImGui::Begin("SoHOverlay", nullptr, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoBackground |
+			ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoInputs);
+
+		this->CleanupNotifications();
+
+		float textY = 50;
+		float notY = 0;
+
+		for (auto& [key, overlay] : this->RegisteredOverlays) {
+
+			if (overlay->type == OverlayType::TEXT) {
+				const char* text = ImStrdup(overlay->value);
+				const CVar* var = CVar_Get(text);
+				ImVec4 color = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
+
+				switch (var->type) {
+				case CVarType::Float:
+					this->TextDraw(30, textY, true, color, "%s %.2f", text, var->value.valueFloat);
+					break;
+				case CVarType::S32:
+					this->TextDraw(30, textY, true, color, "%s %d", text, var->value.valueS32);
+					break;
+				case CVarType::String:
+					this->TextDraw(30, textY, true, color, "%s %s", text, var->value.valueStr);
+					break;
+				case CVarType::RGBA:
+					this->TextDraw(30, textY, true, color, "#%08X", text, var->value.valueRGBA);
+					break;
+				}
+
+				free((void*)text);
+				textY += 30;
+			}
+
+			if (overlay->type == OverlayType::NOTIFICATION && overlay->duration > 0) {
+				const char* text = overlay->value;
+				const float duration = overlay->duration / overlay->fadeTime;
+
+				const ImVec4 color = ImVec4(1.0f, 1.0f, 1.0f, duration);
+				const float textWidth = this->GetStringWidth(overlay->value);
+
+				this->TextDraw(GetScreenWidth() - textWidth - 40, GetScreenHeight() - 40 - notY, true, color, text);
+				notY += 30;
+				overlay->duration -= .05f;
+			}
+		}
+
+		ImGui::End();
+	}
+
+
+	bool OverlayCommand(const std::vector<std::string>& args) {
+		if (args.size() < 3) {
+			return CMD_FAILED;
+		}
+
+		if (CVar_Get(args[2].c_str()) != nullptr) {
+			const char* key = args[2].c_str();
+			GameOverlay* overlay = SohImGui::overlay;
+			if (args[1] == "add") {
+				if (!overlay->RegisteredOverlays.contains(key)) {
+					overlay->RegisteredOverlays[key] = new Overlay({ OverlayType::TEXT, ImStrdup(key), -1.0f });
+					INFO("Added overlay: %s ", key);
+				}
+				else {
+					ERROR("Overlay already exists: %s", key);
+				}
+			}
+			else if (args[1] == "remove") {
+				if (overlay->RegisteredOverlays.contains(key)) {
+					overlay->RegisteredOverlays.erase(key);
+					INFO("Removed overlay: %s ", key);
+				}
+				else {
+					ERROR("Overlay not found: %s ", key);
+				}
+			}
+		}
+		else {
+			ERROR("CVar %s does not exist", args[2].c_str());
+		}
+
+		return CMD_SUCCESS;
+	}
+}

libultraship/libultraship/GameOverlay.h

@@ -3,21 +3,21 @@
 #include <vector>
 
 #include "Lib/ImGui/imgui.h"
-#include <map>
 #include <unordered_map>
 
-enum class OverlayType {
-	TEXT, IMAGE, NOTIFICATION
-};
-
-struct Overlay {
-	OverlayType type;
-	const char* value;
-	float fadeTime;
-	float duration;
-};
-
 namespace Ship {
+
+	enum class OverlayType {
+		TEXT, IMAGE, NOTIFICATION
+	};
+
+	struct Overlay {
+		OverlayType type;
+		const char* value;
+		float fadeTime;
+		float duration;
+	};
+
 	class GameOverlay {
 	public:
 		std::unordered_map<std::string, Overlay*> RegisteredOverlays;

libultraship/libultraship/GameSettings.cpp

@@ -1,56 +0,0 @@
-#include "GameSettings.h"
-
-// Audio
-#include <cstddef>
-#include <PR/ultra64/types.h>
-#include <PR/ultra64/sptask.h>
-#include <PR/ultra64/pi.h>
-#include <PR/ultra64/message.h>
-
-#include "Cvar.h"
-#include "GlobalCtx2.h"
-#include "ImGuiImpl.h"
-#include "../../soh/include/z64audio.h"
-#include "Hooks.h"
-#include "../../soh/soh/Enhancements/debugconsole.h"
-
-#include "Window.h"
-#include "Lib/Fast3D/gfx_rendering_api.h"
-
-#define ABS(var) var < 0 ? -(var) : var
-
-using namespace Ship;
-
-namespace Game {
-
-    bool DeSyncAudio = false;
-
-    void UpdateAudio() {
-        Audio_SetGameVolume(SEQ_BGM_MAIN, CVar_GetFloat("gMainMusicVolume", 1));
-        Audio_SetGameVolume(SEQ_BGM_SUB, CVar_GetFloat("gSubMusicVolume", 1));
-        Audio_SetGameVolume(SEQ_FANFARE, CVar_GetFloat("gSFXMusicVolume", 1));
-        Audio_SetGameVolume(SEQ_SFX, CVar_GetFloat("gFanfareVolume", 1));
-    }
-
-    void LoadSettings() {
-        DebugConsole_LoadCVars();
-    }
-
-    void SaveSettings() {
-        DebugConsole_SaveCVars();
-    }
-
-    void InitSettings() {
-        ModInternal::RegisterHook<ModInternal::AudioInit>(UpdateAudio);
-        ModInternal::RegisterHook<ModInternal::GfxInit>([] {
-            gfx_get_current_rendering_api()->set_texture_filter((FilteringMode) CVar_GetS32("gTextureFilter", FILTER_THREE_POINT));
-            SohImGui::console->opened = CVar_GetS32("gConsoleEnabled", 0);
-            SohImGui::controller->Opened = CVar_GetS32("gControllerConfigurationEnabled", 0);
-            UpdateAudio();
-        });
-    }
-
-    void SetSeqPlayerVolume(SeqPlayers playerId, float volume) {
-        Audio_SetGameVolume(playerId, volume);
-    }
-}

libultraship/libultraship/GameSettings.h

@@ -1,17 +0,0 @@
-#pragma once
-
-enum SeqPlayers {
-    /* 0 */ SEQ_BGM_MAIN,
-    /* 1 */ SEQ_FANFARE,
-    /* 2 */ SEQ_SFX,
-    /* 3 */ SEQ_BGM_SUB,
-    /* 4 */ SEQ_MAX
- };
-
-namespace Game {
-    void InitSettings();
-    void LoadSettings();
-    void LoadPadSettings();
-    void SaveSettings();
-    void SetSeqPlayerVolume(SeqPlayers playerId, float volume);
-}

libultraship/libultraship/GlobalCtx2.cpp

@@ -7,7 +7,6 @@
 #include "spdlog/sinks/rotating_file_sink.h"
 #include "spdlog/sinks/stdout_color_sinks.h"
 #include "spdlog/sinks/sohconsole_sink.h"
-#include "ModManager.h"
 #ifdef __APPLE__
 #include "OSXFolderManager.h"
 #elif defined(__SWITCH__)
@@ -16,7 +15,6 @@
 
 namespace Ship {
     std::weak_ptr<GlobalCtx2> GlobalCtx2::Context;
-    ModManager* INSTANCE;
     std::shared_ptr<GlobalCtx2> GlobalCtx2::GetInstance() {
         return Context.lock();
     }
@@ -56,7 +54,6 @@ namespace Ship {
 
     GlobalCtx2::~GlobalCtx2() {
         SPDLOG_INFO("destruct GlobalCtx2");
-        INSTANCE->Exit();
     }
 
     void GlobalCtx2::InitWindow() {
@@ -84,8 +81,6 @@ namespace Ship {
     #ifdef __SWITCH__
         Ship::Switch::Init(PostInitPhase);
     #endif
-        INSTANCE = new ModManager(ResMan);
-        INSTANCE->Init();
     }
 
     void GlobalCtx2::InitLogging() {

libultraship/libultraship/Hooks.cpp

@@ -1,10 +0,0 @@
-#include "Hooks.h"
-#include <map>
-#include <string>
-#include <vector>
-#include <stdarg.h>
-#include <iostream>
-
-void ModInternal_ExecuteAudioInitHooks() {
-    ModInternal::ExecuteHooks<ModInternal::AudioInit>();
-}

libultraship/libultraship/Hooks.h

@@ -1,15 +1,12 @@
 #pragma once
 
-#ifdef __cplusplus
-
 #include <functional>
-
 #include "UltraController.h"
-#include "Controller.h"
 
 #define DEFINE_HOOK(name, type) struct name { typedef std::function<type> fn; }
 
-namespace ModInternal {
+namespace Ship {
+    class Controller;
 
     template <typename H>
     struct RegisteredHooks {
@@ -29,22 +26,9 @@ namespace ModInternal {
     }
 
     DEFINE_HOOK(ControllerRead, void(OSContPad* cont_pad));
-    DEFINE_HOOK(ControllerRawInput, void(Ship::Controller* backend, uint32_t raw));
+    DEFINE_HOOK(ControllerRawInput, void(Controller* backend, uint32_t raw));
     DEFINE_HOOK(AudioInit, void());
     DEFINE_HOOK(LoadTexture, void(const char* path, uint8_t** texture));
     DEFINE_HOOK(GfxInit, void());
     DEFINE_HOOK(ExitGame, void());
-
 }
-
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void ModInternal_ExecuteAudioInitHooks();
-
-#ifdef __cplusplus
-}
-#endif

libultraship/libultraship/ImGuiImpl.cpp

@@ -7,16 +7,19 @@
 #include <algorithm>
 #include <vector>
 
+#include <cstddef>
+#include <PR/ultra64/types.h>
+#include <PR/ultra64/sptask.h>
+#include <PR/ultra64/pi.h>
+#include <PR/ultra64/message.h>
+#include "../../soh/include/z64audio.h"
 #include "Archive.h"
-#include "Environment.h"
-#include "GameSettings.h"
 #include "Console.h"
 #include "Hooks.h"
 #define IMGUI_DEFINE_MATH_OPERATORS
 #include "Lib/ImGui/imgui_internal.h"
 #include "GlobalCtx2.h"
 #include "ResourceMgr.h"
-#include "TextureMod.h"
 #include "Window.h"
 #include "Cvar.h"
 #include "GameOverlay.h"
@@ -25,7 +28,7 @@
 #include "Lib/stb/stb_image.h"
 #include "Lib/Fast3D/gfx_rendering_api.h"
 #include "Lib/spdlog/include/spdlog/common.h"
-#include "Utils/StringHelper.h"
+#include "UltraController.h"
 
 #if __APPLE__
 #include <SDL_hints.h>
@@ -70,6 +73,14 @@ std::vector<std::string> emptyArgs;
 
 bool isBetaQuestEnabled = false;
 
+enum SeqPlayers {
+    /* 0 */ SEQ_BGM_MAIN,
+    /* 1 */ SEQ_FANFARE,
+    /* 2 */ SEQ_SFX,
+    /* 3 */ SEQ_BGM_SUB,
+    /* 4 */ SEQ_MAX
+};
+
 extern "C" {
     void enableBetaQuest() { isBetaQuestEnabled = true; }
     void disableBetaQuest() { isBetaQuestEnabled = false; }
@@ -117,6 +128,23 @@ namespace SohImGui {
     std::map<std::string, std::vector<std::string>> windowCategories;
     std::map<std::string, CustomWindow> customWindows;
 
+    void UpdateAudio() {
+        Audio_SetGameVolume(SEQ_BGM_MAIN, CVar_GetFloat("gMainMusicVolume", 1));
+        Audio_SetGameVolume(SEQ_BGM_SUB, CVar_GetFloat("gSubMusicVolume", 1));
+        Audio_SetGameVolume(SEQ_FANFARE, CVar_GetFloat("gSFXMusicVolume", 1));
+        Audio_SetGameVolume(SEQ_SFX, CVar_GetFloat("gFanfareVolume", 1));
+    }
+
+    void InitSettings() {
+        Ship::RegisterHook<Ship::AudioInit>(UpdateAudio);
+        Ship::RegisterHook<Ship::GfxInit>([] {
+            gfx_get_current_rendering_api()->set_texture_filter((FilteringMode)CVar_GetS32("gTextureFilter", FILTER_THREE_POINT));
+            SohImGui::console->opened = CVar_GetS32("gConsoleEnabled", 0);
+            SohImGui::controller->Opened = CVar_GetS32("gControllerConfigurationEnabled", 0);
+            UpdateAudio();
+        });
+    }
+
     int GetBackendID(std::shared_ptr<Mercury> cfg) {
         std::string backend = cfg->getString("Window.GfxBackend");
         if (backend.empty()) {
@@ -349,7 +377,7 @@ namespace SohImGui {
     }
 
     void Init(WindowImpl window_impl) {
-        Game::LoadSettings();
+        CVar_Load();
         impl = window_impl;
         ImGuiContext* ctx = ImGui::CreateContext();
         ImGui::SetCurrentContext(ctx);
@@ -386,7 +414,7 @@ namespace SohImGui {
         ImGui::GetStyle().ScaleAllSizes(2);
     #endif
 
-        ModInternal::RegisterHook<ModInternal::GfxInit>([] {
+        Ship::RegisterHook<Ship::GfxInit>([] {
             if (GlobalCtx2::GetInstance()->GetWindow()->IsFullscreen())
                 ShowCursor(CVar_GetS32("gOpenMenuBar", 0), Dialogues::dLoadSettings);
 
@@ -403,11 +431,11 @@ namespace SohImGui {
             LoadTexture("C-Down", "assets/ship_of_harkinian/buttons/CDown.png");
         });
 
-        ModInternal::RegisterHook<ModInternal::ControllerRead>([](OSContPad* cont_pad) {
+        Ship::RegisterHook<Ship::ControllerRead>([](OSContPad* cont_pad) {
             pads = cont_pad;
         });
 
-        Game::InitSettings();
+        InitSettings();
 
         CVar_SetS32("gRandoGenerating", 0);
         CVar_SetS32("gNewSeedGenerated", 0);
@@ -421,7 +449,7 @@ namespace SohImGui {
 
     void Update(EventImpl event) {
         if (needs_save) {
-            Game::SaveSettings();
+            CVar_Save();
             needs_save = false;
         }
         ImGuiProcessEvent(event);
@@ -438,11 +466,10 @@ namespace SohImGui {
             const float volume = floorf(value * 100) / 100;
             CVar_SetFloat(key, volume);
             needs_save = true;
-            Game::SetSeqPlayerVolume(playerId, volume);
+            Audio_SetGameVolume(playerId, volume);
         }
     }
 
-
     void EnhancementCombobox(const char* name, const char* ComboArray[], size_t arraySize, uint8_t FirstTimeValue = 0) {
         if (FirstTimeValue <= 0) {
             FirstTimeValue = 0;
@@ -792,7 +819,7 @@ namespace SohImGui {
             bool menu_bar = CVar_GetS32("gOpenMenuBar", 0);
             CVar_SetS32("gOpenMenuBar", !menu_bar);
             needs_save = true;
-            GlobalCtx2::GetInstance()->GetWindow()->dwMenubar = menu_bar;
+            GlobalCtx2::GetInstance()->GetWindow()->SetMenuBar(menu_bar);
             ShowCursor(menu_bar, Dialogues::dMenubar);
             GlobalCtx2::GetInstance()->GetWindow()->GetControlDeck()->SaveControllerSettings();
             if (CVar_GetS32("gControlNav", 0)) {
@@ -1014,6 +1041,9 @@ namespace SohImGui {
                         Tooltip("Allow Link to put items away without having to wait around");
                         EnhancementCheckbox("Mask Select in Inventory", "gMaskSelect");
                         Tooltip("After completing the mask trading sub-quest, press A and any direction on the mask slot to change masks");
+                        EnhancementCheckbox("Remember Save Location", "gRememberSaveLocation");
+                        Tooltip("When loading a save, places Link at the last entrance he went through.\n"
+                                "This doesn't work if the save was made in a grotto.");
                         ImGui::EndMenu();
                     }
 
@@ -1266,6 +1296,12 @@ namespace SohImGui {
                     ImGui::EndMenu();
                 }
 
+                EnhancementCheckbox("Autosave", "gAutosave");
+                Tooltip("Automatically save the game every time a new area is entered or item is obtained\n"
+                    "To disable saving when obtaining an item, manually set gAutosaveAllItems and gAutosaveMajorItems to 0\n"
+                    "gAutosaveAllItems takes priority over gAutosaveMajorItems if both are set to 1\n"
+                    "gAutosaveMajorItems excludes rupees and health/magic/ammo refills (but includes bombchus)");
+
                 EXPERIMENTAL();
 
                 const char* fps_cvar = "gInterpolationFPS";
@@ -1414,6 +1450,9 @@ namespace SohImGui {
                 Tooltip("Prevents the Deku Shield from burning on contact with fire");
                 EnhancementCheckbox("Shield with Two-Handed Weapons", "gShieldTwoHanded");
                 Tooltip("This allows you to put up your shield with any two-handed weapon in hand except for Deku Sticks");
+                Tooltip("This allows you to put up your shield with any two-handed weapon in hand\nexcept for Deku Sticks");
+                EnhancementCheckbox("Time Sync", "gTimeSync");
+                Tooltip("This syncs the ingame time with the real world time");
 
                 {
                     static int32_t betaQuestEnabled = CVar_GetS32("gEnableBetaQuest", 0);
@@ -1626,12 +1665,10 @@ namespace SohImGui {
             pos = ImVec2(size.x / 2 - sw / 2, 0);
             size = ImVec2(sw, size.y);
         }
-        std::string fb_str = SohUtils::getEnvironmentVar("framebuffer");
+        if (gfxFramebuffer) {
-        if (!fb_str.empty()) {
+            //ImGui::ImageSimple(reinterpret_cast<ImTextureID>(gfxFramebuffer), pos, size);
-            uintptr_t fbuf = (uintptr_t)std::stoull(fb_str);
-            //ImGui::ImageSimple(reinterpret_cast<ImTextureID>(fbuf), pos, size);
             ImGui::SetCursorPos(pos);
-            ImGui::Image(reinterpret_cast<ImTextureID>(fbuf), size);
+            ImGui::Image(reinterpret_cast<ImTextureID>(gfxFramebuffer), size);
         }
 
         ImGui::End();

libultraship/libultraship/ImGuiImpl.h

@@ -69,7 +69,7 @@ namespace SohImGui {
         WindowDrawFunc drawFunc;
     } CustomWindow;
 
-    extern Console* console;
+    extern Ship::Console* console;
     extern Ship::InputEditor* controller;
     extern Ship::GameOverlay* overlay;
     extern bool needs_save;
@@ -92,7 +92,7 @@ namespace SohImGui {
     void Render(void);
     void CancelFrame(void);
     void ShowCursor(bool hide, Dialogues w);
-    void BindCmd(const std::string& cmd, CommandEntry entry);
+    void BindCmd(const std::string& cmd, Ship::CommandEntry entry);
     void AddWindow(const std::string& category, const std::string& name, WindowDrawFunc drawFunc, bool isEnabled=false, bool isHidden=false);
     void LoadResource(const std::string& name, const std::string& path, const ImVec4& tint = ImVec4(1, 1, 1, 1));
     void LoadPickersColors(ImVec4& ColorArray, const char* cvarname, const ImVec4& default_colors, bool has_alpha=false);

libultraship/libultraship/InputEditor.cpp

@@ -16,8 +16,8 @@ namespace Ship {
 	}
 
 	std::shared_ptr<Controller> GetControllerPerSlot(int slot) {
-		const std::vector<int> vDevices = Window::ControllerApi->virtualDevices;
+		auto controlDeck = Ship::GlobalCtx2::GetInstance()->GetWindow()->GetControlDeck();
-		return Window::ControllerApi->physicalDevices[vDevices[slot]];
+		return controlDeck->GetPhysicalDeviceFromVirtualSlot(slot);
 	}
 
 	void InputEditor::DrawButton(const char* label, int n64Btn) {
@@ -82,20 +82,21 @@ namespace Ship {
 	}
 
 	void InputEditor::DrawControllerSchema() {
-
+		auto controlDeck = Ship::GlobalCtx2::GetInstance()->GetWindow()->GetControlDeck();
-		const std::vector<int> vDevices = Window::ControllerApi->virtualDevices;
+		auto Backend = controlDeck->GetPhysicalDeviceFromVirtualSlot(CurrentPort);
-		const std::vector<std::shared_ptr<Controller>> devices = Window::ControllerApi->physicalDevices;
+		DeviceProfile& profile = Backend->profiles[CurrentPort];
-
-		std::shared_ptr<Controller> Backend = devices[vDevices[CurrentPort]];
-		DeviceProfile& profile =Backend->profiles[CurrentPort];
 		float sensitivity = profile.Thresholds[SENSITIVITY];
 		bool IsKeyboard = Backend->GetGuid() == "Keyboard"  || Backend->GetGuid() == "Auto" || !Backend->Connected();
 		const char* ControllerName = Backend->GetControllerName();
 
 		if (ControllerName != nullptr && ImGui::BeginCombo("##ControllerEntries", ControllerName)) {
-			for (uint8_t i = 0; i < devices.size(); i++) {
+			for (uint8_t i = 0; i < controlDeck->GetNumPhysicalDevices(); i++) {
-				if (ImGui::Selectable(devices[i]->GetControllerName(), i == vDevices[CurrentPort])) {
+				std::string DeviceName = controlDeck->GetPhysicalDevice(i)->GetControllerName();
-					Window::ControllerApi->SetPhysicalDevice(CurrentPort, i);
+				if (DeviceName != "Keyboard" && DeviceName != "Auto") {
+					DeviceName+="##"+std::to_string(i);
+				}
+				if (ImGui::Selectable(DeviceName.c_str(), i == controlDeck->GetVirtualDevice(CurrentPort))) {
+					controlDeck->SetPhysicalDevice(CurrentPort, i);
 				}
 			}
 			ImGui::EndCombo();
@@ -104,7 +105,7 @@ namespace Ship {
 		ImGui::SameLine();
 
 		if(ImGui::Button("Refresh")) {
-			Window::ControllerApi->ScanPhysicalDevices();
+			controlDeck->ScanPhysicalDevices();
 		}
 
 		SohImGui::BeginGroupPanel("Buttons", ImVec2(150, 20));

libultraship/libultraship/InputEditor.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <string>
-
 #include "Lib/ImGui/imgui.h"
 
 namespace Ship {

libultraship/libultraship/Lib/Fast3D/gfx_dxgi.cpp

@@ -32,7 +32,6 @@
 
 #define DECLARE_GFX_DXGI_FUNCTIONS
 #include "gfx_dxgi.h"
-#include "../../GameSettings.h"
 
 #define WINCLASS_NAME L"N64GAME"
 #define GFX_API_NAME "DirectX"
@@ -240,8 +239,8 @@ static LRESULT CALLBACK gfx_dxgi_wnd_proc(HWND h_wnd, UINT message, WPARAM w_par
             dxgi.current_height = (uint32_t)(l_param >> 16);
             break;
         case WM_DESTROY:
-            ModInternal::ExecuteHooks<ModInternal::ExitGame>();
+            PostQuitMessage(0);
-            exit(0);
+            break;
         case WM_PAINT:
             if (dxgi.in_paint) {
                 dxgi.recursive_paint_detected = true;
@@ -274,7 +273,7 @@ static LRESULT CALLBACK gfx_dxgi_wnd_proc(HWND h_wnd, UINT message, WPARAM w_par
             DragQueryFileA((HDROP)w_param, 0, fileName, 256);
             CVar_SetString("gDroppedFile", fileName);
             CVar_SetS32("gNewFileDropped", 1);
-            Game::SaveSettings();
+            CVar_Save();
             break;
         case WM_SYSKEYDOWN:
             if ((w_param == VK_RETURN) && ((l_param & 1 << 30) == 0)) {
@@ -358,7 +357,6 @@ static void gfx_dxgi_show_cursor(bool hide) {
       * @bug When menubar is open in windowed mode and you toggle fullscreen
       * ShowCursor no longer responds. Debugging shows the bool to be correct.
     **/
-    INFO("renderer: %s", hide ? "true" : "false");
     ShowCursor(hide);
 }
 
@@ -380,6 +378,8 @@ static void gfx_dxgi_main_loop(void (*run_one_game_iter)(void)) {
         TranslateMessage(&msg);
         DispatchMessage(&msg);
     }
+
+    Ship::ExecuteHooks<Ship::ExitGame>();
 }
 
 static void gfx_dxgi_get_dimensions(uint32_t *width, uint32_t *height) {

libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp

@@ -29,7 +29,7 @@
 #define GL_GLEXT_PROTOTYPES 1
 #include "SDL_opengl.h"
 #elif __APPLE__
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <GL/glew.h>
 #elif __SWITCH__
 #include <SDL2/SDL.h>
@@ -44,7 +44,6 @@
 #include "gfx_cc.h"
 #include "gfx_rendering_api.h"
 #include "../../ImGuiImpl.h"
-#include "../../Environment.h"
 #include "../../GlobalCtx2.h"
 #include "gfx_pc.h"
 

libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp

@@ -32,7 +32,6 @@
 #include "../../luslog.h"
 #include "../StrHash64.h"
 #include "../../ImGuiImpl.h"
-#include "../../Environment.h"
 #include "../../GameVersions.h"
 #include "../../ResourceMgr.h"
 #include "../../Utils.h"
@@ -49,6 +48,8 @@ extern "C" {
     int ResourceMgr_OTRSigCheck(char* imgData);
 }
 
+uintptr_t gfxFramebuffer;
+
 using namespace std;
 
 #define SEG_ADDR(seg, addr) (addr | (seg << 24) | 1)
@@ -1065,8 +1066,8 @@ static void gfx_sp_vertex(size_t n_vertices, size_t dest_index, const Vtx *verti
                 dotx /= 127.0f;
                 doty /= 127.0f;
 
-                dotx = math::clamp(dotx, -1.0f, 1.0f);
+                dotx = Ship::Math::clamp(dotx, -1.0f, 1.0f);
-                doty = math::clamp(doty, -1.0f, 1.0f);
+                doty = Ship::Math::clamp(doty, -1.0f, 1.0f);
 
                 if (rsp.geometry_mode & G_TEXTURE_GEN_LINEAR) {
                                     // Not sure exactly what formula we should use to get accurate values
@@ -1118,7 +1119,7 @@ static void gfx_sp_vertex(size_t n_vertices, size_t dest_index, const Vtx *verti
             if (winv < 0.0f) winv = std::numeric_limits<int16_t>::max();
 
             float fog_z = z * winv * rsp.fog_mul + rsp.fog_offset;
-            fog_z = math::clamp(fog_z, 0.0f, 255.0f);
+            fog_z = Ship::Math::clamp(fog_z, 0.0f, 255.0f);
             d->color.a = fog_z; // Use alpha variable to store fog factor
         } else {
             d->color.a = v->cn[3];
@@ -2698,7 +2699,7 @@ void gfx_init(struct GfxWindowManagerAPI *wapi, struct GfxRenderingAPI *rapi, co
         //gfx_lookup_or_create_shader_program(precomp_shaders[i]);
     }
 
-    ModInternal::ExecuteHooks<ModInternal::GfxInit>();
+    Ship::ExecuteHooks<Ship::GfxInit>();
 }
 
 struct GfxRenderingAPI *gfx_get_current_rendering_api(void) {
@@ -2782,7 +2783,7 @@ void gfx_run(Gfx *commands, const std::unordered_map<Mtx *, MtxF>& mtx_replaceme
     rendering_state.scissor = {};
     gfx_run_dl(commands);
     gfx_flush();
-    SohUtils::saveEnvironmentVar("framebuffer", string());
+    gfxFramebuffer = 0;
     if (game_renders_to_framebuffer) {
         gfx_rapi->start_draw_to_framebuffer(0, 1);
         gfx_rapi->clear_framebuffer();
@@ -2792,12 +2793,12 @@ void gfx_run(Gfx *commands, const std::unordered_map<Mtx *, MtxF>& mtx_replaceme
 
             if (different_size) {
                 gfx_rapi->resolve_msaa_color_buffer(game_framebuffer_msaa_resolved, game_framebuffer);
-                SohUtils::saveEnvironmentVar("framebuffer", std::to_string((uintptr_t)gfx_rapi->get_framebuffer_texture_id(game_framebuffer_msaa_resolved)));
+                gfxFramebuffer = (uintptr_t)gfx_rapi->get_framebuffer_texture_id(game_framebuffer_msaa_resolved);
             } else {
                 gfx_rapi->resolve_msaa_color_buffer(0, game_framebuffer);
             }
         } else {
-            SohUtils::saveEnvironmentVar("framebuffer", std::to_string((uintptr_t)gfx_rapi->get_framebuffer_texture_id(game_framebuffer)));
+            gfxFramebuffer = (uintptr_t)gfx_rapi->get_framebuffer_texture_id(game_framebuffer);
         }
     }
     SohImGui::DrawFramebufferAndGameInput();

libultraship/libultraship/Lib/Fast3D/gfx_pc.h

@@ -14,6 +14,8 @@
 #define SCREEN_WIDTH 320
 #define SCREEN_HEIGHT 240
 
+extern uintptr_t gfxFramebuffer;
+
 struct GfxRenderingAPI;
 struct GfxWindowManagerAPI;
 

libultraship/libultraship/Lib/Fast3D/gfx_sdl2.cpp

@@ -35,8 +35,6 @@
 #ifdef _WIN32
 #include <WTypesbase.h>
 #endif
-#include <time.h>
-#include "../../GameSettings.h"
 
 #define GFX_API_NAME "SDL2 - OpenGL"
 
@@ -239,7 +237,9 @@ static void gfx_sdl_main_loop(void (*run_one_game_iter)(void)) {
 #ifdef __SWITCH__
     Ship::Switch::Exit();
 #endif
-    ModInternal::ExecuteHooks<ModInternal::ExitGame>();
+    Ship::ExecuteHooks<Ship::ExitGame>();
+
+    SDL_Quit();
 }
 
 static void gfx_sdl_get_dimensions(uint32_t *width, uint32_t *height) {
@@ -306,12 +306,11 @@ static void gfx_sdl_handle_events(void) {
             case SDL_DROPFILE:
                 CVar_SetString("gDroppedFile", event.drop.file);
                 CVar_SetS32("gNewFileDropped", 1);
-                Game::SaveSettings();
+                CVar_Save();
                 break;
             case SDL_QUIT:
-                ModInternal::ExecuteHooks<ModInternal::ExitGame>();
+                is_running = false;
-                SDL_Quit(); // bandaid fix for linux window closing issue
+                break;
-                exit(0);
         }
     }
 }

libultraship/libultraship/Lib/spdlog/include/spdlog/sinks/sohconsole_sink.h

@@ -9,7 +9,6 @@
 #include <spdlog/sinks/base_sink.h>
 #include <spdlog/details/synchronous_factory.h>
 #include "ImGuiImpl.h"
-#include "GameSettings.h"
 #include "Cvar.h"
 #include <chrono>
 #include <mutex>
@@ -34,7 +33,7 @@ public:
 protected:
     void sink_it_(const details::log_msg &msg) override
     {
-        const Priority priority = convert_to_soh(msg.level);
+        const Ship::Priority priority = convert_to_soh(msg.level);
         memory_buf_t formatted;
         if (use_raw_msg_)
         {
@@ -53,24 +52,25 @@ protected:
     void flush_() override {}
 
 private:
-    static Priority convert_to_soh(spdlog::level::level_enum level) {
+    static Ship::Priority convert_to_soh(spdlog::level::level_enum level)
+    {
         switch (level) {
             case spdlog::level::trace:
-                return Priority::INFO_LVL;
+                return Ship::Priority::INFO_LVL;
             case spdlog::level::debug:
-                return Priority::LOG_LVL;
+                return Ship::Priority::LOG_LVL;
             case spdlog::level::info:
-                return Priority::LOG_LVL;
+                return Ship::Priority::LOG_LVL;
             case spdlog::level::warn:
-                return Priority::WARNING_LVL;
+                return Ship::Priority::WARNING_LVL;
             case spdlog::level::err:
-                return Priority::ERROR_LVL;
+                return Ship::Priority::ERROR_LVL;
             case spdlog::level::critical:
-                return Priority::ERROR_LVL;
+                return Ship::Priority::ERROR_LVL;
             default:
                 break;
         }
-        return Priority::LOG_LVL;
+            return Ship::Priority::LOG_LVL;
     }
 
     std::string tag_;

libultraship/libultraship/ModManager.cpp

@@ -1,23 +0,0 @@
-#include "ModManager.h"
-#include "TextureMod.h"
-#include "ModModule.h"
-#include "ImGuiImpl.h"
-
-namespace Ship {
-	std::vector<ModModule*> modules;
-
-	void ModManager::Init() {
-		// ResManager->GetArchive()->loa
-		// modules.push_back(new TextureModule(this));
-		// std::shared_ptr<Ship::Archive> archive = std::make_shared<Ship::Archive>("mods/TexMods.otr", "", false);
-		for (auto& mod : modules) {
-			mod->Init();
-			// mod->Open(archive);
-		}
-	}
-
-	void ModManager::Exit() {
-		for (auto& mod : modules)
-			mod->Exit();
-	}
-}

libultraship/libultraship/ModManager.h

@@ -1,12 +0,0 @@
-#pragma once
-#include "ResourceMgr.h"
-
-namespace Ship {
-	class ModManager {
-	public:
-		std::shared_ptr<Ship::ResourceMgr> ResManager;
-		explicit ModManager(std::shared_ptr<Ship::ResourceMgr> manager) : ResManager(manager) {}
-		void Init();
-		void Exit();
-	};
-}

libultraship/libultraship/ModModule.h

@@ -1,19 +0,0 @@
-#pragma once
-#include "ModManager.h"
-#include "Hooks.h"
-#include "Console.h"
-#include "Archive.h"
-
-namespace Ship {
-	class ModModule {
-	protected:
-		ModManager* Manager;
-	public:
-		virtual ~ModModule() = default;
-		explicit ModModule(ModManager* Manager) : Manager(Manager) {}
-		virtual void Init() = 0;
-		virtual void Open(std::shared_ptr<Ship::Archive> archive) = 0;
-		virtual void Close(Ship::Archive archive) = 0;
-		virtual void Exit() = 0;
-	};
-}

libultraship/libultraship/SDLAudioPlayer.h

@@ -1,10 +1,6 @@
 #pragma once
 #include "AudioPlayer.h"
-#if __APPLE__
-#include <SDL.h>
-#else
 #include <SDL2/SDL.h>
-#endif
 
 namespace Ship {
 	class SDLAudioPlayer : public AudioPlayer {

libultraship/libultraship/SDLController.h

@@ -1,10 +1,6 @@
 #pragma once
 #include "Controller.h"
-#if __APPLE__
-#include <SDL.h>
-#else
 #include <SDL2/SDL.h>
-#endif
 
 namespace Ship {
 	class SDLController : public Controller {

libultraship/libultraship/TextureMod.cpp

@@ -1,128 +0,0 @@
-#include "TextureMod.h"
-
-#if 0
-
-#include <map>
-#include <string>
-#include <iostream>
-#include <filesystem>
-#include <functional>
-#include "Lib/stb/stb_image.h"
-#include "Lib/Fast3D/gfx_pc.h"
-#define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "Lib/stb/stb_image_write.h"
-#include "Lib/Fast3D/gfx_rendering_api.h"
-#include "SohImGuiImpl.h"
-
-namespace fs = std::filesystem;
-
-namespace Ship {
-	void TextureModule::Init() {
-		BIND_HOOK(LOOKUP_TEXTURE, Hook_LookupTexture);
-		BIND_HOOK(GRAYOUT_TEXTURE, Hook_GrayScaleFilter);
-		BIND_HOOK(INVALIDATE_TEXTURE, Hook_InvalidateTexture);
-
-		SohImGui::BindCmd("reload", { .handler = [&](const std::vector<std::string>&) {
-			INFO("Reloading all textures!");
-			gfx_texture_cache_clear();
-			this->TexturePool.clear();
-			this->TextureCache.clear();
-			return true;
-		} });
-	}
-
-	void TextureModule::Open(std::shared_ptr<Ship::Archive> archive) {
-		this->LoadedOTRS.push_back(archive);
-	}
-
-	void TextureModule::Close(Ship::Archive otr) {
-		// Remove all loaded textures
-		// this->LoadedOTRS.erase(std::find(this->LoadedOTRS.begin(), this->LoadedOTRS.end(), otr));
-	}
-
-	void TextureModule::Hook_LookupTexture(HookEvent call) {
-		const auto raw_path = BIND_PTR("path", char*);
-		if (raw_path == nullptr) return;
-
-		const auto api = BIND_PTR("gfx_api", GfxRenderingAPI*);
-		const auto path = std::string(raw_path) + ".png";
-		const auto node = BIND_PTR("node", TextureCacheNode**);
-		const auto fmt = BIND_VAR("fmt", uint32_t*);
-		const auto siz = BIND_VAR("siz", uint32_t*);
-		const auto tile = BIND_VAR("tile", int*);
-		const auto palette = BIND_VAR("palette", uint32_t*);
-		const auto orig_addr = BIND_VAR("addr", const uint8_t**);
-
-		// INFO("The game is trying to load %s", path.c_str());
-
-		if (this->TextureCache.contains(path) && this->TextureCache[path][tile] != nullptr) {
-			*node = this->TextureCache[path][tile];
-			api->select_texture(tile, (*node)->second.texture_id);
-			call->cancelled = true;
-			return;
-		}
-
-		// OTRTODO: Implement loading order
-		TextureData* tex_data = nullptr;
-		if (!this->TexturePool.contains(path)) {
-			std::shared_ptr<Ship::File> raw_data = std::make_shared<Ship::File>();
-			this->Manager->ResManager->GetArchive()->LoadPatchFile(path, false, raw_data);
-
-			if (raw_data->bIsLoaded) {
-				char* tdata = new char[raw_data->dwBufferSize];
-				memcpy(tdata, raw_data->buffer.get(), raw_data->dwBufferSize);
-				tex_data = new TextureData({ .data = tdata, .size = raw_data->dwBufferSize });
-				INFO("Loaded %s", path.c_str());
-				this->TexturePool[path] = tex_data;
-			}
-		}
-
-		if (tex_data == nullptr)
-			return;
-
-		if (!this->TextureCache.contains(path)) this->TextureCache[path].resize(10);
-
-		TextureCacheKey key = { orig_addr, { }, static_cast<uint8_t>(fmt), static_cast<uint8_t>(siz), static_cast<uint8_t>(palette) };
-		TextureCacheValue value = { api->new_texture(), 0, 0, false };
-		const auto entry = new TextureCacheNode(key, value);
-		api->select_texture(tile, entry->second.texture_id);
-		api->set_sampler_parameters(tile, false, 0, 0);
-		*node = entry;
-
-		uint8_t* img_data = stbi_load_from_memory(reinterpret_cast<const stbi_uc*>(tex_data->data), tex_data->size, &tex_data->width, &tex_data->height, nullptr, 4);
-
-		if (!img_data)
-			return;
-
-		switch (tex_data->color_modifier) {
-		case GRAYSCALE: {
-			GrayOutTexture(img_data, tex_data->width, tex_data->height);
-		}
-		default:;
-		}
-
-		std::cout << "Uploading to the GPU" << std::endl;
-		api->upload_texture(img_data, tex_data->width, tex_data->height);
-		this->TextureCache[path][tile] = entry;
-
-		stbi_image_free(img_data);
-		call->cancelled = true;
-	}
-
-
-	void TextureModule::Hook_GrayScaleFilter(HookEvent event) {
-		// this->Exit();
-	}
-
-	void TextureModule::Hook_InvalidateTexture(HookEvent event) {
-		// this->Exit();
-	}
-
-	void TextureModule::Exit() {
-		TextureCache.clear();
-		TexturePool.clear();
-		LoadedOTRS.clear();
-	}
-}
-
-#endif

libultraship/libultraship/TextureMod.h

@@ -1,55 +0,0 @@
-#pragma once
-#include "ModModule.h"
-#include <PR/ultra64/gbi.h>
-#include "Lib/Fast3D/gfx_pc.h"
-
-#if 0
-
-namespace Ship {
-	enum TextureMod {
-		GRAYSCALE,
-		NONE
-	};
-
-	struct TextureData {
-		char* data;
-		uint32_t size;
-		int width;
-		int height;
-		char* loaded_data;
-		std::shared_ptr<Ship::Archive> parent;
-		TextureMod color_modifier = NONE;
-	};
-
-	class TextureModule : public ModModule {
-	public:
-		explicit TextureModule(ModManager* Manager) : ModModule(Manager) {}
-	private:
-		std::vector<std::shared_ptr<Ship::Archive>> LoadedOTRS;
-		std::map<std::string, TextureData*> TexturePool;
-		std::map<std::string, std::vector<TextureCacheNode*>> TextureCache;
-		void Init() override;
-		void Open(std::shared_ptr<Ship::Archive> archive) override;
-		void Close(Ship::Archive mod) override;
-		void Exit() override;
-	protected:
-		void Hook_LookupTexture(HookEvent event);
-		void Hook_GrayScaleFilter(HookEvent event);
-		void Hook_InvalidateTexture(HookEvent event);
-	};
-
-	inline void GrayOutTexture(uint8_t* data, int width, int height) {
-		for (int x = 0; x < width * height * 4; x += 4) {
-
-			int red = data[x];
-			int green = data[x + 1];
-			int blue = data[x + 2];
-			int gray = (red + green + blue) / 3;
-			data[x] = gray;
-			data[x + 1] = gray;
-			data[x + 2] = gray;
-		}
-	}
-}
-
-#endif

libultraship/libultraship/Utils.cpp

@@ -5,14 +5,14 @@
 #define strdup _strdup
 #endif
 
-namespace math {
+namespace Ship {
-	float clamp(float d, float min, float max) {
+	namespace Math {
-		const float t = d < min ? min : d;
+		float clamp(float d, float min, float max) {
-		return t > max ? max : t;
+			const float t = d < min ? min : d;
+			return t > max ? max : t;
+		}
 	}
-}
 
-namespace Utils {
 	std::vector<std::string> SplitText(const std::string text, char separator = ' ', bool keep_quotes = false) {
 		std::vector<std::string> args;
 		char* input = strdup(text.c_str());

libultraship/libultraship/Utils.h

@@ -3,10 +3,11 @@
 #include <string>
 #include <vector>
 
-namespace math {
+namespace Ship {
-	float clamp(float d, float min, float max);
+
-}
+	namespace Math {
+		float clamp(float d, float min, float max);
+	}
 
-namespace Utils {
 	std::vector<std::string> SplitText(const std::string& text, char separator, bool keep_quotes);
-}
+}

libultraship/libultraship/VirtualController.h

@@ -4,32 +4,34 @@
 
 #include "Controller.h"
 
-class VirtualController final : public Ship::Controller {
+namespace Ship {
-public:
+	class VirtualController final : public Controller {
-	VirtualController(const std::string& CUID, const std::string& KeyName, bool Connected) {
+	public:
-		GUID = CUID;
+		VirtualController(const std::string& CUID, const std::string& KeyName, bool Connected) {
-		isConnected = Connected;
+			GUID = CUID;
-		ButtonName = KeyName;
+			isConnected = Connected;
-	}
+			ButtonName = KeyName;
+		}
 
-	std::map<std::vector<std::string>, int32_t> ReadButtonPress();
+		std::map<std::vector<std::string>, int32_t> ReadButtonPress();
-	void ReadFromSource(int32_t slot) override {}
+		void ReadFromSource(int32_t slot) override {}
-	const char* GetControllerName() override { return GUID.c_str(); }
+		const char* GetControllerName() override { return GUID.c_str(); }
-	const char* GetButtonName(int slot, int n64Button) override { return ButtonName.c_str(); }
+		const char* GetButtonName(int slot, int n64Button) override { return ButtonName.c_str(); }
-	void WriteToSource(int32_t slot, ControllerCallback* controller) override { }
+		void WriteToSource(int32_t slot, ControllerCallback* controller) override { }
-	bool Connected() const override { return isConnected; }
+		bool Connected() const override { return isConnected; }
-	bool CanRumble() const override { return false; }
+		bool CanRumble() const override { return false; }
-	bool CanGyro()   const override { return false; }
+		bool CanGyro()   const override { return false; }
 
-	void ClearRawPress() override {}
+		void ClearRawPress() override {}
-	int32_t ReadRawPress() override { return -1; }
+		int32_t ReadRawPress() override { return -1; }
-	bool HasPadConf() const { return true; }
+		bool HasPadConf() const { return true; }
-	std::optional<std::string> GetPadConfSection() { return "Unk"; }
+		std::optional<std::string> GetPadConfSection() { return "Unk"; }
-	void CreateDefaultBinding(int32_t slot) override {}
+		void CreateDefaultBinding(int32_t slot) override {}
-protected:
+	protected:
-	std::string ButtonName;
+		std::string ButtonName;
-	bool isConnected = false;
+		bool isConnected = false;
-	std::string GetControllerType() { return "Unk"; }
+		std::string GetControllerType() { return "Unk"; }
-	std::string GetConfSection() { return "Unk"; }
+		std::string GetConfSection() { return "Unk"; }
-	std::string GetBindingConfSection() { return "Unk"; }
+		std::string GetBindingConfSection() { return "Unk"; }
-};
+	};
+}

libultraship/libultraship/Window.cpp

@@ -1,7 +1,6 @@
 #include "Window.h"
 #include "spdlog/spdlog.h"
 #include "KeyboardController.h"
-#include "SDLController.h"
 #include "GlobalCtx2.h"
 #include "DisplayList.h"
 #include "Vertex.h"
@@ -11,22 +10,14 @@
 #include "Blob.h"
 #include "Matrix.h"
 #include "AudioPlayer.h"
-#include "WasapiAudioPlayer.h"
+#include "Hooks.h"
-#include "PulseAudioPlayer.h"
+#include "UltraController.h"
-#include "SDLAudioPlayer.h"
 #include "Lib/Fast3D/gfx_pc.h"
 #include "Lib/Fast3D/gfx_sdl.h"
 #include "Lib/Fast3D/gfx_opengl.h"
-#include "stox.h"
-#if __APPLE__
-#include <SDL.h>
-#else
 #include <SDL2/SDL.h>
-#endif
-#include <map>
 #include <string>
 #include <chrono>
-#include "Hooks.h"
 #include "Console.h"
 #include "Cvar.h"
 
@@ -57,7 +48,7 @@ extern "C" {
         }
     #endif
 
-        Ship::Window::ControllerApi->Init(controllerBits);
+        Ship::GlobalCtx2::GetInstance()->GetWindow()->GetControlDeck()->Init(controllerBits);
 
         return 0;
     }
@@ -77,10 +68,10 @@ extern "C" {
         pad->gyro_y = 0;
 
         if (!CVar_GetS32("gOpenMenuBar", 0)) {
-            Ship::Window::ControllerApi->WriteToPad(pad);
+            Ship::GlobalCtx2::GetInstance()->GetWindow()->GetControlDeck()->WriteToPad(pad);
         }
 
-        ModInternal::ExecuteHooks<ModInternal::ControllerRead>(pad);
+        Ship::ExecuteHooks<Ship::ControllerRead>(pad);
     }
 
     const char* ResourceMgr_GetNameByCRC(uint64_t crc) {
@@ -126,7 +117,7 @@ extern "C" {
 
         if (hashStr != nullptr)  {
             const auto res = LOAD_TEX(hashStr->c_str());
-            ModInternal::ExecuteHooks<ModInternal::LoadTexture>(hashStr->c_str(), &res->imageData);
+            Ship::ExecuteHooks<Ship::LoadTexture>(hashStr->c_str(), &res->imageData);
 
             return reinterpret_cast<char*>(res->imageData);
         } else {
@@ -153,7 +144,7 @@ extern "C" {
 
     char* ResourceMgr_LoadTexByName(char* texPath) {
         const auto res = LOAD_TEX(texPath);
-        ModInternal::ExecuteHooks<ModInternal::LoadTexture>(texPath, &res->imageData);
+        Ship::ExecuteHooks<Ship::LoadTexture>(texPath, &res->imageData);
         return (char*)res->imageData;
     }
 
@@ -221,7 +212,7 @@ namespace Ship {
 
     int32_t Window::lastScancode;
 
-    Window::Window(std::shared_ptr<GlobalCtx2> Context) : Context(Context), APlayer(nullptr) {
+    Window::Window(std::shared_ptr<GlobalCtx2> Context) : Context(Context), APlayer(nullptr), ControllerApi(nullptr) {
         WmApi = nullptr;
         RenderingApi = nullptr;
         bIsFullscreen = false;
@@ -259,8 +250,9 @@ namespace Ship {
         std::shared_ptr<Mercury> pConf = GlobalCtx2::GetInstance()->GetConfig();
 
         CreateDefaults();
+        InitializeAudioPlayer();
+        InitializeControlDeck();
 
-        SetAudioPlayer();
         bIsFullscreen = pConf->getBool("Window.Fullscreen.Enabled", false);
 
         if (bIsFullscreen) {
@@ -279,7 +271,7 @@ namespace Ship {
         WmApi->set_fullscreen_changed_callback(OnFullscreenChanged);
         WmApi->set_keyboard_callbacks(KeyDown, KeyUp, AllKeysUp);
 
-        ModInternal::RegisterHook<ModInternal::ExitGame>([]() {
+        Ship::RegisterHook<Ship::ExitGame>([this]() {
             ControllerApi->SaveControllerSettings();
         });
     }
@@ -347,7 +339,8 @@ namespace Ship {
         lastScancode = -1;
 
         bool bIsProcessed = false;
-        const auto pad = dynamic_cast<KeyboardController*>(ControllerApi->physicalDevices[ControllerApi->physicalDevices.size() - 2].get());
+        auto controlDeck = GlobalCtx2::GetInstance()->GetWindow()->GetControlDeck();
+        const auto pad = dynamic_cast<KeyboardController*>(controlDeck->GetPhysicalDevice(controlDeck->GetNumPhysicalDevices() - 2).get());
         if (pad != nullptr) {
             if (pad->ReleaseButton(dwScancode)) {
                 bIsProcessed = true;
@@ -359,8 +352,8 @@ namespace Ship {
 
     bool Window::KeyDown(int32_t dwScancode) {
         bool bIsProcessed = false;
-
+        auto controlDeck = GlobalCtx2::GetInstance()->GetWindow()->GetControlDeck();
-        const auto pad = dynamic_cast<KeyboardController*>(ControllerApi->physicalDevices[ControllerApi->physicalDevices.size() - 2].get());
+        const auto pad = dynamic_cast<KeyboardController*>(controlDeck->GetPhysicalDevice(controlDeck->GetNumPhysicalDevices() - 2).get());
         if (pad != nullptr) {
             if (pad->PressButton(dwScancode)) {
                 bIsProcessed = true;
@@ -374,7 +367,8 @@ namespace Ship {
 
 
     void Window::AllKeysUp(void) {
-        const auto pad = dynamic_cast<KeyboardController*>(ControllerApi->physicalDevices[ControllerApi->physicalDevices.size() - 2].get());
+        auto controlDeck = GlobalCtx2::GetInstance()->GetWindow()->GetControlDeck();
+        const auto pad = dynamic_cast<KeyboardController*>(controlDeck->GetPhysicalDevice(controlDeck->GetNumPhysicalDevices() - 2).get());
         if (pad != nullptr) {
             pad->ReleaseAllButtons();
         }
@@ -400,7 +394,7 @@ namespace Ship {
         return dwHeight;
     }
 
-    void Window::SetAudioPlayer() {
+    void Window::InitializeAudioPlayer() {
 #ifdef _WIN32
         APlayer = std::make_shared<WasapiAudioPlayer>();
 #elif defined(__linux)
@@ -409,4 +403,8 @@ namespace Ship {
         APlayer = std::make_shared<SDLAudioPlayer>();
 #endif
     }
+
+    void Window::InitializeControlDeck() {
+        ControllerApi = std::make_shared<ControlDeck>();
+    }
 }

libultraship/libultraship/Window.h

@@ -16,7 +16,6 @@ namespace Ship {
 	class Window {
 		public:
 			static int32_t lastScancode;
-			inline static ControlDeck* ControllerApi = new ControlDeck;
 
 			Window(std::shared_ptr<GlobalCtx2> Context);
 			~Window();
@@ -32,12 +31,12 @@ namespace Ship {
 			void ToggleFullscreen();
 			void SetFullscreen(bool bIsFullscreen);
 			void ShowCursor(bool hide);
-
 			bool IsFullscreen() { return bIsFullscreen; }
 			uint32_t GetCurrentWidth();
 			uint32_t GetCurrentHeight();
-			ControlDeck* GetControlDeck() { return ControllerApi; };
+			uint32_t GetMenuBar() { return dwMenubar; }
-			uint32_t dwMenubar;
+			void SetMenuBar(uint32_t dwMenuBar) { this->dwMenubar = dwMenuBar; }
+			std::shared_ptr<ControlDeck> GetControlDeck() { return ControllerApi; };
 			std::shared_ptr<GlobalCtx2> GetContext() { return Context.lock(); }
 			std::shared_ptr<AudioPlayer> GetAudioPlayer() { return APlayer; }
 			const char* GetKeyName(int scancode) { return WmApi->get_key_name(scancode); }
@@ -48,15 +47,18 @@ namespace Ship {
 			static bool KeyUp(int32_t dwScancode);
 			static void AllKeysUp(void);
 			static void OnFullscreenChanged(bool bIsNowFullscreen);
-			void SetAudioPlayer();
+			void InitializeControlDeck();
+			void InitializeAudioPlayer();
 
 			std::weak_ptr<GlobalCtx2> Context;
 			std::shared_ptr<AudioPlayer> APlayer;
+			std::shared_ptr<ControlDeck> ControllerApi;
 
 			GfxRenderingAPI* RenderingApi;
 			GfxWindowManagerAPI* WmApi;
 			bool bIsFullscreen;
 			uint32_t dwWidth;
 			uint32_t dwHeight;
+			uint32_t dwMenubar;
 	};
 }

libultraship/libultraship/libultraship.vcxproj

@@ -1,457 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Testing|Win32">
-      <Configuration>Testing</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Testing|x64">
-      <Configuration>Testing</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{6da9b521-65b7-41e2-8f8a-f0451cc18ed8}</ProjectGuid>
-    <RootNamespace>libultraship</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>libultraship</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Testing|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Testing|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\ImGui;$(ProjectDir)Lib\libjpeg\include;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(ProjectDir)..\..\StormLib\src\;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ProjectDir)Lib\SDL\lib\x86;$(LibraryPath)</LibraryPath>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\ImGui;$(ProjectDir)Lib\libjpeg\include;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ProjectDir)Lib\SDL\lib\x86;$(LibraryPath)</LibraryPath>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\ImGui;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(ProjectDir)..\..\StormLib\src\;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ProjectDir)Lib\SDL\lib\x86;$(LibraryPath)</LibraryPath>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\ImGui;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(ProjectDir)..\..\StormLib\src\;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ProjectDir)Lib\SDL\lib\x64;$(LibraryPath)</LibraryPath>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\ImGui;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ProjectDir)Lib\SDL\lib\x64;$(LibraryPath)</LibraryPath>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\ImGui;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(ProjectDir)..\..\StormLib\src\;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ProjectDir)Lib\SDL\lib\x64;$(LibraryPath)</LibraryPath>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level2</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>SPDLOG_ACTIVE_LEVEL=0;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;ENABLE_DX11;%(PreprocessorDefinitions)GLEW_STATIC </PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp20</LanguageStandard>
-      <LanguageStandard_C>stdc17</LanguageStandard_C>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Testing|Win32'">
-    <ClCompile>
-      <WarningLevel>Level2</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>SPDLOG_ACTIVE_LEVEL=0;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;%(PreprocessorDefinitions)GLEW_STATIC </PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp20</LanguageStandard>
-      <LanguageStandard_C>stdc17</LanguageStandard_C>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>SPDLOG_ACTIVE_LEVEL=0;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;ENABLE_DX11;%(PreprocessorDefinitions)GLEW_STATIC </PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp20</LanguageStandard>
-      <LanguageStandard_C>stdc17</LanguageStandard_C>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>SPDLOG_ACTIVE_LEVEL=0;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;ENABLE_DX11;%(PreprocessorDefinitions)GLEW_STATIC </PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp20</LanguageStandard>
-      <LanguageStandard_C>stdc17</LanguageStandard_C>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Testing|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>SPDLOG_ACTIVE_LEVEL=0;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;%(PreprocessorDefinitions)GLEW_STATIC </PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp20</LanguageStandard>
-      <LanguageStandard_C>stdc17</LanguageStandard_C>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>SPDLOG_ACTIVE_LEVEL=0;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;ENABLE_DX11;%(PreprocessorDefinitions)GLEW_STATIC</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpplatest</LanguageStandard>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="Audio.cpp" />
-    <ClCompile Include="Blob.cpp" />
-    <ClCompile Include="ControlDeck.cpp" />
-    <ClCompile Include="Cvar.cpp" />
-    <ClCompile Include="Environment.cpp" />
-    <ClCompile Include="Factories\AudioFactory.cpp" />
-    <ClCompile Include="InputEditor.cpp" />
-    <ClCompile Include="GameOverlay.cpp" />
-    <ClCompile Include="GameSettings.cpp" />
-    <ClCompile Include="Lib\ImGui\backends\imgui_impl_dx11.cpp" />
-    <ClCompile Include="Lib\ImGui\backends\imgui_impl_win32.cpp" />
-    <ClCompile Include="Lib\Mercury\Mercury.cpp" />
-    <ClCompile Include="luslog.cpp" />
-    <ClCompile Include="mixer.c" />
-    <ClCompile Include="ModManager.cpp" />
-    <ClCompile Include="SDLAudioPlayer.cpp" />
-    <ClCompile Include="Console.cpp" />
-    <ClCompile Include="Factories\AnimationFactory.cpp" />
-    <ClCompile Include="Factories\ArrayFactory.cpp" />
-    <ClCompile Include="Factories\BlobFactory.cpp" />
-    <ClCompile Include="Factories\CutsceneFactory.cpp" />
-    <ClCompile Include="Factories\MtxFactory.cpp" />
-    <ClCompile Include="Factories\PathFactory.cpp" />
-    <ClCompile Include="Animation.cpp" />
-    <ClCompile Include="Factories\TextFactory.cpp" />
-    <ClCompile Include="Factories\TextureFactory.cpp" />
-    <ClCompile Include="Factories\VtxFactory.cpp" />
-    <ClCompile Include="Array.cpp" />
-    <ClCompile Include="Controller.cpp" />
-    <ClCompile Include="Hooks.cpp" />
-    <ClCompile Include="ImGuiImpl.cpp" />
-    <ClCompile Include="KeyboardController.cpp" />
-    <ClCompile Include="Factories\CollisionHeaderFactory.cpp" />
-    <ClCompile Include="Factories\DisplayListFactory.cpp" />
-    <ClCompile Include="Factories\MaterialFactory.cpp" />
-    <ClCompile Include="Factories\PlayerAnimationFactory.cpp" />
-    <ClCompile Include="Factories\ResourceLoader.cpp" />
-    <ClCompile Include="Factories\SceneFactory.cpp" />
-    <ClCompile Include="Factories\SkeletonFactory.cpp" />
-    <ClCompile Include="Factories\SkeletonLimbFactory.cpp" />
-    <ClCompile Include="Lib\Fast3D\gfx_cc.cpp" />
-    <ClCompile Include="Lib\Fast3D\gfx_direct3d11.cpp" />
-    <ClCompile Include="Lib\Fast3D\gfx_direct3d12.cpp" />
-    <ClCompile Include="Lib\Fast3D\gfx_direct3d_common.cpp" />
-    <ClCompile Include="Lib\Fast3D\gfx_dxgi.cpp" />
-    <ClCompile Include="Lib\Fast3D\gfx_glx.cpp" />
-    <ClCompile Include="Lib\Fast3D\gfx_opengl.cpp" />
-    <ClCompile Include="Lib\Fast3D\gfx_pc.cpp" />
-    <ClCompile Include="Lib\Fast3D\gfx_sdl2.cpp" />
-    <ClCompile Include="Lib\ImGui\backends\imgui_impl_opengl3.cpp" />
-    <ClCompile Include="Lib\ImGui\backends\imgui_impl_sdl.cpp" />
-    <ClCompile Include="Lib\ImGui\imgui.cpp" />
-    <ClCompile Include="Lib\ImGui\imgui_demo.cpp" />
-    <ClCompile Include="Lib\ImGui\imgui_draw.cpp" />
-    <ClCompile Include="Lib\ImGui\imgui_tables.cpp" />
-    <ClCompile Include="Lib\ImGui\imgui_widgets.cpp" />
-    <ClCompile Include="Lib\stb\stb_impl.c" />
-    <ClCompile Include="Lib\StrHash64.cpp" />
-    <ClCompile Include="Lib\tinyxml2\tinyxml2.cpp" />
-    <ClCompile Include="Archive.cpp" />
-    <ClCompile Include="CollisionHeader.cpp" />
-    <ClCompile Include="ControllerAttachment.cpp" />
-    <ClCompile Include="Cutscene.cpp" />
-    <ClCompile Include="DisplayList.cpp" />
-    <ClCompile Include="GlobalCtx2.cpp" />
-    <ClCompile Include="File.cpp" />
-    <ClCompile Include="Material.cpp" />
-    <ClCompile Include="Matrix.cpp" />
-    <ClCompile Include="MemoryPack.cpp" />
-    <ClCompile Include="Model.cpp" />
-    <ClCompile Include="Path.cpp" />
-    <ClCompile Include="PlayerAnimation.cpp" />
-    <ClCompile Include="Resource.cpp" />
-    <ClCompile Include="ResourceMgr.cpp" />
-    <ClCompile Include="RumblePack.cpp" />
-    <ClCompile Include="Scene.cpp" />
-    <ClCompile Include="Skeleton.cpp" />
-    <ClCompile Include="SkeletonLimb.cpp" />
-    <ClCompile Include="Text.cpp" />
-    <ClCompile Include="Texture.cpp" />
-    <ClCompile Include="TextureMod.cpp" />
-    <ClCompile Include="Utils.cpp" />
-    <ClCompile Include="Vertex.cpp" />
-    <ClCompile Include="WasapiAudioPlayer.cpp" />
-    <ClCompile Include="Window.cpp" />
-    <ClCompile Include="WindowShim.cpp" />
-    <ClCompile Include="stox.cpp" />
-    <ClCompile Include="SDLController.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="VirtualController.h" />
-    <ClInclude Include="Lib\Mercury\Mercury.h" />
-    <ClInclude Include="Lib\nlohmann\json.hpp" />
-    <ClInclude Include="abi.h" />
-    <ClInclude Include="Audio.h" />
-    <ClInclude Include="AudioPlayer.h" />
-    <ClInclude Include="Blob.h" />
-    <ClInclude Include="color.h" />
-    <ClInclude Include="ControlDeck.h" />
-    <ClInclude Include="Cvar.h" />
-    <ClInclude Include="Environment.h" />
-    <ClInclude Include="Factories\AudioFactory.h" />
-    <ClInclude Include="InputEditor.h" />
-    <ClInclude Include="GameOverlay.h" />
-    <ClInclude Include="GameSettings.h" />
-    <ClInclude Include="GameVersions.h" />
-    <ClInclude Include="Lib\dr_libs\mp3.h" />
-    <ClInclude Include="Lib\dr_libs\wav.h" />
-    <ClInclude Include="Lib\ImGui\backends\imgui_impl_dx11.h" />
-    <ClInclude Include="Lib\ImGui\backends\imgui_impl_win32.h" />
-    <ClInclude Include="Lib\stb\stb_image_write.h" />
-    <ClInclude Include="luslog.h" />
-    <ClInclude Include="mixer.h" />
-    <ClInclude Include="ModManager.h" />
-    <ClInclude Include="ModModule.h" />
-    <ClInclude Include="SDLAudioPlayer.h" />
-    <ClInclude Include="Console.h" />
-    <ClInclude Include="Factories\ArrayFactory.h" />
-    <ClInclude Include="Factories\BlobFactory.h" />
-    <ClInclude Include="Factories\CutsceneFactory.h" />
-    <ClInclude Include="Factories\AnimationFactory.h" />
-    <ClInclude Include="Factories\MtxFactory.h" />
-    <ClInclude Include="Factories\PathFactory.h" />
-    <ClInclude Include="Factories\TextFactory.h" />
-    <ClInclude Include="Factories\TextureFactory.h" />
-    <ClInclude Include="Factories\VtxFactory.h" />
-    <ClInclude Include="Animation.h" />
-    <ClInclude Include="Array.h" />
-    <ClInclude Include="Cutscene.h" />
-    <ClInclude Include="Hooks.h" />
-    <ClInclude Include="ImGuiImpl.h" />
-    <ClInclude Include="Lib\Fast3D\gfx_cc.h" />
-    <ClInclude Include="Lib\Fast3D\gfx_direct3d11.h" />
-    <ClInclude Include="Lib\Fast3D\gfx_direct3d12.h" />
-    <ClInclude Include="Lib\Fast3D\gfx_direct3d12_guids.h" />
-    <ClInclude Include="Lib\Fast3D\gfx_direct3d_common.h" />
-    <ClInclude Include="Lib\Fast3D\gfx_dxgi.h" />
-    <ClInclude Include="Lib\Fast3D\gfx_glx.h" />
-    <ClInclude Include="Lib\Fast3D\gfx_rendering_api.h" />
-    <ClInclude Include="Lib\Fast3D\gfx_screen_config.h" />
-    <ClInclude Include="Lib\Fast3D\gfx_window_manager_api.h" />
-    <ClInclude Include="Lib\ImGui\backends\imgui_impl_opengl3.h" />
-    <ClInclude Include="Lib\ImGui\backends\imgui_impl_sdl.h" />
-    <ClInclude Include="Lib\ImGui\imconfig.h" />
-    <ClInclude Include="Lib\ImGui\imgui.h" />
-    <ClInclude Include="Lib\ImGui\imgui_internal.h" />
-    <ClInclude Include="Lib\ImGui\imstb_rectpack.h" />
-    <ClInclude Include="Lib\ImGui\imstb_textedit.h" />
-    <ClInclude Include="Lib\ImGui\imstb_truetype.h" />
-    <ClInclude Include="Lib\stb\stb_image.h" />
-    <ClInclude Include="Matrix.h" />
-    <ClInclude Include="Path.h" />
-    <ClInclude Include="Text.h" />
-    <ClInclude Include="TextureMod.h" />
-    <ClInclude Include="Utils.h" />
-    <ClInclude Include="Vertex.h" />
-    <ClInclude Include="stox.h" />
-    <ClInclude Include="Lib\mINI\src\mini\ini.h" />
-    <ClInclude Include="Controller.h" />
-    <ClInclude Include="KeyboardController.h" />
-    <ClInclude Include="Factories\CollisionHeaderFactory.h" />
-    <ClInclude Include="Factories\DisplayListFactory.h" />
-    <ClInclude Include="Factories\MaterialFactory.h" />
-    <ClInclude Include="Factories\PlayerAnimationFactory.h" />
-    <ClInclude Include="Factories\ResourceLoader.h" />
-    <ClInclude Include="Factories\SceneFactory.h" />
-    <ClInclude Include="Factories\SkeletonFactory.h" />
-    <ClInclude Include="Factories\SkeletonLimbFactory.h" />
-    <ClInclude Include="Lib\Fast3D\gfx_opengl.h" />
-    <ClInclude Include="Lib\Fast3D\gfx_pc.h" />
-    <ClInclude Include="Lib\Fast3D\gfx_sdl.h" />
-    <ClInclude Include="Lib\StrHash64.h" />
-    <ClInclude Include="Lib\tinyxml2\tinyxml2.h" />
-    <ClInclude Include="Archive.h" />
-    <ClInclude Include="CollisionHeader.h" />
-    <ClInclude Include="ControllerAttachment.h" />
-    <ClInclude Include="DisplayList.h" />
-    <ClInclude Include="GlobalCtx2.h" />
-    <ClInclude Include="File.h" />
-    <ClInclude Include="LUSMacros.h" />
-    <ClInclude Include="Material.h" />
-    <ClInclude Include="MemoryPack.h" />
-    <ClInclude Include="Model.h" />
-    <ClInclude Include="PlayerAnimation.h" />
-    <ClInclude Include="Resource.h" />
-    <ClInclude Include="ResourceMgr.h" />
-    <ClInclude Include="RumblePack.h" />
-    <ClInclude Include="Scene.h" />
-    <ClInclude Include="Skeleton.h" />
-    <ClInclude Include="SkeletonLimb.h" />
-    <ClInclude Include="Texture.h" />
-    <ClInclude Include="WasapiAudioPlayer.h" />
-    <ClInclude Include="Window.h" />
-    <ClInclude Include="UltraController.h" />
-    <ClInclude Include="SDLController.h" />
-    <ClInclude Include="WindowShim.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

libultraship/libultraship/libultraship.vcxproj.filters

@@ -1,690 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Source Files\Lib">
-      <UniqueIdentifier>{50e27c70-2679-4f41-9127-fca2c66989ce}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Lib\Fast3D">
-      <UniqueIdentifier>{19d4557f-ea31-4405-88d5-15504070f479}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Resources">
-      <UniqueIdentifier>{12c0e217-75b9-47a5-bc2e-a2ea4e5dd992}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Controller">
-      <UniqueIdentifier>{bec61d88-f3a8-466d-b3e8-cf2e7d963f1b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Controller\Attachment">
-      <UniqueIdentifier>{ad191ad0-c9eb-495d-9d45-5d12b9e7c269}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Globals">
-      <UniqueIdentifier>{c0f07350-c627-444e-9f66-23e19407ad9a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Resources\Files">
-      <UniqueIdentifier>{2aa34c3b-6148-480f-a4fc-19c4e0f8c822}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Lib\tinyxml2">
-      <UniqueIdentifier>{6b6658ad-694d-4943-83b8-c9dbd31ca67d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Resources">
-      <UniqueIdentifier>{ef3683ce-934c-44c3-ae84-99cf22764875}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Resources\Files">
-      <UniqueIdentifier>{58ff8972-9dba-4719-aec5-6edc5e6b033d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Resources\mpq">
-      <UniqueIdentifier>{dde367c4-c14a-4bf3-b6d9-bc0d2d7d34e6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Resources\Files\Zelda">
-      <UniqueIdentifier>{1f5e0ba2-0f3f-456c-9b66-873ed62e9fbe}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Resources\Factories">
-      <UniqueIdentifier>{3376a196-8303-4613-9721-62f31e746b0d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Resources\Factories">
-      <UniqueIdentifier>{cf7f1b29-bb9a-4844-9ea5-4ac085f942e1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Lib\stb">
-      <UniqueIdentifier>{70cd453d-a4dc-4c56-b64e-e50394fd18ee}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Lib\ImGui">
-      <UniqueIdentifier>{a66f6337-5cde-4e46-8f49-a6c991ea2fe7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\CustomImpl">
-      <UniqueIdentifier>{11039197-0b49-4fb9-b9e6-56196220c9d4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Audio">
-      <UniqueIdentifier>{ccd6359f-e357-41ca-9b89-5f509dd30649}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\CustomImpl\Environment">
-      <UniqueIdentifier>{94ca4b98-cee2-48e6-a88b-68b8d2fed287}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\CustomImpl\Utils">
-      <UniqueIdentifier>{0dca2d94-45ba-4916-b03a-1dd5f949114c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\ModManager">
-      <UniqueIdentifier>{8e970531-d0cd-4c29-9800-a7e6edc92036}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\ModManager\ModModule">
-      <UniqueIdentifier>{05f273a3-f147-430e-9853-aeef59e6288d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\CustomImpl\Hooks">
-      <UniqueIdentifier>{cc8de11b-7305-4482-853f-7f0f843eef28}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Logging">
-      <UniqueIdentifier>{bd6557f1-9480-413b-b0cd-843f8efc1939}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\CustomImpl\Overlay">
-      <UniqueIdentifier>{3285ab8a-06d8-4dac-9af9-efb2a9723ab1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Lib\dr_libs">
-      <UniqueIdentifier>{db6e02cc-fc4c-4138-8219-1d281ad93ec2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Lib\nlohmann">
-      <UniqueIdentifier>{2be7c90f-ba21-455d-8a11-6f99452be15c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Lib\Mercury">
-      <UniqueIdentifier>{7e415dd2-403b-4d4d-b4f2-3e311f91db19}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Controller\InputEditor">
-      <UniqueIdentifier>{010dc29b-d1f6-4793-a4e7-4156aa4fcdd6}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Factories\MaterialFactory.cpp">
-      <Filter>Source Files\Resources\Factories</Filter>
-    </ClCompile>
-    <ClCompile Include="Factories\ResourceLoader.cpp">
-      <Filter>Source Files\Resources\Factories</Filter>
-    </ClCompile>
-    <ClCompile Include="Lib\Fast3D\gfx_opengl.cpp">
-      <Filter>Source Files\Lib\Fast3D</Filter>
-    </ClCompile>
-    <ClCompile Include="Lib\Fast3D\gfx_pc.cpp">
-      <Filter>Source Files\Lib\Fast3D</Filter>
-    </ClCompile>
-    <ClCompile Include="Lib\Fast3D\gfx_sdl2.cpp">
-      <Filter>Source Files\Lib\Fast3D</Filter>
-    </ClCompile>
-    <ClCompile Include="File.cpp">
-      <Filter>Source Files\Resources\mpq</Filter>
-    </ClCompile>
-    <ClCompile Include="Archive.cpp">
-      <Filter>Source Files\Resources\mpq</Filter>
-    </ClCompile>
-    <ClCompile Include="Lib\StrHash64.cpp">
-      <Filter>Source Files\Lib</Filter>
-    </ClCompile>
-    <ClCompile Include="Lib\tinyxml2\tinyxml2.cpp">
-      <Filter>Source Files\Lib</Filter>
-    </ClCompile>
-    <ClCompile Include="Factories\SceneFactory.cpp">
-      <Filter>Source Files\Resources\Factories</Filter>
-    </ClCompile>
-    <ClCompile Include="Factories\CollisionHeaderFactory.cpp">
-      <Filter>Source Files\Resources\Factories</Filter>
-    </ClCompile>
-    <ClCompile Include="Factories\DisplayListFactory.cpp">
-      <Filter>Source Files\Resources\Factories</Filter>
-    </ClCompile>
-    <ClCompile Include="Factories\PlayerAnimationFactory.cpp">
-      <Filter>Source Files\Resources\Factories</Filter>
-    </ClCompile>
-    <ClCompile Include="Factories\SkeletonFactory.cpp">
-      <Filter>Source Files\Resources\Factories</Filter>
-    </ClCompile>
-    <ClCompile Include="Factories\SkeletonLimbFactory.cpp">
-      <Filter>Source Files\Resources\Factories</Filter>
-    </ClCompile>
-    <ClCompile Include="Controller.cpp">
-      <Filter>Source Files\Controller</Filter>
-    </ClCompile>
-    <ClCompile Include="KeyboardController.cpp">
-      <Filter>Source Files\Controller</Filter>
-    </ClCompile>
-    <ClCompile Include="Window.cpp">
-      <Filter>Source Files\Globals</Filter>
-    </ClCompile>
-    <ClCompile Include="GlobalCtx2.cpp">
-      <Filter>Source Files\Globals</Filter>
-    </ClCompile>
-    <ClCompile Include="WindowShim.cpp">
-      <Filter>Source Files\Globals</Filter>
-    </ClCompile>
-    <ClCompile Include="ControllerAttachment.cpp">
-      <Filter>Source Files\Controller\Attachment</Filter>
-    </ClCompile>
-    <ClCompile Include="RumblePack.cpp">
-      <Filter>Source Files\Controller\Attachment</Filter>
-    </ClCompile>
-    <ClCompile Include="MemoryPack.cpp">
-      <Filter>Source Files\Controller\Attachment</Filter>
-    </ClCompile>
-    <ClCompile Include="CollisionHeader.cpp">
-      <Filter>Source Files\Resources\Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DisplayList.cpp">
-      <Filter>Source Files\Resources\Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Material.cpp">
-      <Filter>Source Files\Resources\Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Model.cpp">
-      <Filter>Source Files\Resources\Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PlayerAnimation.cpp">
-      <Filter>Source Files\Resources\Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Scene.cpp">
-      <Filter>Source Files\Resources\Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Skeleton.cpp">
-      <Filter>Source Files\Resources\Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SkeletonLimb.cpp">
-      <Filter>Source Files\Resources\Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Texture.cpp">
-      <Filter>Source Files\Resources\Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ResourceMgr.cpp">
-      <Filter>Source Files\Resources</Filter>
-    </ClCompile>
-    <ClCompile Include="stox.cpp">
-      <Filter>Source Files\Lib</Filter>
-    </ClCompile>
-    <ClCompile Include="Animation.cpp">
-      <Filter>Source Files\Resources\Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Factories\AnimationFactory.cpp">
-      <Filter>Source Files\Resources\Factories</Filter>
-    </ClCompile>
-    <ClCompile Include="Cutscene.cpp">
-      <Filter>Source Files\Resources\Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Vertex.cpp">
-      <Filter>Source Files\Resources\Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Factories\VtxFactory.cpp">
-      <Filter>Source Files\Resources\Factories</Filter>
-    </ClCompile>
-    <ClCompile Include="SDLController.cpp">
-      <Filter>Source Files\Controller</Filter>
-    </ClCompile>
-    <ClCompile Include="Factories\CutsceneFactory.cpp">
-      <Filter>Source Files\Resources\Factories</Filter>
-    </ClCompile>
-    <ClCompile Include="Path.cpp">
-      <Filter>Source Files\Resources\Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Factories\PathFactory.cpp">
-      <Filter>Source Files\Resources\Factories</Filter>
-    </ClCompile>
-    <ClCompile Include="Array.cpp">
-      <Filter>Source Files\Resources\Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Factories\ArrayFactory.cpp">
-      <Filter>Source Files\Resources\Factories</Filter>
-    </ClCompile>
-    <ClCompile Include="Resource.cpp">
-      <Filter>Source Files\Resources</Filter>
-    </ClCompile>
-    <ClCompile Include="Lib\Fast3D\gfx_cc.cpp">
-      <Filter>Source Files\Lib\Fast3D</Filter>
-    </ClCompile>
-    <ClCompile Include="Lib\Fast3D\gfx_direct3d_common.cpp">
-      <Filter>Source Files\Lib\Fast3D</Filter>
-    </ClCompile>
-    <ClCompile Include="Lib\Fast3D\gfx_direct3d11.cpp">
-      <Filter>Source Files\Lib\Fast3D</Filter>
-    </ClCompile>
-    <ClCompile Include="Lib\Fast3D\gfx_direct3d12.cpp">
-      <Filter>Source Files\Lib\Fast3D</Filter>
-    </ClCompile>
-    <ClCompile Include="Lib\Fast3D\gfx_dxgi.cpp">
-      <Filter>Source Files\Lib\Fast3D</Filter>
-    </ClCompile>
-    <ClCompile Include="Lib\Fast3D\gfx_glx.cpp">
-      <Filter>Source Files\Lib\Fast3D</Filter>
-    </ClCompile>
-    <ClCompile Include="Factories\TextureFactory.cpp">
-      <Filter>Source Files\Resources\Factories</Filter>
-    </ClCompile>
-    <ClCompile Include="Text.cpp">
-      <Filter>Source Files\Resources\Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Factories\TextFactory.cpp">
-      <Filter>Source Files\Resources\Factories</Filter>
-    </ClCompile>
-    <ClCompile Include="Factories\BlobFactory.cpp">
-      <Filter>Source Files\Resources\Factories</Filter>
-    </ClCompile>
-    <ClCompile Include="Blob.cpp">
-      <Filter>Source Files\Resources\Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Lib\stb\stb_impl.c">
-      <Filter>Source Files\Lib\stb</Filter>
-    </ClCompile>
-    <ClCompile Include="Matrix.cpp">
-      <Filter>Source Files\Resources\Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Factories\MtxFactory.cpp">
-      <Filter>Source Files\Resources\Factories</Filter>
-    </ClCompile>
-    <ClCompile Include="Lib\ImGui\imgui.cpp">
-      <Filter>Source Files\Lib\ImGui</Filter>
-    </ClCompile>
-    <ClCompile Include="Lib\ImGui\imgui_demo.cpp">
-      <Filter>Source Files\Lib\ImGui</Filter>
-    </ClCompile>
-    <ClCompile Include="Lib\ImGui\imgui_draw.cpp">
-      <Filter>Source Files\Lib\ImGui</Filter>
-    </ClCompile>
-    <ClCompile Include="Lib\ImGui\imgui_tables.cpp">
-      <Filter>Source Files\Lib\ImGui</Filter>
-    </ClCompile>
-    <ClCompile Include="Lib\ImGui\imgui_widgets.cpp">
-      <Filter>Source Files\Lib\ImGui</Filter>
-    </ClCompile>
-    <ClCompile Include="Lib\ImGui\backends\imgui_impl_opengl3.cpp">
-      <Filter>Source Files\Lib\ImGui</Filter>
-    </ClCompile>
-    <ClCompile Include="Lib\ImGui\backends\imgui_impl_sdl.cpp">
-      <Filter>Source Files\Lib\ImGui</Filter>
-    </ClCompile>
-    <ClCompile Include="ImGuiImpl.cpp">
-      <Filter>Source Files\CustomImpl</Filter>
-    </ClCompile>
-    <ClCompile Include="Console.cpp">
-      <Filter>Source Files\CustomImpl</Filter>
-    </ClCompile>
-    <ClCompile Include="Lib\ImGui\backends\imgui_impl_dx11.cpp">
-      <Filter>Source Files\Lib\ImGui</Filter>
-    </ClCompile>
-    <ClCompile Include="Lib\ImGui\backends\imgui_impl_win32.cpp">
-      <Filter>Source Files\Lib\ImGui</Filter>
-    </ClCompile>
-    <ClCompile Include="mixer.c">
-      <Filter>Source Files\Audio</Filter>
-    </ClCompile>
-    <ClCompile Include="SDLAudioPlayer.cpp">
-      <Filter>Source Files\Audio</Filter>
-    </ClCompile>
-    <ClCompile Include="Environment.cpp">
-      <Filter>Source Files\CustomImpl\Environment</Filter>
-    </ClCompile>
-    <ClCompile Include="Utils.cpp">
-      <Filter>Source Files\CustomImpl\Utils</Filter>
-    </ClCompile>
-    <ClCompile Include="WasapiAudioPlayer.cpp">
-      <Filter>Source Files\Audio</Filter>
-    </ClCompile>
-    <ClCompile Include="Cvar.cpp">
-      <Filter>Source Files\Globals</Filter>
-    </ClCompile>
-    <ClCompile Include="TextureMod.cpp">
-      <Filter>Source Files\ModManager\ModModule</Filter>
-    </ClCompile>
-    <ClCompile Include="ModManager.cpp">
-      <Filter>Source Files\ModManager</Filter>
-    </ClCompile>
-    <ClCompile Include="Hooks.cpp">
-      <Filter>Source Files\CustomImpl\Hooks</Filter>
-    </ClCompile>
-    <ClCompile Include="luslog.cpp">
-      <Filter>Source Files\Logging</Filter>
-    </ClCompile>
-    <ClCompile Include="GameSettings.cpp">
-      <Filter>Source Files\CustomImpl</Filter>
-    </ClCompile>
-    <ClCompile Include="GameOverlay.cpp">
-      <Filter>Source Files\CustomImpl\Overlay</Filter>
-    </ClCompile>
-    <ClCompile Include="Audio.cpp">
-      <Filter>Source Files\Resources\Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Factories\AudioFactory.cpp">
-      <Filter>Source Files\Resources\Factories</Filter>
-    </ClCompile>
-    <ClCompile Include="InputEditor.cpp">
-      <Filter>Source Files\Controller\InputEditor</Filter>
-    </ClCompile>
-    <ClCompile Include="ControlDeck.cpp">
-      <Filter>Source Files\Controller</Filter>
-    </ClCompile>
-    <ClCompile Include="Lib\Mercury\Mercury.cpp">
-      <Filter>Source Files\Lib\Mercury</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Lib\tinyxml2\tinyxml2.h">
-      <Filter>Source Files\Lib\tinyxml2</Filter>
-    </ClInclude>
-    <ClInclude Include="Controller.h">
-      <Filter>Source Files\Controller</Filter>
-    </ClInclude>
-    <ClInclude Include="KeyboardController.h">
-      <Filter>Source Files\Controller</Filter>
-    </ClInclude>
-    <ClInclude Include="Window.h">
-      <Filter>Source Files\Globals</Filter>
-    </ClInclude>
-    <ClInclude Include="GlobalCtx2.h">
-      <Filter>Source Files\Globals</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\mINI\src\mini\ini.h">
-      <Filter>Source Files\Lib</Filter>
-    </ClInclude>
-    <ClInclude Include="UltraController.h">
-      <Filter>Source Files\Controller</Filter>
-    </ClInclude>
-    <ClInclude Include="ControllerAttachment.h">
-      <Filter>Source Files\Controller\Attachment</Filter>
-    </ClInclude>
-    <ClInclude Include="RumblePack.h">
-      <Filter>Source Files\Controller\Attachment</Filter>
-    </ClInclude>
-    <ClInclude Include="MemoryPack.h">
-      <Filter>Source Files\Controller\Attachment</Filter>
-    </ClInclude>
-    <ClInclude Include="ResourceMgr.h">
-      <Filter>Source Files\Resources</Filter>
-    </ClInclude>
-    <ClInclude Include="Archive.h">
-      <Filter>Source Files\Resources\mpq</Filter>
-    </ClInclude>
-    <ClInclude Include="File.h">
-      <Filter>Source Files\Resources\mpq</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\Fast3D\gfx_opengl.h">
-      <Filter>Source Files\Lib\Fast3D</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\Fast3D\gfx_pc.h">
-      <Filter>Source Files\Lib\Fast3D</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\Fast3D\gfx_sdl.h">
-      <Filter>Source Files\Lib\Fast3D</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\StrHash64.h">
-      <Filter>Source Files\Lib</Filter>
-    </ClInclude>
-    <ClInclude Include="LUSMacros.h">
-      <Filter>Source Files\Globals</Filter>
-    </ClInclude>
-    <ClInclude Include="stox.h">
-      <Filter>Source Files\Lib</Filter>
-    </ClInclude>
-    <ClInclude Include="SDLController.h">
-      <Filter>Source Files\Controller</Filter>
-    </ClInclude>
-    <ClInclude Include="Resource.h">
-      <Filter>Source Files\Resources</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\Fast3D\gfx_rendering_api.h">
-      <Filter>Source Files\Lib\Fast3D</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\Fast3D\gfx_screen_config.h">
-      <Filter>Source Files\Lib\Fast3D</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\Fast3D\gfx_window_manager_api.h">
-      <Filter>Source Files\Lib\Fast3D</Filter>
-    </ClInclude>
-    <ClInclude Include="WindowShim.h">
-      <Filter>Source Files\Globals</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\Fast3D\gfx_cc.h">
-      <Filter>Source Files\Lib\Fast3D</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\Fast3D\gfx_direct3d_common.h">
-      <Filter>Source Files\Lib\Fast3D</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\Fast3D\gfx_direct3d11.h">
-      <Filter>Source Files\Lib\Fast3D</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\Fast3D\gfx_direct3d12.h">
-      <Filter>Source Files\Lib\Fast3D</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\Fast3D\gfx_direct3d12_guids.h">
-      <Filter>Source Files\Lib\Fast3D</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\Fast3D\gfx_dxgi.h">
-      <Filter>Source Files\Lib\Fast3D</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\Fast3D\gfx_glx.h">
-      <Filter>Source Files\Lib\Fast3D</Filter>
-    </ClInclude>
-    <ClInclude Include="Factories\AnimationFactory.h">
-      <Filter>Header Files\Resources\Factories</Filter>
-    </ClInclude>
-    <ClInclude Include="Factories\ArrayFactory.h">
-      <Filter>Header Files\Resources\Factories</Filter>
-    </ClInclude>
-    <ClInclude Include="Factories\BlobFactory.h">
-      <Filter>Header Files\Resources\Factories</Filter>
-    </ClInclude>
-    <ClInclude Include="Factories\CollisionHeaderFactory.h">
-      <Filter>Header Files\Resources\Factories</Filter>
-    </ClInclude>
-    <ClInclude Include="Factories\CutsceneFactory.h">
-      <Filter>Header Files\Resources\Factories</Filter>
-    </ClInclude>
-    <ClInclude Include="Factories\DisplayListFactory.h">
-      <Filter>Header Files\Resources\Factories</Filter>
-    </ClInclude>
-    <ClInclude Include="Factories\MaterialFactory.h">
-      <Filter>Header Files\Resources\Factories</Filter>
-    </ClInclude>
-    <ClInclude Include="Factories\PathFactory.h">
-      <Filter>Header Files\Resources\Factories</Filter>
-    </ClInclude>
-    <ClInclude Include="Factories\PlayerAnimationFactory.h">
-      <Filter>Header Files\Resources\Factories</Filter>
-    </ClInclude>
-    <ClInclude Include="Factories\SceneFactory.h">
-      <Filter>Header Files\Resources\Factories</Filter>
-    </ClInclude>
-    <ClInclude Include="Factories\SkeletonFactory.h">
-      <Filter>Header Files\Resources\Factories</Filter>
-    </ClInclude>
-    <ClInclude Include="Factories\SkeletonLimbFactory.h">
-      <Filter>Header Files\Resources\Factories</Filter>
-    </ClInclude>
-    <ClInclude Include="Factories\TextFactory.h">
-      <Filter>Header Files\Resources\Factories</Filter>
-    </ClInclude>
-    <ClInclude Include="Factories\TextureFactory.h">
-      <Filter>Header Files\Resources\Factories</Filter>
-    </ClInclude>
-    <ClInclude Include="Factories\VtxFactory.h">
-      <Filter>Header Files\Resources\Factories</Filter>
-    </ClInclude>
-    <ClInclude Include="Animation.h">
-      <Filter>Header Files\Resources\Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Array.h">
-      <Filter>Header Files\Resources\Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Blob.h">
-      <Filter>Header Files\Resources\Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CollisionHeader.h">
-      <Filter>Header Files\Resources\Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Cutscene.h">
-      <Filter>Header Files\Resources\Files</Filter>
-    </ClInclude>
-    <ClInclude Include="DisplayList.h">
-      <Filter>Header Files\Resources\Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Material.h">
-      <Filter>Header Files\Resources\Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Model.h">
-      <Filter>Header Files\Resources\Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Path.h">
-      <Filter>Header Files\Resources\Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PlayerAnimation.h">
-      <Filter>Header Files\Resources\Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Factories\ResourceLoader.h">
-      <Filter>Header Files\Resources\Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Scene.h">
-      <Filter>Header Files\Resources\Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Skeleton.h">
-      <Filter>Header Files\Resources\Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SkeletonLimb.h">
-      <Filter>Header Files\Resources\Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Text.h">
-      <Filter>Header Files\Resources\Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Texture.h">
-      <Filter>Header Files\Resources\Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Vertex.h">
-      <Filter>Header Files\Resources\Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\stb\stb_image.h">
-      <Filter>Source Files\Lib\stb</Filter>
-    </ClInclude>
-    <ClInclude Include="Matrix.h">
-      <Filter>Header Files\Resources\Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Factories\MtxFactory.h">
-      <Filter>Header Files\Resources\Factories</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\ImGui\imconfig.h">
-      <Filter>Source Files\Lib\ImGui</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\ImGui\imgui.h">
-      <Filter>Source Files\Lib\ImGui</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\ImGui\imgui_internal.h">
-      <Filter>Source Files\Lib\ImGui</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\ImGui\imstb_rectpack.h">
-      <Filter>Source Files\Lib\ImGui</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\ImGui\imstb_textedit.h">
-      <Filter>Source Files\Lib\ImGui</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\ImGui\imstb_truetype.h">
-      <Filter>Source Files\Lib\ImGui</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\ImGui\backends\imgui_impl_opengl3.h">
-      <Filter>Source Files\Lib\ImGui</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\ImGui\backends\imgui_impl_sdl.h">
-      <Filter>Source Files\Lib\ImGui</Filter>
-    </ClInclude>
-    <ClInclude Include="ImGuiImpl.h">
-      <Filter>Source Files\CustomImpl</Filter>
-    </ClInclude>
-    <ClInclude Include="Console.h">
-      <Filter>Source Files\CustomImpl</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\ImGui\backends\imgui_impl_dx11.h">
-      <Filter>Source Files\Lib\ImGui</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\ImGui\backends\imgui_impl_win32.h">
-      <Filter>Source Files\Lib\ImGui</Filter>
-    </ClInclude>
-    <ClInclude Include="Environment.h">
-      <Filter>Source Files\CustomImpl\Environment</Filter>
-    </ClInclude>
-    <ClInclude Include="Utils.h">
-      <Filter>Source Files\CustomImpl\Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="mixer.h">
-      <Filter>Source Files\Audio</Filter>
-    </ClInclude>
-    <ClInclude Include="abi.h">
-      <Filter>Source Files\Audio</Filter>
-    </ClInclude>
-    <ClInclude Include="AudioPlayer.h">
-      <Filter>Source Files\Audio</Filter>
-    </ClInclude>
-    <ClInclude Include="SDLAudioPlayer.h">
-      <Filter>Source Files\Audio</Filter>
-    </ClInclude>
-    <ClInclude Include="WasapiAudioPlayer.h">
-      <Filter>Source Files\Audio</Filter>
-    </ClInclude>
-    <ClInclude Include="Cvar.h">
-      <Filter>Source Files\Globals</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\stb\stb_image_write.h">
-      <Filter>Source Files\Lib\stb</Filter>
-    </ClInclude>
-    <ClInclude Include="TextureMod.h">
-      <Filter>Source Files\ModManager\ModModule</Filter>
-    </ClInclude>
-    <ClInclude Include="ModManager.h">
-      <Filter>Source Files\ModManager</Filter>
-    </ClInclude>
-    <ClInclude Include="ModModule.h">
-      <Filter>Source Files\ModManager\ModModule</Filter>
-    </ClInclude>
-    <ClInclude Include="Hooks.h">
-      <Filter>Source Files\CustomImpl\Hooks</Filter>
-    </ClInclude>
-    <ClInclude Include="luslog.h">
-      <Filter>Source Files\Logging</Filter>
-    </ClInclude>
-    <ClInclude Include="GameSettings.h">
-      <Filter>Source Files\CustomImpl</Filter>
-    </ClInclude>
-    <ClInclude Include="GameVersions.h">
-      <Filter>Source Files\Resources</Filter>
-    </ClInclude>
-    <ClInclude Include="color.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="GameOverlay.h">
-      <Filter>Source Files\CustomImpl\Overlay</Filter>
-    </ClInclude>
-    <ClInclude Include="Audio.h">
-      <Filter>Header Files\Resources\Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Factories\AudioFactory.h">
-      <Filter>Header Files\Resources\Factories</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\dr_libs\mp3.h">
-      <Filter>Source Files\Lib\dr_libs</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\dr_libs\wav.h">
-      <Filter>Source Files\Lib\dr_libs</Filter>
-    </ClInclude>
-    <ClInclude Include="InputEditor.h">
-      <Filter>Source Files\Controller\InputEditor</Filter>
-    </ClInclude>
-    <ClInclude Include="ControlDeck.h">
-      <Filter>Source Files\Controller</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\nlohmann\json.hpp">
-      <Filter>Source Files\Lib\nlohmann</Filter>
-    </ClInclude>
-    <ClInclude Include="Lib\Mercury\Mercury.h">
-      <Filter>Source Files\Lib\Mercury</Filter>
-    </ClInclude>
-    <ClInclude Include="VirtualController.h">
-      <Filter>Source Files\Controller</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>

scripts/linux/appimage/build.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release
+cmake --build build-cmake --config Release --
+
+(cd build-cmake && cpack -G External)

scripts/linux/appimage/soh.desktop

@@ -1,9 +1,9 @@
 [Desktop Entry]
 Version=1.0
 Name=SOH
-Exec=AppRun
+Exec=soh.sh
 Terminal=false
-Icon=soh
+Icon=sohIcon
 Type=Application
 Categories=Game;
 Name[en_US]=

scripts/linux/build-appimage.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-  
-curl -sSfLO "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
-chmod a+x linuxdeploy*.AppImage
-curl -sSfL https://github.com$(curl https://github.com/probonopd/go-appimage/releases | grep "mkappimage-.*-x86_64.AppImage" | head -n 1 | cut -d '"' -f 2) -o mkappimage.AppImage
-chmod a+x mkappimage.AppImage
- 
-mkdir -p AppDir/usr/bin
-cp scripts/linux/{soh.desktop,soh.sh} AppDir/
-cp soh/macosx/sohIcon.png AppDir/soh.png
-curl -sSfL https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt -o AppDir/usr/bin/gamecontrollerdb.txt
-
-mkdir -p AppDir/usr/share/applications 
-mkdir -p AppDir/usr/share/icons/hicolor/scalable/apps
-mkdir -p AppDir/usr/lib
-
-mv AppDir/soh.sh AppDir/usr/bin
-cp -r build/* AppDir/usr/bin
-
-chmod +x AppDir/usr/bin/{soh.elf,OTRGui,soh.sh}
- 
-cd AppDir && ln -s ./usr/bin/soh.sh ./AppRun && cd ..
-
-export UPD_INFO="gh-releases-zsync|HarbourMasters|Shipwright-linux|develop|SOH-Linux.AppImage.zsync"
-./linuxdeploy-x86_64.AppImage --appimage-extract-and-run  \
-  --appdir=./AppDir/          \
-  -d ./AppDir/soh.desktop     \
-  -i ./AppDir/soh.png         \
-  -e ./AppDir/usr/bin/soh.elf
-
-cd /soh
- 
-VERSION=Linux ./mkappimage.AppImage --appimage-extract-and-run ./AppDir # "SOH-Linux-x86_64.AppImage"
-mv SOH-Linux-x86_64.AppImage SOH-Linux.AppImage # Keep Original Name

scripts/linux/build.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-cd soh
-make setup -j$(nproc) OPTFLAGS=-O2 DEBUG=0
-make -j$(nproc) OPTFLAGS=-O2 DEBUG=0
-
-cd ../OTRGui
-mkdir build
-cd build
-cmake ..
-cmake --build . --config Release

scripts/switch/build.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-make setup -C soh -j$(nproc) OPTFLAGS=-O2 DEBUG=0
+cmake -H. -Bbuild-switch -GNinja -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake
-make -f Makefile.switch -j$(nproc)
+cmake --build build-switch --target soh_nro

soh/CMake/Default.cmake

@@ -0,0 +1,65 @@
+################################################################################
+# Command for variable_watch. This command issues error message, if a variable
+# is changed. If variable PROPERTY_READER_GUARD_DISABLED is TRUE nothing happens
+#     variable_watch(<variable> property_reader_guard)
+################################################################################
+function(property_reader_guard VARIABLE ACCESS VALUE CURRENT_LIST_FILE STACK)
+    if("${PROPERTY_READER_GUARD_DISABLED}")
+        return()
+    endif()
+
+    if("${ACCESS}" STREQUAL "MODIFIED_ACCESS")
+        message(FATAL_ERROR
+            " Variable ${VARIABLE} is not supposed to be changed.\n"
+            " It is used only for reading target property ${VARIABLE}.\n"
+            " Use\n"
+            "     set_target_properties(\"<target>\" PROPERTIES \"${VARIABLE}\" \"<value>\")\n"
+            " or\n"
+            "     set_target_properties(\"<target>\" PROPERTIES \"${VARIABLE}_<CONFIG>\" \"<value>\")\n"
+            " instead.\n")
+    endif()
+endfunction()
+
+################################################################################
+# Create variable <name> with generator expression that expands to value of
+# target property <name>_<CONFIG>. If property is empty or not set then property
+# <name> is used instead. Variable <name> has watcher property_reader_guard that
+# doesn't allow to edit it.
+#     create_property_reader(<name>)
+# Input:
+#     name - Name of watched property and output variable
+################################################################################
+function(create_property_reader NAME)
+    set(PROPERTY_READER_GUARD_DISABLED TRUE)
+    set(CONFIG_VALUE "$<TARGET_GENEX_EVAL:${PROPS_TARGET},$<TARGET_PROPERTY:${PROPS_TARGET},${NAME}_$<UPPER_CASE:$<CONFIG>>>>")
+    set(IS_CONFIG_VALUE_EMPTY "$<STREQUAL:${CONFIG_VALUE},>")
+    set(GENERAL_VALUE "$<TARGET_GENEX_EVAL:${PROPS_TARGET},$<TARGET_PROPERTY:${PROPS_TARGET},${NAME}>>")
+    set("${NAME}" "$<IF:${IS_CONFIG_VALUE_EMPTY},${GENERAL_VALUE},${CONFIG_VALUE}>" PARENT_SCOPE)
+    variable_watch("${NAME}" property_reader_guard)
+endfunction()
+
+################################################################################
+# Set property $<name>_${PROPS_CONFIG_U} of ${PROPS_TARGET} to <value>
+#     set_config_specific_property(<name> <value>)
+# Input:
+#     name  - Prefix of property name
+#     value - New value
+################################################################################
+function(set_config_specific_property NAME VALUE)
+    set_target_properties("${PROPS_TARGET}" PROPERTIES "${NAME}_${PROPS_CONFIG_U}" "${VALUE}")
+endfunction()
+
+################################################################################
+
+create_property_reader("TARGET_NAME")
+create_property_reader("OUTPUT_DIRECTORY")
+
+set_config_specific_property("TARGET_NAME" "${PROPS_TARGET}")
+set_config_specific_property("OUTPUT_NAME" "${TARGET_NAME}")
+set_config_specific_property("ARCHIVE_OUTPUT_NAME" "${TARGET_NAME}")
+set_config_specific_property("LIBRARY_OUTPUT_NAME" "${TARGET_NAME}")
+set_config_specific_property("RUNTIME_OUTPUT_NAME" "${TARGET_NAME}")
+
+set_config_specific_property("ARCHIVE_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}")
+set_config_specific_property("LIBRARY_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}")
+set_config_specific_property("RUNTIME_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}")

soh/CMake/DefaultCXX.cmake

@@ -0,0 +1,12 @@
+include("${CMAKE_CURRENT_LIST_DIR}/Default.cmake")
+
+set_config_specific_property("OUTPUT_DIRECTORY" "${CMAKE_SOURCE_DIR}$<$<NOT:$<STREQUAL:${CMAKE_VS_PLATFORM_NAME},Win32>>:/${CMAKE_VS_PLATFORM_NAME}>/${PROPS_CONFIG}")
+
+if(MSVC)
+    create_property_reader("DEFAULT_CXX_EXCEPTION_HANDLING")
+    create_property_reader("DEFAULT_CXX_DEBUG_INFORMATION_FORMAT")
+
+    set_target_properties("${PROPS_TARGET}" PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+    set_config_specific_property("DEFAULT_CXX_EXCEPTION_HANDLING" "/EHsc")
+    set_config_specific_property("DEFAULT_CXX_DEBUG_INFORMATION_FORMAT" "/Zi")
+endif()

soh/CMake/Linux32bit-toolchain.cmake

@@ -0,0 +1,15 @@
+# which compilers to use for C and C++
+set(CMAKE_C_COMPILER gcc)
+set(CMAKE_C_FLAGS "-m32")
+set(CMAKE_CXX_COMPILER g++)
+set(CMAKE_CXX_FLAGS -m32)
+
+# here is the target environment located
+#set(CMAKE_FIND_ROOT_PATH   /lib/i386-linux-gnu )
+
+# adjust the default behaviour of the FIND_XXX() commands:
+# search headers and libraries in the target environment, search
+# programs in the host environment
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)

soh/CMake/Utils.cmake

@@ -0,0 +1,233 @@
+# utils file for projects came from visual studio solution with cmake-converter.
+
+################################################################################
+# Wrap each token of the command with condition
+################################################################################
+cmake_policy(PUSH)
+cmake_policy(SET CMP0054 NEW)
+macro(prepare_commands)
+    unset(TOKEN_ROLE)
+    unset(COMMANDS)
+    foreach(TOKEN ${ARG_COMMANDS})
+        if("${TOKEN}" STREQUAL "COMMAND")
+            set(TOKEN_ROLE "KEYWORD")
+        elseif("${TOKEN_ROLE}" STREQUAL "KEYWORD")
+            set(TOKEN_ROLE "CONDITION")
+        elseif("${TOKEN_ROLE}" STREQUAL "CONDITION")
+            set(TOKEN_ROLE "COMMAND")
+        elseif("${TOKEN_ROLE}" STREQUAL "COMMAND")
+            set(TOKEN_ROLE "ARG")
+        endif()
+
+        if("${TOKEN_ROLE}" STREQUAL "KEYWORD")
+            list(APPEND COMMANDS "${TOKEN}")
+        elseif("${TOKEN_ROLE}" STREQUAL "CONDITION")
+            set(CONDITION ${TOKEN})
+        elseif("${TOKEN_ROLE}" STREQUAL "COMMAND")
+            list(APPEND COMMANDS "$<$<NOT:${CONDITION}>:${DUMMY}>$<${CONDITION}:${TOKEN}>")
+        elseif("${TOKEN_ROLE}" STREQUAL "ARG")
+            list(APPEND COMMANDS "$<${CONDITION}:${TOKEN}>")
+        endif()
+    endforeach()
+endmacro()
+cmake_policy(POP)
+
+################################################################################
+# Transform all the tokens to absolute paths
+################################################################################
+macro(prepare_output)
+    unset(OUTPUT)
+    foreach(TOKEN ${ARG_OUTPUT})
+        if(IS_ABSOLUTE ${TOKEN})
+            list(APPEND OUTPUT "${TOKEN}")
+        else()
+            list(APPEND OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/${TOKEN}")
+        endif()
+    endforeach()
+endmacro()
+
+################################################################################
+# Parse add_custom_command_if args.
+#
+# Input:
+#     PRE_BUILD  - Pre build event option
+#     PRE_LINK   - Pre link event option
+#     POST_BUILD - Post build event option
+#     TARGET     - Target
+#     OUTPUT     - List of output files
+#     DEPENDS    - List of files on which the command depends
+#     COMMANDS   - List of commands(COMMAND condition1 commannd1 args1 COMMAND
+#                  condition2 commannd2 args2 ...)
+# Output:
+#     OUTPUT     - Output files
+#     DEPENDS    - Files on which the command depends
+#     COMMENT    - Comment
+#     PRE_BUILD  - TRUE/FALSE
+#     PRE_LINK   - TRUE/FALSE
+#     POST_BUILD - TRUE/FALSE
+#     TARGET     - Target name
+#     COMMANDS   - Prepared commands(every token is wrapped in CONDITION)
+#     NAME       - Unique name for custom target
+#     STEP       - PRE_BUILD/PRE_LINK/POST_BUILD
+################################################################################
+function(add_custom_command_if_parse_arguments)
+    cmake_parse_arguments("ARG" "PRE_BUILD;PRE_LINK;POST_BUILD" "TARGET;COMMENT" "DEPENDS;OUTPUT;COMMANDS" ${ARGN})
+
+    if(WIN32)
+        set(DUMMY "cd.")
+    elseif(UNIX)
+        set(DUMMY "true")
+    endif()
+
+    prepare_commands()
+    prepare_output()
+
+    set(DEPENDS "${ARG_DEPENDS}")
+    set(COMMENT "${ARG_COMMENT}")
+    set(PRE_BUILD "${ARG_PRE_BUILD}")
+    set(PRE_LINK "${ARG_PRE_LINK}")
+    set(POST_BUILD "${ARG_POST_BUILD}")
+    set(TARGET "${ARG_TARGET}")
+    if(PRE_BUILD)
+        set(STEP "PRE_BUILD")
+    elseif(PRE_LINK)
+        set(STEP "PRE_LINK")
+    elseif(POST_BUILD)
+        set(STEP "POST_BUILD")
+    endif()
+    set(NAME "${TARGET}_${STEP}")
+
+    set(OUTPUT "${OUTPUT}" PARENT_SCOPE)
+    set(DEPENDS "${DEPENDS}" PARENT_SCOPE)
+    set(COMMENT "${COMMENT}" PARENT_SCOPE)
+    set(PRE_BUILD "${PRE_BUILD}" PARENT_SCOPE)
+    set(PRE_LINK "${PRE_LINK}" PARENT_SCOPE)
+    set(POST_BUILD "${POST_BUILD}" PARENT_SCOPE)
+    set(TARGET "${TARGET}" PARENT_SCOPE)
+    set(COMMANDS "${COMMANDS}" PARENT_SCOPE)
+    set(STEP "${STEP}" PARENT_SCOPE)
+    set(NAME "${NAME}" PARENT_SCOPE)
+endfunction()
+
+################################################################################
+# Add conditional custom command
+#
+# Generating Files
+# The first signature is for adding a custom command to produce an output:
+#     add_custom_command_if(
+#         <OUTPUT output1 [output2 ...]>
+#         <COMMANDS>
+#         <COMMAND condition command1 [args1...]>
+#         [COMMAND condition command2 [args2...]]
+#         [DEPENDS [depends...]]
+#         [COMMENT comment]
+#
+# Build Events
+#     add_custom_command_if(
+#         <TARGET target>
+#         <PRE_BUILD | PRE_LINK | POST_BUILD>
+#         <COMMAND condition command1 [args1...]>
+#         [COMMAND condition command2 [args2...]]
+#         [COMMENT comment]
+#
+# Input:
+#     output     - Output files the command is expected to produce
+#     condition  - Generator expression for wrapping the command
+#     command    - Command-line(s) to execute at build time.
+#     args       - Command`s args
+#     depends    - Files on which the command depends
+#     comment    - Display the given message before the commands are executed at
+#                  build time.
+#     PRE_BUILD  - Run before any other rules are executed within the target
+#     PRE_LINK   - Run after sources have been compiled but before linking the
+#                  binary
+#     POST_BUILD - Run after all other rules within the target have been
+#                  executed
+################################################################################
+function(add_custom_command_if)
+    add_custom_command_if_parse_arguments(${ARGN})
+
+    if(OUTPUT AND TARGET)
+        message(FATAL_ERROR  "Wrong syntax. A TARGET and OUTPUT can not both be specified.")
+    endif()
+
+    if(OUTPUT)
+        add_custom_command(OUTPUT ${OUTPUT}
+                           ${COMMANDS}
+                           DEPENDS ${DEPENDS}
+                           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                           COMMENT ${COMMENT})
+    elseif(TARGET)
+        if(PRE_BUILD AND NOT ${CMAKE_GENERATOR} MATCHES "Visual Studio")
+            add_custom_target(
+                ${NAME}
+                ${COMMANDS}
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                COMMENT ${COMMENT})
+            add_dependencies(${TARGET} ${NAME})
+        else()
+            add_custom_command(
+                TARGET ${TARGET}
+                ${STEP}
+                ${COMMANDS}
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                COMMENT ${COMMENT})
+        endif()
+    else()
+        message(FATAL_ERROR "Wrong syntax. A TARGET or OUTPUT must be specified.")
+    endif()
+endfunction()
+
+################################################################################
+# Use props file for a target and configs
+#     use_props(<target> <configs...> <props_file>)
+# Inside <props_file> there are following variables:
+#     PROPS_TARGET   - <target>
+#     PROPS_CONFIG   - One of <configs...>
+#     PROPS_CONFIG_U - Uppercase PROPS_CONFIG
+# Input:
+#     target      - Target to apply props file
+#     configs     - Build configurations to apply props file
+#     props_file  - CMake script
+################################################################################
+macro(use_props TARGET CONFIGS PROPS_FILE)
+    set(PROPS_TARGET "${TARGET}")
+    foreach(PROPS_CONFIG ${CONFIGS})
+        string(TOUPPER "${PROPS_CONFIG}" PROPS_CONFIG_U)
+
+        get_filename_component(ABSOLUTE_PROPS_FILE "${PROPS_FILE}" ABSOLUTE BASE_DIR "${CMAKE_CURRENT_LIST_DIR}")
+        if(EXISTS "${ABSOLUTE_PROPS_FILE}")
+            include("${ABSOLUTE_PROPS_FILE}")
+        else()
+            message(WARNING "Corresponding cmake file from props \"${ABSOLUTE_PROPS_FILE}\" doesn't exist")
+        endif()
+    endforeach()
+endmacro()
+
+################################################################################
+# Add compile options to source file
+#     source_file_compile_options(<source_file> [compile_options...])
+# Input:
+#     source_file     - Source file
+#     compile_options - Options to add to COMPILE_FLAGS property
+################################################################################
+function(source_file_compile_options SOURCE_FILE)
+    if("${ARGC}" LESS_EQUAL "1")
+        return()
+    endif()
+
+    get_source_file_property(COMPILE_OPTIONS "${SOURCE_FILE}" COMPILE_OPTIONS)
+
+    if(COMPILE_OPTIONS)
+        list(APPEND COMPILE_OPTIONS ${ARGN})
+    else()
+        set(COMPILE_OPTIONS "${ARGN}")
+    endif()
+
+    set_source_files_properties("${SOURCE_FILE}" PROPERTIES COMPILE_OPTIONS "${COMPILE_OPTIONS}")
+endfunction()
+
+################################################################################
+# Default properties of visual studio projects
+################################################################################
+set(DEFAULT_CXX_PROPS "${CMAKE_CURRENT_LIST_DIR}/DefaultCXX.cmake")

soh/Makefile

@@ -1,235 +0,0 @@
-CXX ?= g++
-CC ?= gcc
-LD := lld
-AR	:= ar
-FORMAT := clang-format-11
-ZAPD := ../ZAPDTR/ZAPD.out
-UNAME := $(shell uname)
-UNAMEM := $(shell uname -m)
-
-LIBULTRASHIP := ../libultraship/libultraship.a
-ZAPDUTILS := ../ZAPDTR/ZAPDUtils/ZAPDUtils.a
-LIBSTORM := ../StormLib/build/libstorm.a
-
-ASAN ?= 0
-DEBUG ?= 1
-OPTFLAGS ?= -O0
-LTO ?= 0
-
-# flag to save whether the compiler being used is clang or gcc by checking CXX --version
-CXX_IS_CLANG ?= $(shell $(CXX) --version | grep -c clang)
-
-WARN := \
-	-Wno-return-type \
-	-funsigned-char \
-	-fno-stack-protector -fno-common -fno-zero-initialized-in-bss -fno-strict-aliasing -fno-inline-functions -fno-inline-small-functions -ffreestanding -fwrapv \
-
-ifeq ($(CXX_IS_CLANG),1)
-	WARN += -Wno-c++11-narrowing
-endif
-
-CXXFLAGS := $(WARN) -std=c++20 -D_GNU_SOURCE -fpermissive -nostdlib $(shell pkg-config --cflags glew) $(shell sdl2-config --cflags)
-CFLAGS := $(WARN) -std=c99 -Wno-implicit-function-declaration -D_GNU_SOURCE -nostdlib $(shell pkg-config --cflags glew) $(shell sdl2-config --cflags)
-LDFLAGS :=
-
-ifneq ($(CXX_IS_CLANG),1)
-	CXXFLAGS += -no-pie
-	CFLAGS += -no-pie
-endif
-
-ifeq ($(UNAME), Linux)
-	ifeq ($(UNAMEM), x86_64)
-		CXXFLAGS += -msse2 -mfpmath=sse -mhard-float
-		CFLAGS += -msse2 -mfpmath=sse -mhard-float
-	endif
-
-	CXXFLAGS += $(shell pkg-config --cflags libpulse)
-	CFLAGS += $(shell pkg-config --cflags libpulse)
-endif
-
-CPPFLAGS := -MMD
-
-ifneq ($(DEBUG),0)
-	CXXFLAGS += -g
-	CFLAGS += -g
-endif
-
-ifneq ($(ASAN),0)
-	CXXFLAGS += -fsanitize=address
-	CFLAGS += -fsanitize=address
-	LDFLAGS += -fsanitize=address
-endif
-
-ifneq ($(LTO),0)
-	CXXFLAGS += -flto
-	CFLAGS += -flto
-	LDFLAGS += -flto
-endif
-
-ifeq ($(UNAME), Linux)
-TARGET := soh.elf
-endif
-
-ifeq ($(UNAME), Darwin)
-TARGET := soh-$(UNAMEM)
-endif
-
-INC_DIRS := $(addprefix -I, \
-	. \
-	assets \
-	build \
-	include \
-	src \
-	../ZAPDTR/ZAPDUtils \
-	../libultraship/libultraship \
-	../libultraship/libultraship/Lib/spdlog/include \
-	../libultraship/libultraship/Lib/Fast3D/U64 \
-	../libultraship/libultraship/Lib/Fast3D/U64/PR \
-)
-
-LDDIRS := $(addprefix -L, \
-	../libultraship/ \
-)
-
-LDLIBS := \
-	$(ZAPDUTILS) \
-	$(LIBSTORM) \
-	$(shell sdl2-config --libs) \
-	$(shell pkg-config --libs glew) \
-	$(addprefix -l, \
-	dl \
-	bz2 \
-	z \
-	pthread \
-	ultraship \
-)
-
-ifeq ($(UNAME), Linux)
-LDLIBS += $(shell pkg-config --libs x11 libpulse)
-endif
-
-ifeq ($(UNAME), Darwin)
-LDLIBS += \
-	$(addprefix -framework , \
-	OpenGL \
-	Foundation \
-)
-endif
-
-ASSET_BIN_DIRS := $(shell find assets/* -type d -not -path "assets/xml*")
-ASSET_FILES_XML := $(foreach dir,$(ASSET_BIN_DIRS),$(wildcard $(dir)/*.xml))
-ASSET_FILES_BIN := $(foreach dir,$(ASSET_BIN_DIRS),$(wildcard $(dir)/*.bin))
-ASSET_FILES_OUT := $(foreach f,$(ASSET_FILES_XML:.xml=.c),$f) \
-				   $(foreach f,$(ASSET_FILES_BIN:.bin=.bin.inc.c),build/$f)
-
-TEXTURE_FILES_PNG := $(foreach dir,$(ASSET_BIN_DIRS),$(wildcard $(dir)/*.png))
-TEXTURE_FILES_JPG := $(foreach dir,$(ASSET_BIN_DIRS),$(wildcard $(dir)/*.jpg))
-TEXTURE_FILES_OUT := $(foreach f,$(TEXTURE_FILES_PNG:.png=.inc.c),build/$f) \
-					 $(foreach f,$(TEXTURE_FILES_JPG:.jpg=.jpg.inc.c),build/$f) \
-
-CXX_FILES := \
-	$(shell find soh -type f -name "*.cpp")
-
-C_FILES := \
-	$(shell find soh -type f -name "*.c") \
-	$(shell find src/boot -type f -name "*.c") \
-	$(shell find src/buffers -type f -name "*.c") \
-	$(shell find src/code -type f -name "*.c") \
-	$(shell find src/overlays -type f -name "*.c") \
-	src/libultra/gu/coss.c \
-	src/libultra/gu/guLookAt.c \
-	src/libultra/gu/guLookAtHilite.c \
-	src/libultra/gu/guPerspectiveF.c \
-	src/libultra/gu/guPosition.c \
-	src/libultra/gu/guS2DInitBg.c \
-	src/libultra/gu/ortho.c \
-	src/libultra/gu/rotate.c \
-	src/libultra/gu/sins.c \
-	src/libultra/gu/sintable.c \
-	src/libultra/libc/sprintf.c
-
-O_FILES := \
-	$(C_FILES:%.c=build/%.o) \
-	$(CXX_FILES:%.cpp=build/%.o)
-D_FILES := $(O_FILES:%.o=%.d)
-
-# Apple App Bundle
-APPNAME=soh
-APPBUNDLE=$(APPNAME).app
-APPBUNDLECONTENTS=$(APPBUNDLE)/Contents
-APPBUNDLEEXE=$(APPBUNDLECONTENTS)/MacOS
-APPBUNDLERESOURCES=$(APPBUNDLECONTENTS)/Resources
-APPBUNDLEICON=$(APPBUNDLECONTENTS)/Resources
-
-# create build directory
-SRC_DIRS := $(shell find . -type d -a -not -path "*build*")
-$(shell mkdir -p $(SRC_DIRS:%=build/%))
-
-all:
-	$(MAKE) -C ../libultraship
-	$(MAKE) $(TARGET)
-
-setup:
-	cd ../OTRExporter
-	$(MAKE) mpq
-
-mpq:
-	$(MAKE) -C ../libultraship
-	$(MAKE) -C ../OTRExporter/OTRExporter
-	$(MAKE) -C ../ZAPDTR
-	rm -rf ../OTRExporter/oot.otr
-	cd ../OTRExporter && python3 extract_assets.py
-	cp ../OTRExporter/oot.otr .
-
-distclean: clean
-	$(RM) -r baserom/
-	$(MAKE) clean -C ../libultraship
-	$(MAKE) clean -C ../OTRExporter/OTRExporter
-	$(MAKE) clean -C ../ZAPDTR
-
-clean:
-	rm -rf build $(TARGET)
-
-.PHONY: all clean distclean setup mpq
-
-build/%.o: %.cpp
-	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) $(OPTFLAGS) $(INC_DIRS) $< -o $@
-
-build/%.o: %.c
-	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(OPTFLAGS) $(INC_DIRS) $< -o $@
-
-# make soh depend on libultraship
-$(TARGET): $(LIBULTRASHIP)
-
-$(TARGET): $(O_FILES)
-	$(CXX) $^ -o $@ $(LDFLAGS) $(LDDIRS) $(LDLIBS)
-
--include $(D_FILES)
-
-appbundle: macosx/$(APPNAME).icns
-	rm -rf $(APPBUNDLE)
-	mkdir $(APPBUNDLE)
-	mkdir $(APPBUNDLE)/Contents
-	mkdir $(APPBUNDLE)/Contents/MacOS
-	mkdir $(APPBUNDLE)/Contents/Resources
-	cp macosx/Info.plist $(APPBUNDLECONTENTS)/
-	cp macosx/PkgInfo $(APPBUNDLECONTENTS)/
-	cp macosx/$(APPNAME).icns $(APPBUNDLEICON)/
-	cp $(TARGET) $(APPBUNDLEEXE)/soh
-	otool -l $(TARGET) | grep -A 2 LC_RPATH  | tail -n 1 | awk '{print $2}' | dylibbundler -od -b -x  $(APPBUNDLEEXE)/soh -d $(APPBUNDLECONTENTS)/libs
-
-macosx/$(APPNAME).icns: macosx/$(APPNAME)Icon.png
-	rm -rf macosx/$(APPNAME).iconset
-	mkdir macosx/$(APPNAME).iconset
-	sips -z 16 16     macosx/$(APPNAME)Icon.png --out macosx/$(APPNAME).iconset/icon_16x16.png
-	sips -z 32 32     macosx/$(APPNAME)Icon.png --out macosx/$(APPNAME).iconset/icon_16x16@2x.png
-	sips -z 32 32     macosx/$(APPNAME)Icon.png --out macosx/$(APPNAME).iconset/icon_32x32.png
-	sips -z 64 64     macosx/$(APPNAME)Icon.png --out macosx/$(APPNAME).iconset/icon_32x32@2x.png
-	sips -z 128 128   macosx/$(APPNAME)Icon.png --out macosx/$(APPNAME).iconset/icon_128x128.png
-	sips -z 256 256   macosx/$(APPNAME)Icon.png --out macosx/$(APPNAME).iconset/icon_128x128@2x.png
-	sips -z 256 256   macosx/$(APPNAME)Icon.png --out macosx/$(APPNAME).iconset/icon_256x256.png
-	sips -z 512 512   macosx/$(APPNAME)Icon.png --out macosx/$(APPNAME).iconset/icon_256x256@2x.png
-	sips -z 512 512   macosx/$(APPNAME)Icon.png --out macosx/$(APPNAME).iconset/icon_512x512.png
-	cp macosx/$(APPNAME)Icon.png macosx/$(APPNAME).iconset/icon_512x512@2x.png
-	iconutil -c icns -o macosx/$(APPNAME).icns macosx/$(APPNAME).iconset
-	rm -r macosx/$(APPNAME).iconset

soh/Makefile.switch

@@ -1,280 +0,0 @@
-#---------------------------------------------------------------------------------
-.SUFFIXES:
-#---------------------------------------------------------------------------------
-
-ifeq ($(strip $(DEVKITPRO)),)
-$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>/devkitpro")
-endif
-
-TOPDIR ?= $(CURDIR)
-include $(DEVKITPRO)/libnx/switch_rules
-
-#---------------------------------------------------------------------------------
-# TARGET is the name of the output
-# BUILD is the directory where object files & intermediate files will be placed
-# SOURCES is a list of directories containing source code
-# DATA is a list of directories containing data files
-# INCLUDES is a list of directories containing header files
-# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional)
-#
-# NO_ICON: if set to anything, do not use icon.
-# NO_NACP: if set to anything, no .nacp file is generated.
-# APP_TITLE is the name of the app stored in the .nacp file (Optional)
-# APP_AUTHOR is the author of the app stored in the .nacp file (Optional)
-# APP_VERSION is the version of the app stored in the .nacp file (Optional)
-# APP_TITLEID is the titleID of the app stored in the .nacp file (Optional)
-# ICON is the filename of the icon (.jpg), relative to the project folder.
-#   If not set, it attempts to use one of the following (in this order):
-#     - <Project name>.jpg
-#     - icon.jpg
-#     - <libnx folder>/default_icon.jpg
-#
-# CONFIG_JSON is the filename of the NPDM config file (.json), relative to the project folder.
-#   If not set, it attempts to use one of the following (in this order):
-#     - <Project name>.json
-#     - config.json
-#   If a JSON file is provided or autodetected, an ExeFS PFS0 (.nsp) is built instead
-#   of a homebrew executable (.nro). This is intended to be used for sysmodules.
-#   NACP building is skipped as well.
-#---------------------------------------------------------------------------------
-TARGET		:=	$(notdir $(CURDIR))
-BUILD		:=	build
-SOURCES		:=	switch
-DATA		:=
-INCLUDES	:=	\
-		. \
-		assets \
-		build \
-		include \
-		src \
-		../ZAPDTR/ZAPDUtils \
-		../libultraship/libultraship \
-		../libultraship/libultraship/Lib/spdlog/include \
-		../libultraship/libultraship/Lib/Fast3D/U64 \
-		../libultraship/libultraship/Lib/Fast3D/U64/PR
-
-#-------------------------------------------------------------------------------
-# source files
-#-------------------------------------------------------------------------------
-SOURCEFILES_C := \
-	$(shell find soh -type f -name "*.c") \
-	$(shell find src/boot -type f -name "*.c") \
-	$(shell find src/buffers -type f -name "*.c") \
-	$(shell find src/code -type f -name "*.c") \
-	$(shell find src/overlays -type f -name "*.c") \
-	src/libultra/gu/coss.c \
-	src/libultra/gu/guLookAt.c \
-	src/libultra/gu/guLookAtHilite.c \
-	src/libultra/gu/guPerspectiveF.c \
-	src/libultra/gu/guPosition.c \
-	src/libultra/gu/guS2DInitBg.c \
-	src/libultra/gu/ortho.c \
-	src/libultra/gu/rotate.c \
-	src/libultra/gu/sins.c \
-	src/libultra/gu/sintable.c \
-	src/libultra/libc/sprintf.c
-
-SOURCEFILES_CPP := \
-	$(shell find soh -type f -name "*.cpp")
-#---------------------------------------------------------------------------------
-# app info
-#---------------------------------------------------------------------------------
-
-APP_TITLE	:= Ship of Harkinian
-APP_AUTHOR	:= Harbour Masters
-APP_VERSION	:= Rachael-Alfa
-
-#---------------------------------------------------------------------------------
-# options for code generation
-#---------------------------------------------------------------------------------
-ARCH	:=	-march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE -ffast-math -O3
-
-CFLAGS	:=	-ffunction-sections \
-			$(ARCH) $(DEFINES)
-
-CFLAGS	+=	$(INCLUDE) -D__SWITCH__ \
-            -DSPDLOG_NO_THREAD_ID \
-            -DSTBI_NO_THREAD_LOCALS \
-			`sdl2-config --cflags`
-
-CXXFLAGS	:= $(CFLAGS) -std=gnu++20 -fpermissive
-CFLAGS	+=	-std=gnu11
-
-# disable some warnings
-CFLAGS	+=	-Wno-incompatible-pointer-types -Wno-int-conversion \
-		-Wno-builtin-declaration-mismatch -Wno-implicit-function-declaration \
-		-Wno-stringop-overflow -Wno-discarded-qualifiers -Wno-switch-unreachable
-
-ASFLAGS	:=	-g $(ARCH)
-LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
-
-STATIC_LIBS := $(SOH_TOP_DIR)/libultraship/lib/libultraship.a \
-			$(SOH_TOP_DIR)/ZAPDTR/ZAPDUtils/lib/libZAPDUtils.a \
-			$(SOH_TOP_DIR)/ZAPDTR/ZAPDUtils/lib/libZAPDUtils.a \
-			$(SOH_TOP_DIR)/StormLib/nxbuild/libstorm.a \
-
-LIBS    := -L$(SOH_TOP_DIR)/StormLib/nxbuild/ -lultraship -lZAPDUtils -lstorm -lz -lbz2 -lnx -lglad -lglapi -ldrm_nouveau -lm `sdl2-config --libs`
-
-#---------------------------------------------------------------------------------
-# list of directories containing libraries, this must be the top level containing
-# include and lib
-#---------------------------------------------------------------------------------
-LIBDIRS	:= $(PORTLIBS) $(LIBNX) $(SOH_TOP_DIR)/StormLib/nxbuild $(SOH_TOP_DIR)/libultraship $(SOH_TOP_DIR)/ZAPDTR/ZAPDUtils
-
-#---------------------------------------------------------------------------------
-# no real need to edit anything past this point unless you need to add additional
-# rules for different file extensions
-#---------------------------------------------------------------------------------
-ifneq ($(BUILD),$(notdir $(CURDIR)))
-#---------------------------------------------------------------------------------
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-export TOPDIR	:=	$(CURDIR)
-
-export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
-			$(foreach dir,$(DATA),$(CURDIR)/$(dir)) \
-			$(foreach sf,$(SOURCEFILES_C),$(CURDIR)/$(dir $(sf))) \
-			$(foreach sf,$(SOURCEFILES_CPP),$(CURDIR)/$(dir $(sf)))
-
-export DEPSDIR	:=	$(CURDIR)/$(BUILD)
-
-CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c))) \
-			$(foreach f,$(SOURCEFILES_C),$(notdir $(f)))
-CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp))) \
-			$(foreach f,$(SOURCEFILES_CPP),$(notdir $(f)))
-SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
-BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
-
-#---------------------------------------------------------------------------------
-# use CXX for linking C++ projects, CC for standard C
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(CPPFILES)),)
-#---------------------------------------------------------------------------------
-	export LD	:=	$(CC)
-#---------------------------------------------------------------------------------
-else
-#---------------------------------------------------------------------------------
-	export LD	:=	$(CXX)
-#---------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------
-
-export OFILES_BIN	:=	$(addsuffix .o,$(BINFILES))
-export OFILES_SRC	:=	$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
-export OFILES 	:=	$(OFILES_BIN) $(OFILES_SRC)
-export HFILES_BIN	:=	$(addsuffix .h,$(subst .,_,$(BINFILES)))
-
-export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
-			$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-			-I$(CURDIR)/$(BUILD)
-
-export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib)
-
-ifeq ($(strip $(CONFIG_JSON)),)
-	jsons := $(wildcard *.json)
-	ifneq (,$(findstring $(TARGET).json,$(jsons)))
-		export APP_JSON := $(TOPDIR)/$(TARGET).json
-	else
-		ifneq (,$(findstring config.json,$(jsons)))
-			export APP_JSON := $(TOPDIR)/config.json
-		endif
-	endif
-else
-	export APP_JSON := $(TOPDIR)/$(CONFIG_JSON)
-endif
-
-ifeq ($(strip $(ICON)),)
-	icons := $(wildcard *.jpg)
-	ifneq (,$(findstring $(TARGET).jpg,$(icons)))
-		export APP_ICON := $(TOPDIR)/$(TARGET).jpg
-	else
-		ifneq (,$(findstring icon.jpg,$(icons)))
-			export APP_ICON := $(TOPDIR)/icon.jpg
-		endif
-	endif
-else
-	export APP_ICON := $(TOPDIR)/$(ICON)
-endif
-
-ifeq ($(strip $(NO_ICON)),)
-	export NROFLAGS += --icon=$(APP_ICON)
-endif
-
-ifeq ($(strip $(NO_NACP)),)
-	export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp
-endif
-
-ifneq ($(APP_TITLEID),)
-	export NACPFLAGS += --titleid=$(APP_TITLEID)
-endif
-
-ifneq ($(ROMFS),)
-	export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS)
-endif
-
-.PHONY: $(BUILD) clean all
-
-#---------------------------------------------------------------------------------
-all: $(BUILD)
-
-$(BUILD):
-	@[ -d $@ ] || mkdir -p $@
-	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.switch
-
-#---------------------------------------------------------------------------------
-clean:
-	@echo clean ...
-ifeq ($(strip $(APP_JSON)),)
-	@rm -fr $(BUILD) $(TARGET).nro $(TARGET).nacp $(TARGET).elf
-else
-	@rm -fr $(BUILD) $(TARGET).nsp $(TARGET).nso $(TARGET).npdm $(TARGET).elf
-endif
-
-
-#---------------------------------------------------------------------------------
-else
-.PHONY:	all
-
-DEPENDS	:=	$(OFILES:.o=.d)
-
-#---------------------------------------------------------------------------------
-# main targets
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(APP_JSON)),)
-
-all	:	$(OUTPUT).nro
-
-ifeq ($(strip $(NO_NACP)),)
-$(OUTPUT).nro	:	$(OUTPUT).elf $(OUTPUT).nacp
-else
-$(OUTPUT).nro	:	$(OUTPUT).elf
-endif
-
-else
-
-all	:	$(OUTPUT).nsp
-
-$(OUTPUT).nsp	:	$(OUTPUT).nso $(OUTPUT).npdm
-
-$(OUTPUT).nso	:	$(OUTPUT).elf
-
-endif
-
-$(OUTPUT).elf	:	$(OFILES) \
-			$(STATIC_LIBS)
-
-$(OFILES_SRC)	: $(HFILES_BIN)
-
-#---------------------------------------------------------------------------------
-# you need a rule like this for each extension you use as binary data
-#---------------------------------------------------------------------------------
-%.bin.o	%_bin.h :	%.bin
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	@$(bin2o)
-
--include $(DEPENDS)
-
-#---------------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------------

soh/include/functions.h

@@ -63,6 +63,9 @@ u32 Locale_IsRegionNative(void);
 #if !defined(__APPLE__) && !defined(__SWITCH__)
 void __assert(const char* exp, const char* file, s32 line);
 #endif
+#if defined(__APPLE__) && defined(NDEBUG)
+void __assert(const char* exp, const char* file, s32 line);
+#endif
 void isPrintfInit(void);
 void osSyncPrintfUnused(const char* fmt, ...);
 //void osSyncPrintf(const char* fmt, ...);
@@ -1528,6 +1531,7 @@ s32 func_800C0CB8(GlobalContext* globalCtx);
 s32 FrameAdvance_IsEnabled(GlobalContext* globalCtx);
 s32 func_800C0D34(GlobalContext* globalCtx, Actor* actor, s16* yaw);
 s32 func_800C0DB4(GlobalContext* globalCtx, Vec3f* pos);
+void Gameplay_PerformSave(GlobalContext* globalCtx);
 void PreRender_SetValuesSave(PreRender* this, u32 width, u32 height, void* fbuf, void* zbuf, void* cvg);
 void PreRender_Init(PreRender* this);
 void PreRender_SetValues(PreRender* this, u32 width, u32 height, void* fbuf, void* zbuf);

soh/include/z64effect.h

@@ -25,7 +25,8 @@ typedef struct {
     /* 0x0C */ Vec3f position;
     /* 0x18 */ Vec3s unkVelocity;
     /* 0x1E */ Vec3s unkPosition;
-} EffectSparkElement; // size = 0x24
+    /* 0x24 */ s32 epoch;
+} EffectSparkElement; // size = 0x28
 
 typedef struct {
     /* 0x000 */ Vec3s position;
@@ -117,7 +118,8 @@ typedef struct {
     /* 0x10 */ f32 startX;
     /* 0x14 */ s16 yaw;
     /* 0x16 */ s16 pitch;
-} EffectShieldParticleElement; // size = 0x18
+    /* 0x18 */ s32 epoch;
+} EffectShieldParticleElement; // size = 0x1C
 
 typedef struct {
     /* 0x00 */ u8 numElements;

soh/macosx/soh-macos.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+BUNDLE="`echo "$0" | sed -e 's/\/Contents\/MacOS\/.*//'`"
+RESOURCES="$BUNDLE/Contents/Resources"
+
+export DYLD_FRAMEWORK_PATH=$RESOURCES/Frameworks
+export DYLD_LIBRARY_PATH=$RESOURCES/bin
+
+exec "$RESOURCES/soh-macos"

soh/soh.sln

@@ -1,66 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31112.23
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soh", "soh.vcxproj", "{31348AA7-8DC5-4FA7-955F-E80855CADE9E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{78424708-1F6E-4D4B-920C-FB6D26847055} = {78424708-1F6E-4D4B-920C-FB6D26847055}
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8} = {6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908} = {A2E01C3E-D647-45D1-9788-043DEBC1A908}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libultraship", "..\libultraship\libultraship\libultraship.vcxproj", "{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZAPDUtils", "..\ZAPDTR\ZAPDUtils\ZAPDUtils.vcxproj", "{A2E01C3E-D647-45D1-9788-043DEBC1A908}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib", "..\StormLib\StormLib_vs19.vcxproj", "{78424708-1F6E-4D4B-920C-FB6D26847055}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{31348AA7-8DC5-4FA7-955F-E80855CADE9E}.Debug|x64.ActiveCfg = Debug|x64
-		{31348AA7-8DC5-4FA7-955F-E80855CADE9E}.Debug|x64.Build.0 = Debug|x64
-		{31348AA7-8DC5-4FA7-955F-E80855CADE9E}.Debug|x86.ActiveCfg = Debug|Win32
-		{31348AA7-8DC5-4FA7-955F-E80855CADE9E}.Debug|x86.Build.0 = Debug|Win32
-		{31348AA7-8DC5-4FA7-955F-E80855CADE9E}.Release|x64.ActiveCfg = Release|x64
-		{31348AA7-8DC5-4FA7-955F-E80855CADE9E}.Release|x64.Build.0 = Release|x64
-		{31348AA7-8DC5-4FA7-955F-E80855CADE9E}.Release|x86.ActiveCfg = Release|Win32
-		{31348AA7-8DC5-4FA7-955F-E80855CADE9E}.Release|x86.Build.0 = Release|Win32
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Debug|x64.ActiveCfg = Debug|x64
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Debug|x64.Build.0 = Debug|x64
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Debug|x86.ActiveCfg = Debug|Win32
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Debug|x86.Build.0 = Debug|Win32
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Release|x64.ActiveCfg = Release|x64
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Release|x64.Build.0 = Release|x64
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Release|x86.ActiveCfg = Release|Win32
-		{6DA9B521-65B7-41E2-8F8A-F0451CC18ED8}.Release|x86.Build.0 = Release|Win32
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Debug|x64.ActiveCfg = Debug|x64
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Debug|x64.Build.0 = Debug|x64
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Debug|x86.ActiveCfg = Debug|Win32
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Debug|x86.Build.0 = Debug|Win32
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Release|x64.ActiveCfg = Release|x64
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Release|x64.Build.0 = Release|x64
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Release|x86.ActiveCfg = Release|Win32
-		{A2E01C3E-D647-45D1-9788-043DEBC1A908}.Release|x86.Build.0 = Release|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x64.ActiveCfg = DebugUS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x64.Build.0 = DebugUS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x86.ActiveCfg = DebugUS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x86.Build.0 = DebugUS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x64.ActiveCfg = ReleaseUS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x64.Build.0 = ReleaseUS|x64
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x86.ActiveCfg = ReleaseUS|Win32
-		{78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x86.Build.0 = ReleaseUS|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7659B687-4D92-4865-A037-045115E1C783}
-	EndGlobalSection
-EndGlobal

soh/soh.vcxproj.user

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerWorkingDirectory>$(TargetDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerCommandArguments>
-    </LocalDebuggerCommandArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerWorkingDirectory>$(TargetDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerCommandArguments>
-    </LocalDebuggerCommandArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerWorkingDirectory>$(TargetDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ShowAllFiles>false</ShowAllFiles>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LocalDebuggerWorkingDirectory>$(TargetDir)</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-</Project>