Revert "Merge branch 'master' into stick_configurations_exploration"

This reverts commit c10f96a, reversing
changes made to ec42933.

Author: kev4cards

.gersemirc

@@ -1,8 +1,11 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/BlankSpruce/gersemi/master/gersemi/configuration.schema.json
 
+color: false
 definitions: [ares/CMakeLists.txt]
 line_length: 120
 indent: 2
 list_expansion: favour-inlining
+quiet: false
 unsafe: false
 warn_about_unknown_commands: false
+workers: 10

.github/CMakeLists.txt

@@ -56,14 +56,6 @@ jobs:
           os: ubuntu-24.04-arm
           shell: bash
           target-cmake-preset: ubuntu-ci-clang
-        - name: ubuntu-gcc-arm64-qt
-          os: ubuntu-24.04-arm
-          shell: bash
-          target-cmake-preset: ubuntu-ci-qt
-        - name: freebsd
-          os: ubuntu-24.04
-          shell: bash
-          target-cmake-preset: ubuntu-ci-clang
     name: ${{ matrix.program }}-${{ matrix.platform.name }}
     runs-on: ${{ matrix.platform.os }}
     defaults:
@@ -86,12 +78,12 @@ jobs:
       run: |
         git config core.autocrlf true
     - name: Install Linux Dependencies
-      if: runner.os == 'Linux' && matrix.platform.name != 'freebsd'
+      if: runner.os == 'Linux'
       run: |
         sudo apt-get update -y -qq
-        sudo apt-get install cmake ccache ninja-build libsdl2-dev libgtk-3-dev libao-dev libopenal-dev qt6-base-dev
+        sudo apt-get install cmake ccache ninja-build libsdl2-dev libgtk-3-dev libao-dev libopenal-dev
     - name: "Build: Linux"
-      if: runner.os == 'Linux' && matrix.platform.name != 'freebsd'
+      if: runner.os == 'Linux'
       run: .github/scripts/build_ubuntu.sh
       env:
         TARGET_PRESET: ${{ matrix.platform.target-cmake-preset }}
@@ -103,18 +95,6 @@ jobs:
         CROSS_COMPILE: ${{ matrix.platform.native-cmake-preset != '' }}
         NATIVE_PRESET: ${{ matrix.platform.native-cmake-preset }}
         TARGET_PRESET: ${{ matrix.platform.target-cmake-preset }}
-    - name: "Build: FreeBSD"
-      if: matrix.platform.name == 'freebsd'
-      uses: cross-platform-actions/action@e8a7b572196ff79ded1979dc2bb9ee67d1ddb252
-      env:
-        TARGET_PRESET: ${{ matrix.platform.target-cmake-preset }}
-      with:
-        operating_system: freebsd
-        version: 14.3
-        environment_variables: TARGET_PRESET
-        run: |
-          sudo pkg install -y cmake pkgconf ccache ninja gtk3 libX11 libXext libXrandr libXrender libglvnd alsa-lib libao libudev-devd librashader openal-soft pulseaudio sdl3 vulkan-loader
-          .github/scripts/build_ubuntu.sh
     - name: "Compress Build Artifacts (Windows)"
       if: runner.os != 'macOS' && runner.os != 'Linux'
       run: |

.github/workflows/build-aux.yml

@@ -77,7 +77,6 @@ jobs:
     - name: Install macOS Dependencies
       if: runner.os == 'macOS'
       run: |
-        brew uninstall --ignore-dependencies cmake
         brew install ${{ matrix.platform.install }}
     - name: "Build: Windows"
       if: runner.os != 'macOS' && runner.os != 'Linux'

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.28...4.1)
+cmake_minimum_required(VERSION 3.28...4.0)
 
 include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/common/bootstrap.cmake" NO_POLICY_SCOPE)
 
@@ -8,6 +8,8 @@ include(compilerconfig)
 include(defaults)
 include(helpers)
 
+add_subdirectory(cmake)
+
 add_subdirectory(thirdparty)
 
 add_subdirectory(nall/nall)
@@ -19,7 +21,7 @@ add_subdirectory(hiro)
 set(
   ARES_CORES
   a26 fc sfc sg ms md ps1 pce ng msx cv myvision gb gba ws ngp spec n64
-  CACHE STRING "List of systems to be built by the project"
+  CACHE STRING LIST
 )
 # gersemi: on
 
@@ -33,7 +35,7 @@ if(ARES_BUILD_OPTIONAL_TARGETS)
   add_subdirectory(tests/arm7tdmi)
   add_subdirectory(tests/i8080)
   add_subdirectory(tests/m68000)
-  if(HIRO_BACKEND STREQUAL "GTK3")
+  if(NOT OS_WINDOWS AND NOT OS_MACOS)
     add_subdirectory(tools/genius)
   else()
     target_disable_subproject(genius "genius (database editor)")
@@ -50,7 +52,4 @@ endif()
 add_subdirectory(tools/sourcery)
 
 message_configuration()
-
-add_subdirectory(.github)
-add_subdirectory(cmake)
 return()

CMakeLists.txt

@@ -82,7 +82,7 @@
       "binaryDir": "${sourceDir}/build",
       "cacheVariables": {
         "CMAKE_OSX_ARCHITECTURES": {"type": "STRING", "value": "x86_64;arm64"},
-        "CMAKE_OSX_DEPLOYMENT_TARGET": {"type": "STRING", "value": "11.0"},
+        "CMAKE_OSX_DEPLOYMENT_TARGET": {"type": "STRING", "value": "10.15"},
         "ARES_CODESIGN_IDENTITY": {"type": "STRING", "value": "$penv{MACOS_CERTIFICATE_NAME}"},
         "ARES_CODESIGN_TEAM": {"type": "STRING", "value": "$penv{MACOS_NOTARIZATION_TEAMID}"},
         "ENABLE_CCACHE": true,
@@ -103,8 +103,7 @@
         "ARES_BUILD_OPTIONAL_TARGETS": true,
         "ARES_UNITY_CORES": true,
         "ARES_PRECOMPILE_HEADERS": true,
-        "CMAKE_MSVC_RUNTIME_LIBRARY": {"type": "STRING", "value": "MultiThreaded"},
-        "CMAKE_IGNORE_PATH": {"type": "STRING", "value": "C:/Strawberry/c/bin/"}
+        "CMAKE_MSVC_RUNTIME_LIBRARY": {"type": "STRING", "value": "MultiThreaded"}
       }
     },
     {
@@ -161,7 +160,6 @@
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": {"type": "STRING", "value": "RelWithDebInfo"},
         "ENABLE_CCACHE": true,
-        "ENABLE_IPO": false,
         "ARES_BUILD_LOCAL": false,
         "ARES_BUILD_OPTIONAL_TARGETS": true,
         "ARES_PRECOMPILE_HEADERS": false
@@ -176,16 +174,6 @@
         "CMAKE_C_COMPILER": "clang",
         "CMAKE_CXX_COMPILER": "clang++"
       }
-    },
-    {
-      "name": "ubuntu-ci-qt",
-      "displayName": "Ubuntu CI (arm64, gcc, Qt)",
-      "description": "Single-arch binary for building on Github Actions",
-      "inherits": ["ubuntu-ci"],
-      "cacheVariables": {
-        "USE_QT6": true,
-        "ARES_BUILD_OPTIONAL_TARGETS": false
-      }
     }
   ],
   "buildPresets": [

CMakePresets.json

@@ -21,7 +21,7 @@ if(ARES_PRECOMPILE_HEADERS)
   target_precompile_headers(ares PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:ares/ares.hpp>")
 endif()
 
-target_link_libraries(ares PRIVATE libco ares::nall::headers $<$<BOOL:${ARES_ENABLE_CHD}>:chdr-static> PUBLIC sljit)
+target_link_libraries(ares PUBLIC libco sljit nall)
 
 if(ARES_PROFILE_ACCURACY)
   target_compile_definitions(ares PUBLIC PROFILE_ACCURACY)

ares/CMakeLists.txt

@@ -1,13 +1,12 @@
 #pragma once
 
 #include <ares/ares.hpp>
-#include <vector>
 
 #include <component/processor/mos6502/mos6502.hpp>
 
 namespace ares::Atari2600 {
   #include <ares/inline.hpp>
-  auto enumerate() -> std::vector<string>;
+  auto enumerate() -> vector<string>;
   auto load(Node::System& node, string name) -> bool;
 
   struct Region {

ares/a26/a26.hpp

@@ -19,15 +19,15 @@ auto Cartridge::connect() -> void {
   information.region = pak->attribute("region");
   information.board  = pak->attribute("board");
 
-  if(information.board == "Linear") board = std::make_unique<Board::Linear>(*this);
-  if(information.board == "Atari8k") board = std::make_unique<Board::Atari8k>(*this);
-  if(information.board == "Atari16k") board = std::make_unique<Board::Atari16k>(*this);
-  if(information.board == "Atari32k") board = std::make_unique<Board::Atari32k>(*this);
-  if(information.board == "Commavid") board = std::make_unique<Board::Commavid>(*this);
-  if(information.board == "ParkerBros8k") board = std::make_unique<Board::ParkerBros>(*this);
-  if(information.board == "Tigervision") board = std::make_unique<Board::Tigervision>(*this);
+  if(information.board == "Linear") board = new Board::Linear{*this};
+  if(information.board == "Atari8k") board = new Board::Atari8k{*this};
+  if(information.board == "Atari16k") board = new Board::Atari16k{*this};
+  if(information.board == "Atari32k") board = new Board::Atari32k{*this};
+  if(information.board == "Commavid") board = new Board::Commavid{*this};
+  if(information.board == "ParkerBros8k") board = new Board::ParkerBros{*this};
+  if(information.board == "Tigervision") board = new Board::Tigervision{*this};
 
-  if(!board) board = std::make_unique<Board::Interface>(*this);
+  if(!board) board = new Board::Interface{*this};
   board->pak = pak;
   board->load();
   power();

ares/a26/cartridge/cartridge.cpp

@@ -22,7 +22,7 @@ struct Cartridge {
   //serialization.cpp
   auto serialize(serializer&) -> void;
 
-  std::unique_ptr<Board::Interface> board;
+  unique_pointer<Board::Interface> board;
 
 //private:
   struct Information {