Merge pull request #19 from oblivioncth/dev

Merge to master for v0.4
oblivioncth · Jul 24, 2023 · fc10585 · fc10585
2 parents 21941f6 + 87aaaa1
commit fc10585
Show file tree

Hide file tree

Showing 26 changed files with 1,643 additions and 1,489 deletions.
diff --git a/.github/workflows/build-libfp-linux.yml b/.github/workflows/build-libfp-linux.yml
@@ -18,14 +18,9 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, ubuntu-22.04]
-        compiler: [gcc, clang]
+        compiler: [clang]
         lib_linkage: [shared, static]
         include:
-          - os: ubuntu-20.04
-            compiler: gcc
-            c_comp: gcc-10
-            cxx_comp: g++-10
-            qt_comp: clang12
           - os: ubuntu-20.04
             compiler: clang
             c_comp: clang-12
@@ -36,6 +31,13 @@ jobs:
             c_comp: gcc-12
             cxx_comp: g++-12
             qt_comp: clang14
+            lib_linkage: shared
+          - os: ubuntu-22.04
+            compiler: gcc
+            c_comp: gcc-12
+            cxx_comp: g++-12
+            qt_comp: clang14
+            lib_linkage: static
           - os: ubuntu-22.04
             compiler: clang
             c_comp: clang-14
@@ -58,7 +60,7 @@ jobs:
     - name: Install Qt (custom build)
       uses: oblivioncth/actions/general/install-and-cache-qt-from-ffynnon@dev
       with:
-        version: 6.4.2
+        version: 6.5.1
         os: linux
         compiler: ${{ matrix.qt_comp }}
         linkage: ${{ matrix.lib_linkage }}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,14 +6,14 @@ cmake_minimum_required(VERSION 3.23.0...3.25.0)
 # Project
 # NOTE: DON'T USE TRAILING ZEROS IN VERSIONS
 project(libfp
-    VERSION 0.3.1
+    VERSION 0.4
     LANGUAGES CXX
-    DESCRIPTION "C++ support library for Flashpoint"
+    DESCRIPTION "C++ support library for Flashpoint Archive"
 )
 
 # Get helper scripts
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/FetchOBCMake.cmake)
-fetch_ob_cmake("v0.3")
+fetch_ob_cmake("v0.3.2")
 
 # Initialize project according to standard rules
 include(OB/Project)
@@ -52,7 +52,7 @@ set(LIBFP_QX_COMPONENTS
 
 include(OB/FetchQx)
 ob_fetch_qx(
-    REF "v0.5.0.1"
+    REF "v0.5.1"
     COMPONENTS
         ${LIBFP_QX_COMPONENTS}
 )

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # libfp
 
-A C++ interface for instances of [Blue Maxima's Flashpoint](https://bluemaxima.org/flashpoint/)
+A C++ interface for instances of [Flashpoint Archive](https://flashpointarchive.org/)
 
 [![Dev Builds](https://github.com/oblivioncth/libfp/actions/workflows/push-reaction.yml/badge.svg?branch=dev)](https://github.com/oblivioncth/libfp/actions/workflows/push-reaction.yml)
 

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -11,14 +11,24 @@ ob_add_standard_library(${LIB_TARGET_NAME}
             fp-db.h
             fp-install.h
             fp-items.h
-            fp-json.h
             fp-macro.h
+            fp-playlistmanager.h
+            settings/fp-config.h
+            settings/fp-execs.h
+            settings/fp-preferences.h
+            settings/fp-services.h
+            settings/fp-settings.h
     IMPLEMENTATION
         fp-db.cpp
         fp-install.cpp
-        fp-items.cpp
-        fp-json.cpp
         fp-macro.cpp
+        fp-items.cpp
+        fp-playlistmanager.cpp
+        settings/fp-config.cpp
+        settings/fp-execs.cpp
+        settings/fp-preferences.cpp
+        settings/fp-services.cpp
+        settings/fp-settings.cpp
     LINKS
         PUBLIC
             Qt6::Core