Small bugfixes and minor project restructuring

Increase minimum CMake version.
Use CMake FetchContent for glutils instead of a git submodule.
Properly load Lua scripts from XDG directories.
Properly add exe icon on Windows.

Author: treecase

.github/workflows/cmake-multi-platform.yml

@@ -65,11 +65,6 @@ jobs:
           sudo apt-get update
           sudo apt-get install bison flex libfl-dev libglew-dev libgtkmm-3.0-dev liblua5.4-dev
 
-    - name: Workaround for flex bug.
-      # See https://github.com/msys2/MSYS2-packages/issues/1911#issuecomment-832199076
-      if: ${{ matrix.os == 'windows-latest' }}
-      run: cp /usr/include/FlexLexer.h /mingw64/include/FlexLexer.h
-
     # Disable autocrlf for MSYS2 compatibility.
     - run: git config --global core.autocrlf input
     - uses: actions/checkout@v4
@@ -85,9 +80,6 @@ jobs:
       run: |
         echo "build-output-dir=$workspace/build" >> "$GITHUB_OUTPUT"
 
-    - name: Initialize and update submodules
-      run: git submodule update --init --recursive
-
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type

.gitignore

@@ -1,5 +1,4 @@
 /.vscode/
 /build/
 /notes/
-*.dll
 *.glade~

.gitmodules

@@ -13,18 +13,17 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.31)
 
 file(TO_CMAKE_PATH "${PROJECT_BINARY_DIR}/CMakeLists.txt" LOC_PATH)
 if(EXISTS "${LOC_PATH}")
     message(FATAL_ERROR "You cannot build in a source directory (or any directory with a CMakeLists.txt file). Please make a build subdirectory. Feel free to remove CMakeCache.txt and CMakeFiles.")
 endif()
 
 project("Sickle Editor"
-    VERSION 0.12.1
+    VERSION 0.12.2
     DESCRIPTION "Open-Source GoldSrc Editor"
-    LANGUAGES CXX
-)
+    LANGUAGES CXX)
 
 if(NOT CMAKE_BUILD_TYPE)
     message("CMAKE_BUILD_TYPE is unset, defaulting to Release")
@@ -41,7 +40,13 @@ endif()
 
 
 # --- Dependencies --- ###########################
-add_subdirectory(extern/glutils)
+
+include(FetchContent)
+FetchContent_Declare(
+    glutils
+    GIT_REPOSITORY https://github.com/Treecase/glutils
+    GIT_TAG        59ad12bdfbd0f292fe56524ee72ece755b4771c5)
+FetchContent_MakeAvailable(glutils)
 
 find_package(BISON 3.2 REQUIRED)
 find_package(FLEX 2.6 REQUIRED)
@@ -60,9 +65,9 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Application ID
-set(APPLICATION_ID com.github.treecase.sicklegtk)
+set(APPLICATION_ID com.github.Treecase.SickleEditor)
 # GResource prefix
-set(GRESOURCE_PREFIX /com/github/treecase/sicklegtk/)
+set(GRESOURCE_PREFIX /com/github/Treecase/SickleEditor/)
 # GSchema path
 set(SCHEMA_DIR "${CMAKE_CURRENT_BINARY_DIR}")
 
@@ -73,7 +78,6 @@ target_link_libraries(sickle PRIVATE ${CMAKE_DL_LIBS})
 
 include(GNUInstallDirs)
 
-
 add_subdirectory(data)
 include_directories(sickle PUBLIC src)
 add_subdirectory(src)

CMakeLists.txt

@@ -1,11 +1,10 @@
 # Sickle Editor
 
-An open-source editor for GoldSrc maps. Both `.MAP` and `.RMF` formats are supported. Sickle Editor is released under the [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html) license.
-
-
 ![Build Status Badge](https://img.shields.io/github/actions/workflow/status/Treecase/SickleEditor/cmake-multi-platform.yml)
 ![License Badge](https://img.shields.io/github/license/Treecase/SickleEditor)
 
+An open-source editor for GoldSrc maps. Both `.MAP` and `.RMF` formats are supported. Sickle Editor is released under the [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html) license.
+
 
 ## Getting Started
 
@@ -35,7 +34,6 @@ And then build the program:
 ```bash
 git clone https://github.com/Treecase/SickleEditor
 cd SickleEditor
-git submodule update --init --recursive
 cmake -B build .
 cmake --build build
 ```
@@ -56,7 +54,6 @@ To build the program:
 ```bash
 git clone https://github.com/Treecase/SickleEditor
 cd SickleEditor
-git submodule update --init --recursive
 cmake -B build .
 cmake --build build
 ```
@@ -67,18 +64,17 @@ cmake --build build
 To install the Sickle Editor, use:
 
 ```bash
-cmake --install .
+cmake --install build
 ```
 
 By default, the program will be installed to `/usr/local` on Linux and `C:/Program Files/Sickle Editor` on Windows. If you want the installation to go somewhere else, use:
 
 ```bash
-cmake --install . --prefix=<your/desired/location>
+cmake --install build --prefix=<Install Prefix>
 ```
 
-You'll also have to compile the GSettings schema with the following command.
+Linux users will also have to compile the GSettings schema with the following command.
 
 ```bash
-cd <INSTALL_PREFIX>/share/glib-2.0/schemas
-glib-compile-schemas .
+glib-compile-schemas <Install Prefix>/share/glib-2.0/schemas
 ```

README.md

@@ -1,11 +1,17 @@
 # Generate the GResource XML file.
-configure_file(sicklegtk.gresource.xml.in sicklegtk.gresource.xml)
+configure_file(SickleEditor.gresource.xml.in SickleEditor.gresource.xml)
+
+find_program(
+    GLIB_COMPILE_RESOURCES
+    NAMES glib-compile-resources
+    DOC "Path to the glib-compile-resources program"
+    REQUIRED)
 
 # Build resources.cpp.
 add_custom_command(
     OUTPUT resources.cpp
-    COMMAND glib-compile-resources
-        sicklegtk.gresource.xml
+    COMMAND "${GLIB_COMPILE_RESOURCES}"
+        SickleEditor.gresource.xml
         --target=resources.cpp
         --sourcedir="${CMAKE_CURRENT_SOURCE_DIR}"
         --generate-source
@@ -29,13 +35,7 @@ add_custom_command(
         LuaConsole.css
         MapArea2D.css
 )
-add_library(resources OBJECT resources.cpp)
-target_link_libraries(resources PRIVATE PkgConfig::GTKMM)
-
-target_link_libraries(sickle PRIVATE resources)
+add_library(gresources OBJECT resources.cpp)
+target_link_libraries(gresources PRIVATE PkgConfig::GTKMM)
 
-install(
-    FILES logo.svg
-    DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps"
-    RENAME "${APPLICATION_ID}.svg"
-)
+target_link_libraries(sickle PRIVATE gresources)

data/gresource/CMakeLists.txt

@@ -5,7 +5,7 @@
   <object class="AppWin" id="theWindow">
     <property name="can-focus">False</property>
     <property name="title" translatable="yes">Sickle Editor</property>
-    <property name="icon-name">com.github.treecase.sicklegtk</property>
+    <property name="icon-name">com.github.Treecase.SickleEditor</property>
     <child>
       <!-- n-columns=2 n-rows=2 -->
       <object class="GtkGrid">

data/gresource/sicklegtk.gresource.xml.in …/gresource/SickleEditor.gresource.xml.indata/gresource/sicklegtk.gresource.xml.in renamed to data/gresource/SickleEditor.gresource.xml.in data/gresource/sicklegtk.gresource.xml.in renamed to data/gresource/SickleEditor.gresource.xml.in

@@ -1,4 +1,4 @@
 add_subdirectory(applications)
 add_subdirectory(glib-2.0/schemas)
 
-install(DIRECTORY sickle TYPE DATA)
+install(DIRECTORY icons sickle TYPE DATA)

data/gresource/gtk/AppWin.glade

@@ -1,7 +1,5 @@
-configure_file(sicklegtk.desktop.in sicklegtk.desktop)
+configure_file(SickleEditor.desktop.in ${APPLICATION_ID}.desktop)
 
 install(
-    FILES "${CMAKE_CURRENT_BINARY_DIR}/sicklegtk.desktop"
-    DESTINATION "${CMAKE_INSTALL_DATADIR}/applications"
-    RENAME "${APPLICATION_ID}.desktop"
-)
+    FILES "${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_ID}.desktop"
+    DESTINATION "${CMAKE_INSTALL_DATADIR}/applications")