Skip to content

Commit 78f155c

Browse files
committed
remove getmodbinariesdir & update version
1 parent 08ca809 commit 78f155c

File tree

5 files changed

+17
-7
lines changed

5 files changed

+17
-7
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Geode Changelog
22

3+
## v4.6.2
4+
* Fix Windows crashlogs not appearing (02cee65)
5+
* Unzip JIT-less iOS binaries separately from the .geode file (85fe11f)
6+
37
## v4.6.1
48
* Fix several random crashes caused by incorrect relocation code in Tuliphook
59
* Make unzip upon download iOS only (0a6d09c)

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.6.1
1+
4.6.2

loader/include/Geode/loader/Dirs.hpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,10 @@ namespace geode::dirs {
4848
* Directory where mods' unzipped binary files are stored
4949
* This is used in order to override existing unzip binaries,
5050
* such as on iOS where signing the binary is required
51+
*
52+
* TODO: enable on 4.7.0
5153
*/
52-
GEODE_DLL std::filesystem::path getModBinariesDir();
54+
// GEODE_DLL std::filesystem::path getModBinariesDir();
5355
/**
5456
* Directory where mods' config files lie
5557
*/

loader/src/loader/Dirs.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ std::filesystem::path dirs::getModPersistentDir() {
5151
return dirs::getSaveDir() / "geode-persistent";
5252
}
5353

54-
std::filesystem::path dirs::getModBinariesDir() {
55-
return dirs::getModRuntimeDir() / "binaries";
56-
}
54+
// std::filesystem::path dirs::getModBinariesDir() {
55+
// return dirs::getModRuntimeDir() / "binaries";
56+
// }

loader/src/loader/LoaderImpl.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,9 @@ Result<> Loader::Impl::unzipGeodeFile(ModMetadata metadata) {
925925

926926
// Check if there is a binary that we need to move over from the unzipped binaries dir
927927
if (this->isPatchless()) {
928-
auto src = dirs::getModBinariesDir() / metadata.getBinaryName();
928+
// TODO: enable in 4.7.0
929+
// auto src = dirs::getModBinariesDir() / metadata.getBinaryName();
930+
auto src = dirs::getModRuntimeDir() / "binaries" / metadata.getBinaryName();
929931
auto dst = tempDir / metadata.getBinaryName();
930932
if (std::filesystem::exists(src)) {
931933
std::error_code ec;
@@ -960,7 +962,9 @@ Result<> Loader::Impl::extractBinary(ModMetadata metadata) {
960962
fmt::format("Unable to find platform binary under the name \"{}\"", metadata.getBinaryName())
961963
);
962964
}
963-
GEODE_UNWRAP(unzip.extractTo(metadata.getBinaryName(), dirs::getModBinariesDir() / metadata.getBinaryName()));
965+
// TODO: enable in 4.7.0
966+
// GEODE_UNWRAP(unzip.extractTo(metadata.getBinaryName(), dirs::getModBinariesDir() / metadata.getBinaryName()));
967+
GEODE_UNWRAP(unzip.extractTo(metadata.getBinaryName(), dirs::getModRuntimeDir() / "binaries" / metadata.getBinaryName()));
964968

965969
return Ok();
966970
}

0 commit comments

Comments
 (0)