Work with modern GCC

.github/workflows/ci.yml

@@ -4,24 +4,23 @@ on:
   push:
     paths:
       - "**.cpp"
+      - "**.hpp"
       - "**.cmake"
       - "**/CMakeLists.txt"
       - ".github/workflows/ci.yml"
   pull_request:
-    paths:
-      - "**.cpp"
-      - "**.cmake"
-      - "**/CMakeLists.txt"
-      - ".github/workflows/ci.yml"
+
 
 jobs:
 
-  linux:
+  core:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
-    - uses: actions/checkout@v2
+    - &checkout
+      uses: actions/checkout@v6
 
-    - run: ctest -S setup.cmake -VV
+    - run: cmake --workflow debug
+    - run: cmake --workflow release

CMakeLists.txt

@@ -1,21 +1,23 @@
-cmake_minimum_required(VERSION 3.7...3.21)
+cmake_minimum_required(VERSION 3.15...4.3)
 project(2048 LANGUAGES CXX)
 enable_testing()
 
 set(SOURCES src/2048.cpp src/gameboard.cpp src/gameboard-graphics.cpp src/game.cpp src/game-graphics.cpp src/game-input.cpp src/game-pregamemenu.cpp src/global.cpp src/loadresource.cpp src/menu.cpp src/menu-graphics.cpp src/saveresource.cpp src/scores.cpp src/scores-graphics.cpp src/statistics.cpp src/statistics-graphics.cpp src/tile.cpp src/tile-graphics.cpp)
 
-if(CMAKE_CXX_COMPILER_ID STREQUAL GNU)
-  add_compile_options(-Wall)
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-  add_compile_options(-Wall)
-elseif(CMAKE_CXX_COMPILER_ID MATCHES "^Intel")
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+  add_compile_options($<$<CONFIG:Debug,RelWithDebInfo>:-Wall>)
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+  add_compile_options($<$<CONFIG:Debug,RelWithDebInfo>:-Wall>)
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
   if(WIN32)
-    add_compile_options(/W3)
+    add_compile_options($<$<CONFIG:Debug,RelWithDebInfo>:/W3>)
   else()
-    add_compile_options(-w2)
+    add_compile_options($<$<CONFIG:Debug,RelWithDebInfo>:-w2>)
   endif()
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL NVHPC)
-  add_compile_options(-a)
+elseif(MSVC)
+  add_compile_options($<$<CONFIG:Debug,RelWithDebInfo>:/W3>)
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "NVHPC")
+  add_compile_options($<$<CONFIG:Debug,RelWithDebInfo>:-a>)
 endif()
 
 add_executable(2048 ${SOURCES})
@@ -33,8 +35,7 @@ endif()
 
 # --- install
 
-install(TARGETS 2048
-  RUNTIME DESTINATION bin)
+install(TARGETS 2048)
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data
-        DESTINATION ${CMAKE_INSTALL_PREFIX})
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/data)

CMakePresets.json

@@ -0,0 +1,66 @@
+{
+  "version": 6,
+
+  "configurePresets": [
+{
+  "name": "default",
+  "binaryDir": "${sourceDir}/build",
+  "cacheVariables": {
+    "CMAKE_COMPILE_WARNING_AS_ERROR": true,
+    "CMAKE_LINK_WARNING_AS_ERROR": true
+  }
+},
+{
+  "name": "multi", "inherits": "default",
+  "generator": "Ninja Multi-Config"
+}
+],
+"buildPresets": [
+  { "name": "default", "configurePreset": "default" },
+  { "name": "debug", "configurePreset": "multi", "configuration": "Debug" },
+  { "name": "release", "configurePreset": "multi", "configuration": "Release" }
+],
+"testPresets": [
+{
+  "name": "default",
+  "configurePreset": "default",
+  "output": {
+    "outputOnFailure": true,
+    "verbosity": "verbose"
+  },
+  "execution": {
+    "noTestsAction": "error",
+    "scheduleRandom": true,
+    "stopOnFailure": false,
+    "timeout": 60
+  }
+},
+{ "name": "debug", "inherits": "default", "configurePreset": "multi", "configuration": "Debug" },
+{ "name": "release", "inherits": "default", "configurePreset": "multi", "configuration": "Release" }
+],
+"workflowPresets": [
+  {
+    "name": "default",
+    "steps": [
+      { "type": "configure", "name": "default" },
+      { "type": "build", "name": "default" },
+      { "type": "test", "name": "default" }
+    ]
+  },
+  { "name": "debug",
+  "steps": [
+    { "type": "configure", "name": "multi" },
+    { "type": "build", "name": "debug" },
+    { "type": "test", "name": "debug" }
+    ]
+  },
+  {
+    "name": "release",
+    "steps": [
+      { "type": "configure", "name": "multi" },
+      { "type": "build", "name": "release" },
+      { "type": "test", "name": "release" }
+    ]
+  }
+]
+}

src/global.cpp

@@ -1,7 +1,11 @@
 #include "global.hpp"
 #include "color.hpp"
+
 #include <iostream>
 #include <sstream>
+#include <cstdlib> // for system
+#include <system_error>
+#include <cerrno>
 
 #ifdef _WIN32
 
@@ -51,10 +55,12 @@ void wait_for_any_letter_input(std::istream &is) {
 
 void clearScreen() {
 #ifdef _WIN32
-  system("cls");
+  if(system("cls")) {
 #else
-  system("clear");
+  if(system("clear")) {
 #endif
+    std::cerr << "Failed to clear screen: " << std::error_code(errno, std::generic_category()).message() << "\n";
+  }
 };
 
 std::string secondsFormat(double sec) {

src/headers/gameboard.hpp

@@ -5,7 +5,7 @@
 #include <tuple>
 #include <vector>
 
-struct point2D_t;
+class point2D_t;
 
 namespace Game {
 

src/loadresource.cpp

@@ -17,14 +17,14 @@ namespace {
 /**
  * @brief Counts the number of lines in a file until a line containing '[' is found.
  *
- * This function opens a file specified by the given filename and counts the number 
- * of lines until it encounters a line that contains the character '['. If the file 
+ * This function opens a file specified by the given filename and counts the number
+ * of lines until it encounters a line that contains the character '['. If the file
  * cannot be opened, it prints an error message and returns -1.
  *
  * @param filename The name of the file to be read.
  * @return The number of lines read before encountering a line with '['. Returns -1 if the file cannot be opened.
  */
-int GetLines(std::string filename) 
+int GetLines(std::string filename)
 {
   std::ifstream stateFile(filename);
   if (!stateFile) {
@@ -48,10 +48,10 @@ int GetLines(std::string filename)
 /**
  * @brief Extracts tile data from a given input stream until a line containing '[' is encountered.
  *
- * This function reads lines from the provided input stream and extracts tile data 
- * formatted as comma-separated values. The process continues until either the maximum 
- * width (10 lines) is reached or a line containing the character '[' is found. When 
- * a line with '[' is encountered, the function stops reading further and processes 
+ * This function reads lines from the provided input stream and extracts tile data
+ * formatted as comma-separated values. The process continues until either the maximum
+ * width (10 lines) is reached or a line containing the character '[' is found. When
+ * a line with '[' is encountered, the function stops reading further and processes
  * the line up to, but not including, the '[' character.
  *
  * @param buf The input stream from which to read the tile data.
@@ -181,7 +181,7 @@ load_game_stats_from_file(std::string filename) {
  * @brief Loads game data from a specified file into a GameBoard object.
  *
  * This function opens a file specified by the given filename, reads the game board data,
- * and initializes a GameBoard object with the read data. It first counts the number of lines 
+ * and initializes a GameBoard object with the read data. It first counts the number of lines
  * until a line containing '[' is found to determine the size of the game board. Then, it reads
  * the tile data from the file, processes it, and updates the GameBoard object. Finally, it reads
  * the score and move count from the last relevant line containing these values.