Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move to FP13 compatibility #46

Merged
merged 4 commits into from
Jul 14, 2024
Merged

Move to FP13 compatibility #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd7e293
Update WIP deps
oblivioncth Jul 9, 2024
157d892
Add missing Core5Compat Qt component for find_package(Qt6)
oblivioncth Jul 10, 2024
fb77a0f
Match libfp updates
oblivioncth Jul 14, 2024
3de01e3
Bump target FP version
oblivioncth Jul 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ project(FIL

# Get helper scripts
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/FetchOBCMake.cmake)
fetch_ob_cmake("v0.3.4")
fetch_ob_cmake("2356fb3e6f2d5710045cd9dbe66187856418d8ca")

# Initialize project according to standard rules
include(OB/Project)
ob_standard_project_setup()

# Additional Project Variables
set(TARGET_FP_VERSION_PREFIX 12.1)
set(TARGET_FP_VERSION_PREFIX 13.0)

# Configuration options
# Handled by fetched libs, but set this here formally since they aren't part of the main project
Expand All @@ -40,6 +40,7 @@ enable_language("RC")

set(FIL_QT_COMPONENTS
Core
Core5Compat
Gui
Network
Widgets
Expand All @@ -64,18 +65,18 @@ set(FIL_QX_COMPONENTS

include(OB/FetchQx)
ob_fetch_qx(
REF "v0.5.6"
REF "5dc3b3440442408456a867eb901185e5a281d4af"
COMPONENTS
${FIL_QX_COMPONENTS}
)

# Fetch libfp (build and import from source)
include(OB/Fetchlibfp)
ob_fetch_libfp("v0.5.2")
ob_fetch_libfp("086051bca750adac3178a86fc47b61f1770d8b40")

# Fetch CLIFp (build and import from source)
include(OB/FetchCLIFp)
ob_fetch_clifp("v0.9.10")
ob_fetch_clifp("2718cba5adeb98e65f8d9c5f24ee484e94f9a8b5")

# TODO: The shared build of this is essentially useless as only the CLIFp executable
# is deployed, which only works if it's statically linked. There isn't a simple way
Expand Down
4 changes: 2 additions & 2 deletions app/src/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ void MainWindow::initializeFrontendHelpActions()

bool MainWindow::installMatchesTargetSeries(const Fp::Install& fpInstall)
{
Qx::VersionNumber fpVersion = fpInstall.version();
Qx::VersionNumber fpVersion = fpInstall.versionInfo()->version();
return TARGET_FP_VERSION_PREFIX.isPrefixOf(fpVersion) ||
TARGET_FP_VERSION_PREFIX.normalized() == fpVersion; // Accounts for if FP doesn't use a trailing zero for major releases
}
Expand Down Expand Up @@ -239,7 +239,7 @@ void MainWindow::validateInstall(const QString& installPath, InstallType install
mFlashpointInstall = std::make_shared<Fp::Install>(installPath, true);
if(mFlashpointInstall->isValid())
{
ui->label_flashpointVersion->setText(mFlashpointInstall->nameVersionString());
ui->label_flashpointVersion->setText(mFlashpointInstall->versionInfo()->fullString());
if(installMatchesTargetSeries(*mFlashpointInstall))
ui->icon_flashpoint_install_status->setPixmap(QPixmap(u":/ui/Valid_Install.png"_s));
else
Expand Down