Build: CMake as building system

.github/workflows/makefile.yml

@@ -2,62 +2,71 @@ name: Makefile CI
 
 on:
   push:
-    branches: [ "master" ]
+    branches: ["master"]
     paths-ignore:
-      - '**.md'
-      - '*.txt'
-      - '.gitignore'
-      - 'docs/*'
-      - 'build/*'
-      - 'util/*'
+      - "**.md"
+      - "*.txt"
+      - ".gitignore"
+      - "docs/*"
+      - "build/*"
+      - "util/*"
   pull_request:
-    branches: [ "master" ]
+    branches: ["master"]
     paths-ignore:
-      - '**.md'
-      - '*.txt'
-      - '.gitignore'
-      - 'docs/*'
-      - 'build/*'
-      - 'util/*'
+      - "**.md"
+      - "*.txt"
+      - ".gitignore"
+      - "docs/*"
+      - "build/*"
+      - "util/*"
 
 jobs:
   linux:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Install dependencies
-      run: sudo apt install -y astyle cppcheck catch2
+      - name: Install dependencies
+        run: sudo apt install -y astyle cppcheck cmake 7zip
 
-    - uses: actions/checkout@v4
-      with:
-        submodules: recursive
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: format_check
+        working-directory: ./
+        run: ./tools/format.sh --dry
 
-    - name: format_check
-      working-directory: ./
-      run: ./tools/format.sh --dry
+      - name: Build native libraries
+        run: |
+          cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_MOD_LIBRARIES=ON -DBUILD_MOD_PK3=OFF -DBUILD_MOD_QVMS=OFF -DBUILD_TESTS=OFF
+          cmake --build build
 
-    - name: cpp_check
-      working-directory: ./
-      run: make cppcheck
+      - name: Build qvm
+        run: |
+          cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_MOD_LIBRARIES=OFF -DBUILD_MOD_PK3=ON -DBUILD_MOD_QVMS=ON -DBUILD_TESTS=OFF
+          cmake --build build
 
-    - name: unit_tests
-      working-directory: ./
-      run: make tests
+      - name: Run tests
+        run: |
+          cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_MOD_LIBRARIES=OFF -DBUILD_MOD_PK3=OFF -DBUILD_MOD_QVMS=OFF -DBUILD_TESTS=ON
+          cmake --build build
 
-    - name: release
-      working-directory: ./
-      run: make
+      - uses: actions/upload-artifact@v4
+        with:
+          name: osp2_pk3
+          path: build/Release/osp/*.pk3
+          if-no-files-found: error
+          retention-days: 5
 
-    - uses: actions/upload-artifact@v4
-      with:
-        name: osp2_linux
-        path: osp2_linux.tar.gz
-        if-no-files-found: error
-        retention-days: 5
+      - uses: actions/upload-artifact@v4
+        with:
+          name: osp2_linux
+          path: build/Release/osp/*.so
+          if-no-files-found: error
+          retention-days: 5
 
-  mingw:
-    name: MinGW GCC
-    needs: linux 
+  windows-msvc:
+    name: Windows MSVC
 
     runs-on: windows-2022
 
@@ -66,26 +75,71 @@ jobs:
         shell: bash
 
     steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Build native libraries
+        run: |
+          cmake -S . -B build -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=Release -DBUILD_MOD_LIBRARIES=ON -DBUILD_MOD_PK3=OFF -DBUILD_MOD_QVMS=OFF -DBUILD_TESTS=OFF
+          cmake --build build --config Release
 
-    - uses: actions/checkout@v4
-      with:
-        submodules: recursive
+      - name: Build qvm
+        run: |
+          cmake -S . -B build -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=Release -DBUILD_MOD_LIBRARIES=OFF -DBUILD_MOD_PK3=ON -DBUILD_MOD_QVMS=ON -DBUILD_TESTS=OFF
+          cmake --build build --config Release
 
-    - name: release
-      working-directory: ./
-      run: | 
-        make
+      - name: Run tests
+        run: |
+          cmake -S . -B build -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=Release -DBUILD_MOD_LIBRARIES=OFF -DBUILD_MOD_PK3=OFF -DBUILD_MOD_QVMS=OFF -DBUILD_TESTS=ON
+          cmake --build build --config Release
 
-    - uses: actions/upload-artifact@v4
-      with:
-        name: osp2_windows
-        path: osp2_windows.zip
-        if-no-files-found: error
-        retention-days: 5
+      - uses: actions/upload-artifact@v4
+        with:
+          name: osp2_windows_msvc
+          path: build/Release/osp/*.dll
+          if-no-files-found: error
+          retention-days: 5
+
+  windows-mingw:
+    name: Windows MinGW
+
+    runs-on: windows-2022
+
+    defaults:
+      run:
+        shell: bash
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Build native libraries
+        run: |
+          cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_MOD_LIBRARIES=ON -DBUILD_MOD_PK3=OFF -DBUILD_MOD_QVMS=OFF -DBUILD_TESTS=OFF
+          cmake --build build --config Release
+
+      - name: Build qvm
+        run: |
+          cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_MOD_LIBRARIES=OFF -DBUILD_MOD_PK3=ON -DBUILD_MOD_QVMS=ON -DBUILD_TESTS=OFF
+          cmake --build build --config Release
+
+      - name: Run tests
+        run: |
+          cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_MOD_LIBRARIES=OFF -DBUILD_MOD_PK3=OFF -DBUILD_MOD_QVMS=OFF -DBUILD_TESTS=ON
+          cmake --build build --config Release
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: osp2_windows_mingw
+          path: build/Release/osp/*.dll
+          if-no-files-found: error
+          retention-days: 5
 
   create-latest:
     if: github.ref == 'refs/heads/master' && github.event_name == 'push' || github.event_name == 'workflow_dispatch'
-    needs: [linux, mingw]
+    needs: [linux, windows-msvc, windows-mingw]
     permissions: write-all
     runs-on: ubuntu-latest
     steps:
@@ -100,8 +154,6 @@ jobs:
           prerelease: false
           title: Latest Build
           files: |
-            osp2_windows
+            osp2_windows_mingw
             osp2_linux
-
-
-
+            osp2_pk3

.gitignore

@@ -1,8 +1,4 @@
-!build
-build/qvm/vm/
-build/qvm/zz-osp-pak8.pk3
-build/library/build/
-build/tests/build/
+build
 osp/
 osp2_linux.tar.gz
 osp2_windows.zip

CMakeLists.txt

@@ -0,0 +1,47 @@
+cmake_minimum_required(VERSION 3.25)
+
+if(POLICY CMP0177)
+    # Policy CMP0177: install() DESTINATION paths are normalized
+    # Introduced in CMake 3.31
+    cmake_policy(SET CMP0177 NEW)
+endif()
+
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+
+include(mod)
+
+project(${MOD_NAME} VERSION ${MOD_VERSION} LANGUAGES C)
+
+option(BUILD_MOD_LIBRARIES "Build OSP2 gamecode as native libraries" ON)
+option(BUILD_MOD_QVMS "Build OSP2 gamecode as qvms" ON)
+option(BUILD_MOD_PK3 "Make .pk3 with assets and (if enabled) qvms" ON)
+option(BUILD_TESTS "Build tests" OFF)
+
+set(CMAKE_C_STANDARD 99)
+set(CMAKE_C_STANDARD_REQUIRED ON)
+set(CMAKE_SHARED_LIBRARY_PREFIX "")
+
+# Release build by default, set externally if you want something else
+if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Release)
+endif()
+
+# Try to enable LTO by default
+include(CheckIPOSupported)
+check_ipo_supported(RESULT IPO_SUPPORTED)
+
+if(IPO_SUPPORTED)
+  set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+  set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_DEBUG FALSE)
+endif()
+
+set(SOURCE_DIR ${CMAKE_SOURCE_DIR}/code)
+
+include(libraries/all)
+include(compilers/all)
+
+include(basegame)
+include(tests)
+
+include(post_configure)
+include(installer)