mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-11 21:00:12 -05:00
Code Issues Projects Releases Wiki Activity

detangle zapdutils (#4096)

Browse Source
This commit is contained in:
briaguya 2024-05-01 22:47:40 -04:00 committed by GitHub
parent 715bf39d43
commit 345cef9b78
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OTRExporter

@ -1 +1 @@
Subproject commit 8815dd98f25d5f4c7a80f162e9ee1ec0a3f7dd4e Subproject commit c1e30dad1b333a6fb19a6b00b680d17e6f7d773a

2
ZAPDTR

@ -1 +1 @@
Subproject commit 9f9d0be3c914354ecabab3695581f1123c13ac20 Subproject commit 222cb8a23bd0fa8b901b1654ac5d6cc2ecb25a2e

2
libultraship

@ -1 +1 @@
Subproject commit fd603a40e0c847092d142d77f144ec44c386f323 Subproject commit 986d037126f13d83bc35daa15a115c714a6fb2b3

10
soh/CMakeLists.txt
View File

@ -92,10 +92,6 @@ if (NOT TARGET libultraship)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../libultraship ${CMAKE_BINARY_DIR}/libultraship) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../libultraship ${CMAKE_BINARY_DIR}/libultraship)
endif() endif()
if (NOT TARGET ZAPDUtils)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../ZAPDTR/ZAPDUtils ${CMAKE_BINARY_DIR}/ZAPDUtils)
endif()
if (NOT TARGET ZAPDLib) if (NOT TARGET ZAPDLib)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../ZAPDTR/ZAPD ${CMAKE_BINARY_DIR}/ZAPD) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../ZAPDTR/ZAPD ${CMAKE_BINARY_DIR}/ZAPD)
endif() endif()
@ -390,7 +386,6 @@ target_include_directories(${PROJECT_NAME} PRIVATE assets
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/libultraship/Lib/libjpeg/include/ ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/libultraship/Lib/libjpeg/include/
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/graphic/Fast3D/U64/PR ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/graphic/Fast3D/U64/PR
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/graphic ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/graphic
${CMAKE_CURRENT_SOURCE_DIR}/../ZAPDTR/ZAPDUtils
${CMAKE_CURRENT_SOURCE_DIR}/../ZAPDTR/ZAPD/resource/type ${CMAKE_CURRENT_SOURCE_DIR}/../ZAPDTR/ZAPD/resource/type
${SDL2-INCLUDE} ${SDL2-INCLUDE}
${SDL2-NET-INCLUDE} ${SDL2-NET-INCLUDE}
@ -666,7 +661,6 @@ endif()
# Dependencies # Dependencies
################################################################################ ################################################################################
add_dependencies(${PROJECT_NAME} add_dependencies(${PROJECT_NAME}
ZAPDUtils
libultraship libultraship
) )
if(NOT CMAKE_SYSTEM_NAME MATCHES "NintendoSwitch|CafeOS") if(NOT CMAKE_SYSTEM_NAME MATCHES "NintendoSwitch|CafeOS")
@ -680,7 +674,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
set(ADDITIONAL_LIBRARY_DEPENDENCIES set(ADDITIONAL_LIBRARY_DEPENDENCIES
"libultraship;" "libultraship;"
"ZAPDUtils;"
"ZAPDLib;" "ZAPDLib;"
"glu32;" "glu32;"
"SDL2::SDL2;" "SDL2::SDL2;"
@ -695,7 +688,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32") elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
set(ADDITIONAL_LIBRARY_DEPENDENCIES set(ADDITIONAL_LIBRARY_DEPENDENCIES
"libultraship;" "libultraship;"
"ZAPDUtils;"
"ZAPDLib;" "ZAPDLib;"
"glu32;" "glu32;"
"SDL2::SDL2;" "SDL2::SDL2;"
@ -713,7 +705,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch")
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
set(ADDITIONAL_LIBRARY_DEPENDENCIES set(ADDITIONAL_LIBRARY_DEPENDENCIES
"libultraship;" "libultraship;"
"ZAPDUtils;"
SDL2::SDL2 SDL2::SDL2
-lglad -lglad
Threads::Threads Threads::Threads
@ -735,7 +726,6 @@ else()
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
set(ADDITIONAL_LIBRARY_DEPENDENCIES set(ADDITIONAL_LIBRARY_DEPENDENCIES
"libultraship;" "libultraship;"
"ZAPDUtils;"
"ZAPDLib;" "ZAPDLib;"
SDL2::SDL2 SDL2::SDL2
"$<$<BOOL:${BUILD_REMOTE_CONTROL}>:SDL2_net::SDL2_net>" "$<$<BOOL:${BUILD_REMOTE_CONTROL}>:SDL2_net::SDL2_net>"

2
soh/soh/Enhancements/audio/AudioCollection.cpp
View File

@ -2,7 +2,7 @@
#include "sequence.h" #include "sequence.h"
#include "sfx.h" #include "sfx.h"
#include <vector> #include <vector>
#include <Utils/StringHelper.h> #include <utils/StringHelper.h>
#include <libultraship/bridge.h> #include <libultraship/bridge.h>
#include <libultraship/classes.h> #include <libultraship/classes.h>
#include <soh/OTRGlobals.h> #include <soh/OTRGlobals.h>

2
soh/soh/Enhancements/audio/AudioEditor.cpp
View File

@ -9,7 +9,7 @@
#include <functions.h> #include <functions.h>
#include "../randomizer/3drando/random.hpp" #include "../randomizer/3drando/random.hpp"
#include "../../OTRGlobals.h" #include "../../OTRGlobals.h"
#include <Utils/StringHelper.h> #include <utils/StringHelper.h>
#include "../../UIWidgets.hpp" #include "../../UIWidgets.hpp"
#include "AudioCollection.h" #include "AudioCollection.h"
#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/game-interactor/GameInteractor.h"

2
soh/soh/Enhancements/controls/SohInputEditorWindow.cpp
View File

@ -1,5 +1,5 @@
#include "SohInputEditorWindow.h" #include "SohInputEditorWindow.h"
#include <Utils/StringHelper.h> #include <utils/StringHelper.h>
#include "soh/OTRGlobals.h" #include "soh/OTRGlobals.h"
#include "../../UIWidgets.hpp" #include "../../UIWidgets.hpp"
#include "z64.h" #include "z64.h"

2
soh/soh/Enhancements/debugconsole.cpp
View File

@ -13,7 +13,7 @@
#define Path _Path #define Path _Path
#define PATH_HACK #define PATH_HACK
#include <Utils/StringHelper.h> #include <utils/StringHelper.h>
#include <Window.h> #include <Window.h>
#include <Context.h> #include <Context.h>

2
soh/soh/Extractor/Extract.cpp
View File

@ -6,7 +6,7 @@
#endif #endif
#include "Extract.h" #include "Extract.h"
#include "portable-file-dialogs.h" #include "portable-file-dialogs.h"
#include <Utils/BitConverter.h> #include <utils/binarytools/BitConverter.h>
#include "variables.h" #include "variables.h"
#ifdef unix #ifdef unix

2
soh/soh/OTRGlobals.cpp
View File

@ -47,7 +47,7 @@
#include "z64.h" #include "z64.h"
#include "macros.h" #include "macros.h"
#include "Fonts.h" #include "Fonts.h"
#include <Utils/StringHelper.h> #include <utils/StringHelper.h>
#include "Enhancements/custom-message/CustomMessageManager.h" #include "Enhancements/custom-message/CustomMessageManager.h"
#include "Enhancements/presets.h" #include "Enhancements/presets.h"
#include "util.h" #include "util.h"

2
soh/soh/z_message_OTR.cpp
View File

@ -1,7 +1,7 @@
#include "OTRGlobals.h" #include "OTRGlobals.h"
#include <libultraship/libultraship.h> #include <libultraship/libultraship.h>
#include "soh/resource/type/Scene.h" #include "soh/resource/type/Scene.h"
#include <Utils/StringHelper.h> #include <utils/StringHelper.h>
#include "global.h" #include "global.h"
#include "vt.h" #include "vt.h"
#include "soh/resource/type/Text.h" #include "soh/resource/type/Text.h"

2
soh/soh/z_play_otr.cpp
View File

@ -1,7 +1,7 @@
#include "OTRGlobals.h" #include "OTRGlobals.h"
#include <libultraship/libultraship.h> #include <libultraship/libultraship.h>
#include "soh/resource/type/Scene.h" #include "soh/resource/type/Scene.h"
#include <Utils/StringHelper.h> #include <utils/StringHelper.h>
#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/game-interactor/GameInteractor.h"
#include "global.h" #include "global.h"
#include "vt.h" #include "vt.h"

2
soh/soh/z_scene_otr.cpp
View File

@ -1,7 +1,7 @@
#include "OTRGlobals.h" #include "OTRGlobals.h"
#include <libultraship/libultraship.h> #include <libultraship/libultraship.h>
#include "soh/resource/type/Scene.h" #include "soh/resource/type/Scene.h"
#include <Utils/StringHelper.h> #include <utils/StringHelper.h>
#include "global.h" #include "global.h"
#include "vt.h" #include "vt.h"
#include "soh/resource/type/CollisionHeader.h" #include "soh/resource/type/CollisionHeader.h"