redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-23 12:57:45 +00:00
Code Activity

Use git version of libphysis, update for API changes

Browse source
This commit is contained in:
Joshua Goins 2023-05-13 17:37:30 -04:00
parent c00f25029e
commit 069ec5a5db
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
external/CMakeLists.txt vendored
View file

@ -6,7 +6,7 @@ include(FetchContent)
FetchContent_Declare( FetchContent_Declare(
Corrosion Corrosion
GIT_REPOSITORY https://github.com/corrosion-rs/corrosion.git GIT_REPOSITORY https://github.com/corrosion-rs/corrosion.git
GIT_TAG v0.2.2 GIT_TAG v0.3.5
) )
FetchContent_MakeAvailable(Corrosion) FetchContent_MakeAvailable(Corrosion)
@ -14,12 +14,13 @@ FetchContent_MakeAvailable(Corrosion)
FetchContent_Declare( FetchContent_Declare(
libphysis libphysis
GIT_REPOSITORY https://git.sr.ht/~redstrate/libphysis GIT_REPOSITORY https://git.sr.ht/~redstrate/libphysis
GIT_TAG 0.1.3 GIT_TAG main
) )
FetchContent_MakeAvailable(libphysis) 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) find_package(PkgConfig REQUIRED)
pkg_check_modules(UNSHIELD REQUIRED IMPORTED_TARGET libunshield) pkg_check_modules(UNSHIELD REQUIRED IMPORTED_TARGET libunshield)

6
launcher/core/src/gameinstaller.cpp
View file

@ -24,8 +24,10 @@ void installGame(LauncherCore& launcher, ProfileSettings& profile, const std::fu
file.write(reply->readAll()); file.write(reply->readAll());
file.close(); file.close();
physis_install_game( const std::string installDirectoryStd = installDirectory.toStdString();
installDirectory.toStdString().c_str(), (dataDir + "/ffxivsetup.exe").toStdString().c_str()); const std::string fileNameStd = file.fileName().toStdString();
physis_install_game(fileNameStd.c_str(), installDirectoryStd.c_str());
qDebug() << "Done installing to " << installDirectory << "!"; qDebug() << "Done installing to " << installDirectory << "!";

2
launcher/core/src/launchercore.cpp
View file

@ -650,7 +650,7 @@ void LauncherCore::addRegistryKey(const ProfileSettings& settings, QString key,
} }
void LauncherCore::readGameData(ProfileSettings& profile) { 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) { if (exh != nullptr) {
physis_EXD exd = physis_gamedata_read_excel_sheet(profile.gameData, "ExVersion", exh, Language::English, 0); physis_EXD exd = physis_gamedata_read_excel_sheet(profile.gameData, "ExVersion", exh, Language::English, 0);