M external/CMakeLists.txt => external/CMakeLists.txt +4 -3
@@ 6,7 6,7 @@ include(FetchContent)
FetchContent_Declare(
Corrosion
GIT_REPOSITORY https://github.com/corrosion-rs/corrosion.git
- GIT_TAG v0.2.2
+ GIT_TAG v0.3.5
)
FetchContent_MakeAvailable(Corrosion)
@@ 14,12 14,13 @@ FetchContent_MakeAvailable(Corrosion)
FetchContent_Declare(
libphysis
GIT_REPOSITORY https://git.sr.ht/~redstrate/libphysis
- GIT_TAG 0.1.3
+ GIT_TAG main
)
FetchContent_MakeAvailable(libphysis)
-corrosion_import_crate(MANIFEST_PATH ${libphysis_SOURCE_DIR}/Cargo.toml)
+corrosion_import_crate(MANIFEST_PATH ${libphysis_SOURCE_DIR}/Cargo.toml
+ FEATURES game_install)
find_package(PkgConfig REQUIRED)
pkg_check_modules(UNSHIELD REQUIRED IMPORTED_TARGET libunshield)
M launcher/core/src/gameinstaller.cpp => launcher/core/src/gameinstaller.cpp +4 -2
@@ 24,8 24,10 @@ void installGame(LauncherCore& launcher, ProfileSettings& profile, const std::fu
file.write(reply->readAll());
file.close();
- physis_install_game(
- installDirectory.toStdString().c_str(), (dataDir + "/ffxivsetup.exe").toStdString().c_str());
+ const std::string installDirectoryStd = installDirectory.toStdString();
+ const std::string fileNameStd = file.fileName().toStdString();
+
+ physis_install_game(fileNameStd.c_str(), installDirectoryStd.c_str());
qDebug() << "Done installing to " << installDirectory << "!";
M launcher/core/src/launchercore.cpp => launcher/core/src/launchercore.cpp +1 -1
@@ 650,7 650,7 @@ void LauncherCore::addRegistryKey(const ProfileSettings& settings, QString key,
}
void LauncherCore::readGameData(ProfileSettings& profile) {
- EXH* exh = physis_gamedata_read_excel_sheet_header(profile.gameData, "ExVersion");
+ physis_EXH* exh = physis_gamedata_read_excel_sheet_header(profile.gameData, "ExVersion");
if (exh != nullptr) {
physis_EXD exd = physis_gamedata_read_excel_sheet(profile.gameData, "ExVersion", exh, Language::English, 0);