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

Add physis dependency

Browse source
This commit is contained in:
Joshua Goins 2022-07-20 11:44:41 -04:00
parent 0c08d59fd3
commit 01e05ca887
3 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
external/CMakeLists.txt vendored
View file

@ -1 +1,23 @@
add_subdirectory(libxiv) add_subdirectory(libxiv)
include(FetchContent)
FetchContent_Declare(
Corrosion
GIT_REPOSITORY https://github.com/corrosion-rs/corrosion.git
GIT_TAG v0.2.1
)
FetchContent_MakeAvailable(Corrosion)
FetchContent_Declare(
libphysis
GIT_REPOSITORY https://git.sr.ht/~redstrate/libphysis
GIT_TAG main
)
FetchContent_MakeAvailable(libphysis)
corrosion_import_crate(MANIFEST_PATH ${libphysis_SOURCE_DIR}/Cargo.toml)
target_include_directories(physis INTERFACE ${libphysis_SOURCE_DIR}/target/public)

1
launcher/core/CMakeLists.txt
View file

@ -39,6 +39,7 @@ target_include_directories(astra_core PUBLIC
include) include)
target_link_libraries(astra_core PUBLIC target_link_libraries(astra_core PUBLIC
libxiv libxiv
physis
${LIBRARIES} ${LIBRARIES}
Qt5::Core Qt5::Core
Qt5::Network Qt5::Network

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

@ -19,6 +19,7 @@
#include <QRegularExpressionMatch> #include <QRegularExpressionMatch>
#include <algorithm> #include <algorithm>
#include <QTcpServer> #include <QTcpServer>
#include <physis.hpp>
#include "launchercore.h" #include "launchercore.h"
#include "sapphirelauncher.h" #include "sapphirelauncher.h"
@ -500,7 +501,7 @@ void LauncherCore::readGameVersion() {
profile->bootVersion = readVersion(profile->gamePath + "/boot/ffxivboot.ver"); profile->bootVersion = readVersion(profile->gamePath + "/boot/ffxivboot.ver");
auto sqpackDirectories = QDir(profile->gamePath + "/game/sqpack/").entryList(QDir::Filter::Dirs | QDir::Filter::NoDotAndDotDot); auto sqpackDirectories = QDir(profile->gamePath + "/game/sqpack/").entryList(QDir::Filter::Dirs | QDir::Filter::NoDotAndDotDot);
profile->gameVersions.resize(sqpackDirectories.size()); profile->gameVersions.resize(sqpackDirectories.size() + 1);
for(auto dir : sqpackDirectories) { for(auto dir : sqpackDirectories) {
if(dir.contains("ex") || dir == "ffxiv") { if(dir.contains("ex") || dir == "ffxiv") {