mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 23:13:19 +00:00
shipwright: 7.0.2 -> 7.1.1
https://www.shipofharkinian.com/changelog#sulu-bravo-7-1-1
This commit is contained in:
Yanis Guaye
parent
1c27231100
commit
b352bcbace
@ -95,13 +95,13 @@ assert (lib.assertMsg (oot.enable || ootMq.enable) "At least one of 'oot.enable'
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "shipwright";
|
||||
version = "7.0.2";
|
||||
version = "7.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "harbourmasters";
|
||||
repo = "shipwright";
|
||||
rev = version;
|
||||
hash = "sha256-2VCcczGWSvp6hk8FTA1/T1E1KkrrvWyOdkEw8eiYYnY=";
|
||||
hash = "sha256-zgxJj65wKsQWvVxeCspyHG9YqoYqZxd6GrYptOA8Byk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -137,12 +137,6 @@ stdenv.mkDerivation rec {
|
||||
libpng
|
||||
];
|
||||
|
||||
patches = [
|
||||
# These patches make soh look inside the nix store for data files (the controller database and the OTRs)
|
||||
./lus-install-paths.patch
|
||||
./soh-misc-otr-patches.patch
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib"
|
||||
];
|
||||
|
||||
@ -1,146 +0,0 @@
|
||||
Submodule libultraship contains modified content
|
||||
diff --git a/libultraship/src/CMakeLists.txt b/libultraship/src/CMakeLists.txt
|
||||
index f95c3c9..5b967b9 100644
|
||||
--- a/libultraship/src/CMakeLists.txt
|
||||
+++ b/libultraship/src/CMakeLists.txt
|
||||
@@ -74,7 +74,10 @@ target_sources(libultraship PRIVATE ${Source_Files__Controller})
|
||||
|
||||
#=================== Core ===================
|
||||
|
||||
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/install_config.h.in ${CMAKE_BINARY_DIR}/install_config.h @ONLY)
|
||||
+
|
||||
set(Source_Files__Core
|
||||
+ ${CMAKE_BINARY_DIR}/install_config.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/core/Window.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/core/Window.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/core/ConsoleVariable.h
|
||||
@@ -329,7 +332,7 @@ endif()
|
||||
#=================== Packages & Includes ===================
|
||||
|
||||
target_include_directories(libultraship
|
||||
- PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../extern
|
||||
+ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../extern ${CMAKE_BINARY_DIR}
|
||||
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../extern/spdlog/include ${CMAKE_CURRENT_SOURCE_DIR}/../extern/stb
|
||||
)
|
||||
|
||||
diff --git a/libultraship/src/core/Context.cpp b/libultraship/src/core/Context.cpp
|
||||
index 776333e..fa546e6 100644
|
||||
--- a/libultraship/src/core/Context.cpp
|
||||
+++ b/libultraship/src/core/Context.cpp
|
||||
@@ -14,6 +14,7 @@
|
||||
#elif defined(__WIIU__)
|
||||
#include "port/wiiu/WiiUImpl.h"
|
||||
#endif
|
||||
+#include "install_config.h"
|
||||
|
||||
namespace LUS {
|
||||
std::weak_ptr<Context> Context::mContext;
|
||||
@@ -281,6 +282,18 @@ std::string Context::GetShortName() {
|
||||
}
|
||||
|
||||
std::string Context::GetAppBundlePath() {
|
||||
+#ifdef CMAKE_INSTALL_PREFIX
|
||||
+ static const std::string fpath = CMAKE_INSTALL_PREFIX;
|
||||
+ static int exists = -1;
|
||||
+
|
||||
+ if (exists == -1) {
|
||||
+ exists = fpath.size() > 0 && std::filesystem::is_directory(fpath);
|
||||
+ }
|
||||
+
|
||||
+ if (exists) {
|
||||
+ return fpath;
|
||||
+ }
|
||||
+#else
|
||||
#ifdef __APPLE__
|
||||
FolderManager folderManager;
|
||||
return folderManager.getMainBundlePath();
|
||||
@@ -291,6 +304,7 @@ std::string Context::GetAppBundlePath() {
|
||||
if (fpath != NULL) {
|
||||
return std::string(fpath);
|
||||
}
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
return ".";
|
||||
@@ -304,6 +318,13 @@ std::string Context::GetAppDirectoryPath() {
|
||||
}
|
||||
#endif
|
||||
|
||||
+ char *prefpath = SDL_GetPrefPath(NULL, "soh");
|
||||
+ if (prefpath != NULL) {
|
||||
+ std::string ret(prefpath);
|
||||
+ SDL_free(prefpath);
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
return ".";
|
||||
}
|
||||
|
||||
@@ -315,7 +336,24 @@ std::string Context::GetPathRelativeToAppDirectory(const char* path) {
|
||||
return GetAppDirectoryPath() + "/" + path;
|
||||
}
|
||||
|
||||
+std::string Context::FindFileFromAllAppDirectories(const char* path) {
|
||||
+ std::string fpath;
|
||||
+
|
||||
+ // app configuration dir (eg. ~/.local/share)
|
||||
+ fpath = GetPathRelativeToAppDirectory(path);
|
||||
+ if (std::filesystem::exists(fpath)) {
|
||||
+ return fpath;
|
||||
+ }
|
||||
+ // app install dir (eg. /usr/)
|
||||
+ fpath = GetPathRelativeToAppBundle(path);
|
||||
+ if (std::filesystem::exists(fpath)) {
|
||||
+ return fpath;
|
||||
+ }
|
||||
+ // current dir
|
||||
+ return "./" + std::string(path);
|
||||
+}
|
||||
+
|
||||
bool Context::DoesOtrFileExist() {
|
||||
return mOtrFileExists;
|
||||
}
|
||||
-} // namespace LUS
|
||||
\ No newline at end of file
|
||||
+} // namespace LUS
|
||||
diff --git a/libultraship/src/core/Context.h b/libultraship/src/core/Context.h
|
||||
index c32f4dd..a9f1639 100644
|
||||
--- a/libultraship/src/core/Context.h
|
||||
+++ b/libultraship/src/core/Context.h
|
||||
@@ -26,6 +26,7 @@ class Context {
|
||||
static std::string GetAppDirectoryPath();
|
||||
static std::string GetPathRelativeToAppDirectory(const char* path);
|
||||
static std::string GetPathRelativeToAppBundle(const char* path);
|
||||
+ static std::string FindFileFromAllAppDirectories(const char* path);
|
||||
|
||||
Context(std::string name, std::string shortName);
|
||||
|
||||
diff --git a/libultraship/src/core/libultra/os.cpp b/libultraship/src/core/libultra/os.cpp
|
||||
index 9058fe1..7d9387e 100644
|
||||
--- a/libultraship/src/core/libultra/os.cpp
|
||||
+++ b/libultraship/src/core/libultra/os.cpp
|
||||
@@ -21,8 +21,8 @@ int32_t osContInit(OSMesgQueue* mq, uint8_t* controllerBits, OSContStatus* statu
|
||||
}
|
||||
|
||||
#ifndef __SWITCH__
|
||||
- const char* controllerDb = "gamecontrollerdb.txt";
|
||||
- int mappingsAdded = SDL_GameControllerAddMappingsFromFile(controllerDb);
|
||||
+ std::string controllerDb = LUS::Context::GetPathRelativeToAppBundle("gamecontrollerdb.txt");
|
||||
+ int mappingsAdded = SDL_GameControllerAddMappingsFromFile(controllerDb.c_str());
|
||||
if (mappingsAdded >= 0) {
|
||||
SPDLOG_INFO("Added SDL game controllers from \"{}\" ({})", controllerDb, mappingsAdded);
|
||||
} else {
|
||||
@@ -90,4 +90,4 @@ int32_t osRecvMesg(OSMesgQueue* mq, OSMesg* msg, int32_t flag) {
|
||||
mq->validCount--;
|
||||
return 0;
|
||||
}
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff --git a/libultraship/src/install_config.h.in b/libultraship/src/install_config.h.in
|
||||
new file mode 100644
|
||||
index 0000000..029753c
|
||||
--- /dev/null
|
||||
+++ b/libultraship/src/install_config.h.in
|
||||
@@ -0,0 +1 @@
|
||||
+#cmakedefine CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
|
||||
@ -1,119 +0,0 @@
|
||||
diff --git a/soh/soh/Extractor/Extract.cpp b/soh/soh/Extractor/Extract.cpp
|
||||
index a9ddc4f4..f6d45fe2 100644
|
||||
--- a/soh/soh/Extractor/Extract.cpp
|
||||
+++ b/soh/soh/Extractor/Extract.cpp
|
||||
@@ -490,28 +490,27 @@ const char* Extractor::GetZapdVerStr() const {
|
||||
|
||||
extern "C" int zapd_main(int argc, char** argv);
|
||||
|
||||
-bool Extractor::CallZapd() {
|
||||
+bool Extractor::CallZapd(std::string &assetPath) {
|
||||
constexpr int argc = 16;
|
||||
- char xmlPath[100];
|
||||
- char confPath[100];
|
||||
std::array<const char*, argc> argv;
|
||||
const char* version = GetZapdVerStr();
|
||||
|
||||
- snprintf(xmlPath, 100, "assets/extractor/xmls/%s", version);
|
||||
- snprintf(confPath, 100, "assets/extractor/Config_%s.xml", version);
|
||||
+ std::string xmlPath = assetPath + "/assets/extractor/xmls/" + version;
|
||||
+ std::string confPath = assetPath + "/assets/extractor/Config_" + version + ".xml";
|
||||
+ std::string fileListsPath = assetPath + "/assets/extractor/filelists";
|
||||
|
||||
argv[0] = "ZAPD";
|
||||
argv[1] = "ed";
|
||||
argv[2] = "-i";
|
||||
- argv[3] = xmlPath;
|
||||
+ argv[3] = xmlPath.c_str();
|
||||
argv[4] = "-b";
|
||||
argv[5] = mCurrentRomPath.c_str();
|
||||
argv[6] = "-fl";
|
||||
- argv[7] = "assets/extractor/filelists";
|
||||
+ argv[7] = fileListsPath.c_str();
|
||||
argv[8] = "-gsf";
|
||||
- argv[9] = "1";
|
||||
+ argv[9] = "0";
|
||||
argv[10] = "-rconf";
|
||||
- argv[11] = confPath;
|
||||
+ argv[11] = confPath.c_str();
|
||||
argv[12] = "-se";
|
||||
argv[13] = "OTR";
|
||||
argv[14] = "--otrfile";
|
||||
diff --git a/soh/soh/Extractor/Extract.h b/soh/soh/Extractor/Extract.h
|
||||
index e4eb2e5b..3c95b025 100644
|
||||
--- a/soh/soh/Extractor/Extract.h
|
||||
+++ b/soh/soh/Extractor/Extract.h
|
||||
@@ -57,7 +57,7 @@ class Extractor {
|
||||
bool IsMasterQuest() const;
|
||||
|
||||
bool Run(RomSearchMode searchMode = RomSearchMode::Both);
|
||||
- bool CallZapd();
|
||||
+ bool CallZapd(std::string& assetPath);
|
||||
const char* GetZapdStr();
|
||||
};
|
||||
#endif
|
||||
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
|
||||
index d192de6a..cc516085 100644
|
||||
--- a/soh/soh/OTRGlobals.cpp
|
||||
+++ b/soh/soh/OTRGlobals.cpp
|
||||
@@ -201,11 +201,11 @@ const char* constCameraStrings[] = {
|
||||
|
||||
OTRGlobals::OTRGlobals() {
|
||||
std::vector<std::string> OTRFiles;
|
||||
- std::string mqPath = LUS::Context::GetPathRelativeToAppDirectory("oot-mq.otr");
|
||||
+ std::string mqPath = LUS::Context::FindFileFromAllAppDirectories("oot-mq.otr");
|
||||
if (std::filesystem::exists(mqPath)) {
|
||||
OTRFiles.push_back(mqPath);
|
||||
}
|
||||
- std::string ootPath = LUS::Context::GetPathRelativeToAppDirectory("oot.otr");
|
||||
+ std::string ootPath = LUS::Context::FindFileFromAllAppDirectories("oot.otr");
|
||||
if (std::filesystem::exists(ootPath)) {
|
||||
OTRFiles.push_back(ootPath);
|
||||
}
|
||||
@@ -213,7 +213,7 @@ OTRGlobals::OTRGlobals() {
|
||||
if (std::filesystem::exists(sohOtrPath)) {
|
||||
OTRFiles.push_back(sohOtrPath);
|
||||
}
|
||||
- std::string patchesPath = LUS::Context::GetPathRelativeToAppDirectory("mods");
|
||||
+ std::string patchesPath = LUS::Context::FindFileFromAllAppDirectories("mods");
|
||||
if (patchesPath.length() > 0 && std::filesystem::exists(patchesPath)) {
|
||||
if (std::filesystem::is_directory(patchesPath)) {
|
||||
for (const auto& p : std::filesystem::recursive_directory_iterator(patchesPath)) {
|
||||
@@ -709,8 +709,10 @@ extern "C" void OTRExtScanner() {
|
||||
|
||||
extern "C" void InitOTR() {
|
||||
#if not defined (__SWITCH__) && not defined(__WIIU__)
|
||||
- if (!std::filesystem::exists(LUS::Context::GetPathRelativeToAppDirectory("oot-mq.otr")) &&
|
||||
- !std::filesystem::exists(LUS::Context::GetPathRelativeToAppDirectory("oot.otr"))){
|
||||
+ if (!std::filesystem::exists(LUS::Context::FindFileFromAllAppDirectories("oot-mq.otr")) &&
|
||||
+ !std::filesystem::exists(LUS::Context::FindFileFromAllAppDirectories("oot.otr"))){
|
||||
+ std::string exporterAssetPath = LUS::Context::GetAppBundlePath();
|
||||
+
|
||||
bool generatedOtrIsMQ = false;
|
||||
if (Extractor::ShowYesNoBox("No OTR Files", "No OTR files found. Generate one now?") == IDYES) {
|
||||
Extractor extract;
|
||||
@@ -718,7 +720,7 @@ extern "C" void InitOTR() {
|
||||
Extractor::ShowErrorBox("Error", "An error occured, no OTR file was generated. Exiting...");
|
||||
exit(1);
|
||||
}
|
||||
- extract.CallZapd();
|
||||
+ extract.CallZapd(exporterAssetPath);
|
||||
generatedOtrIsMQ = extract.IsMasterQuest();
|
||||
} else {
|
||||
exit(1);
|
||||
@@ -728,7 +730,7 @@ extern "C" void InitOTR() {
|
||||
if (!extract.Run(generatedOtrIsMQ ? RomSearchMode::Vanilla : RomSearchMode::MQ)) {
|
||||
Extractor::ShowErrorBox("Error", "An error occured, an OTR file may have been generated by a different step. Continuing...");
|
||||
} else {
|
||||
- extract.CallZapd();
|
||||
+ extract.CallZapd(exporterAssetPath);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2018,4 +2020,4 @@ extern "C" void Gfx_RegisterBlendedTexture(const char* name, u8* mask, u8* repla
|
||||
|
||||
extern "C" void SaveManager_ThreadPoolWait() {
|
||||
SaveManager::Instance->ThreadPoolWait();
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
Loading…
Reference in New Issue
Block a user