[pull] master from OpenApoc:master

.clang-tidy

@@ -1,282 +1,18 @@
 ---
-Checks:          'clang-diagnostic-*,clang-analyzer-*,misc-static-assert,modernize-use-auto,modernize-use-default,modernize-usenullptr,modernize-use-override,performance-*,readability-non-const-parameter,readability-redundant-*,readability-simplify-*,bugprone-*'
+Checks:          'clang-diagnostic-*,clang-analyzer-*,readability-non-const-parameter'
+WarningsAsErrors: ''
+HeaderFileExtensions:
+  - ''
+  - h
+  - hh
+  - hpp
+  - hxx
+ImplementationFileExtensions:
+  - c
+  - cc
+  - cpp
+  - cxx
 HeaderFilterRegex: 'forms/.*|framework/.*|game/.*|library/.*|tests/.*|tools/.*'
-AnalyzeTemporaryDtors: false
-User:            jonny
-CheckOptions:    
-  - key:             google-readability-braces-around-statements.ShortStatementLines
-    value:           '1'
-  - key:             google-readability-function-size.StatementThreshold
-    value:           '800'
-  - key:             google-readability-namespace-comments.ShortNamespaceLines
-    value:           '10'
-  - key:             google-readability-namespace-comments.SpacesBeforeComments
-    value:           '2'
-  - key:             modernize-loop-convert.MaxCopySize
-    value:           '16'
-  - key:             modernize-loop-convert.MinConfidence
-    value:           reasonable
-  - key:             modernize-loop-convert.NamingStyle
-    value:           CamelCase
-  - key:             modernize-pass-by-value.IncludeStyle
-    value:           llvm
-  - key:             modernize-replace-auto-ptr.IncludeStyle
-    value:           llvm
-  - key:             modernize-use-nullptr.NullMacros
-    value:           'NULL'
-  - key:             readability-identifier-naming.AbstractClassCase
-    value:           CamelCase
-  - key:             readability-identifier-naming.AbstractClassPrefix
-    value:           ''
-  - key:             readability-identifier-naming.AbstractClassSuffix
-    value:           ''
-  - key:             readability-identifier-naming.ClassCase
-    value:           CamelCase
-  - key:             readability-identifier-naming.ClassConstantCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.ClassConstantPrefix
-    value:           ''
-  - key:             readability-identifier-naming.ClassConstantSuffix
-    value:           ''
-  - key:             readability-identifier-naming.ClassMemberCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.ClassMemberPrefix
-    value:           ''
-  - key:             readability-identifier-naming.ClassMemberSuffix
-    value:           ''
-  - key:             readability-identifier-naming.ClassMethodCase
-    value:           camelBack
-  - key:             readability-identifier-naming.ClassMethodPrefix
-    value:           ''
-  - key:             readability-identifier-naming.ClassMethodSuffix
-    value:           ''
-  - key:             readability-identifier-naming.ClassPrefix
-    value:           ''
-  - key:             readability-identifier-naming.ClassSuffix
-    value:           ''
-  - key:             readability-identifier-naming.ConstantCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.ConstantMemberCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.ConstantMemberPrefix
-    value:           ''
-  - key:             readability-identifier-naming.ConstantMemberSuffix
-    value:           ''
-  - key:             readability-identifier-naming.ConstantParameterCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.ConstantParameterPrefix
-    value:           ''
-  - key:             readability-identifier-naming.ConstantParameterSuffix
-    value:           ''
-  - key:             readability-identifier-naming.ConstantPrefix
-    value:           ''
-  - key:             readability-identifier-naming.ConstantSuffix
-    value:           ''
-  - key:             readability-identifier-naming.ConstexprFunctionCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.ConstexprFunctionPrefix
-    value:           ''
-  - key:             readability-identifier-naming.ConstexprFunctionSuffix
-    value:           ''
-  - key:             readability-identifier-naming.ConstexprMethodCase
-    value:           camelBack
-  - key:             readability-identifier-naming.ConstexprMethodPrefix
-    value:           ''
-  - key:             readability-identifier-naming.ConstexprMethodSuffix
-    value:           ''
-  - key:             readability-identifier-naming.ConstexprVariableCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.ConstexprVariablePrefix
-    value:           ''
-  - key:             readability-identifier-naming.ConstexprVariableSuffix
-    value:           ''
-  - key:             readability-identifier-naming.EnumCase
-    value:           CamelCase
-  - key:             readability-identifier-naming.EnumConstantCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.EnumConstantPrefix
-    value:           ''
-  - key:             readability-identifier-naming.EnumConstantSuffix
-    value:           ''
-  - key:             readability-identifier-naming.EnumPrefix
-    value:           ''
-  - key:             readability-identifier-naming.EnumSuffix
-    value:           ''
-  - key:             readability-identifier-naming.FunctionCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.FunctionPrefix
-    value:           ''
-  - key:             readability-identifier-naming.FunctionSuffix
-    value:           ''
-  - key:             readability-identifier-naming.GlobalConstantCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.GlobalConstantPrefix
-    value:           ''
-  - key:             readability-identifier-naming.GlobalConstantSuffix
-    value:           ''
-  - key:             readability-identifier-naming.GlobalFunctionCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.GlobalFunctionPrefix
-    value:           ''
-  - key:             readability-identifier-naming.GlobalFunctionSuffix
-    value:           ''
-  - key:             readability-identifier-naming.GlobalVariableCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.GlobalVariablePrefix
-    value:           ''
-  - key:             readability-identifier-naming.GlobalVariableSuffix
-    value:           ''
-  - key:             readability-identifier-naming.IgnoreFailedSplit
-    value:           '0'
-  - key:             readability-identifier-naming.InlineNamespaceCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.InlineNamespacePrefix
-    value:           ''
-  - key:             readability-identifier-naming.InlineNamespaceSuffix
-    value:           ''
-  - key:             readability-identifier-naming.LocalConstantCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.LocalConstantPrefix
-    value:           ''
-  - key:             readability-identifier-naming.LocalConstantSuffix
-    value:           ''
-  - key:             readability-identifier-naming.LocalVariableCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.LocalVariablePrefix
-    value:           ''
-  - key:             readability-identifier-naming.LocalVariableSuffix
-    value:           ''
-  - key:             readability-identifier-naming.MemberCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.MemberPrefix
-    value:           ''
-  - key:             readability-identifier-naming.MemberSuffix
-    value:           ''
-  - key:             readability-identifier-naming.MethodCase
-    value:           camelBack
-  - key:             readability-identifier-naming.MethodPrefix
-    value:           ''
-  - key:             readability-identifier-naming.MethodSuffix
-    value:           ''
-  - key:             readability-identifier-naming.NamespaceCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.NamespacePrefix
-    value:           ''
-  - key:             readability-identifier-naming.NamespaceSuffix
-    value:           ''
-  - key:             readability-identifier-naming.ParameterCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.ParameterPackCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.ParameterPackPrefix
-    value:           ''
-  - key:             readability-identifier-naming.ParameterPackSuffix
-    value:           ''
-  - key:             readability-identifier-naming.ParameterPrefix
-    value:           ''
-  - key:             readability-identifier-naming.ParameterSuffix
-    value:           ''
-  - key:             readability-identifier-naming.PrivateMemberCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.PrivateMemberPrefix
-    value:           ''
-  - key:             readability-identifier-naming.PrivateMemberSuffix
-    value:           ''
-  - key:             readability-identifier-naming.PrivateMethodCase
-    value:           camelBack
-  - key:             readability-identifier-naming.PrivateMethodPrefix
-    value:           ''
-  - key:             readability-identifier-naming.PrivateMethodSuffix
-    value:           ''
-  - key:             readability-identifier-naming.ProtectedMemberCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.ProtectedMemberPrefix
-    value:           ''
-  - key:             readability-identifier-naming.ProtectedMemberSuffix
-    value:           ''
-  - key:             readability-identifier-naming.ProtectedMethodCase
-    value:           camelBack
-  - key:             readability-identifier-naming.ProtectedMethodPrefix
-    value:           ''
-  - key:             readability-identifier-naming.ProtectedMethodSuffix
-    value:           ''
-  - key:             readability-identifier-naming.PublicMemberCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.PublicMemberPrefix
-    value:           ''
-  - key:             readability-identifier-naming.PublicMemberSuffix
-    value:           ''
-  - key:             readability-identifier-naming.PublicMethodCase
-    value:           camelBack
-  - key:             readability-identifier-naming.PublicMethodPrefix
-    value:           ''
-  - key:             readability-identifier-naming.PublicMethodSuffix
-    value:           ''
-  - key:             readability-identifier-naming.StaticConstantCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.StaticConstantPrefix
-    value:           ''
-  - key:             readability-identifier-naming.StaticConstantSuffix
-    value:           ''
-  - key:             readability-identifier-naming.StaticVariableCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.StaticVariablePrefix
-    value:           ''
-  - key:             readability-identifier-naming.StaticVariableSuffix
-    value:           ''
-  - key:             readability-identifier-naming.StructCase
-    value:           CamelCase
-  - key:             readability-identifier-naming.StructPrefix
-    value:           ''
-  - key:             readability-identifier-naming.StructSuffix
-    value:           ''
-  - key:             readability-identifier-naming.TemplateParameterCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.TemplateParameterPrefix
-    value:           ''
-  - key:             readability-identifier-naming.TemplateParameterSuffix
-    value:           ''
-  - key:             readability-identifier-naming.TemplateTemplateParameterCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.TemplateTemplateParameterPrefix
-    value:           ''
-  - key:             readability-identifier-naming.TemplateTemplateParameterSuffix
-    value:           ''
-  - key:             readability-identifier-naming.TypeTemplateParameterCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.TypeTemplateParameterPrefix
-    value:           ''
-  - key:             readability-identifier-naming.TypeTemplateParameterSuffix
-    value:           ''
-  - key:             readability-identifier-naming.TypedefCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.TypedefPrefix
-    value:           ''
-  - key:             readability-identifier-naming.TypedefSuffix
-    value:           ''
-  - key:             readability-identifier-naming.UnionCase
-    value:           CamelCase
-  - key:             readability-identifier-naming.UnionPrefix
-    value:           ''
-  - key:             readability-identifier-naming.UnionSuffix
-    value:           ''
-  - key:             readability-identifier-naming.ValueTemplateParameterCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.ValueTemplateParameterPrefix
-    value:           ''
-  - key:             readability-identifier-naming.ValueTemplateParameterSuffix
-    value:           ''
-  - key:             readability-identifier-naming.VariableCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.VariablePrefix
-    value:           ''
-  - key:             readability-identifier-naming.VariableSuffix
-    value:           ''
-  - key:             readability-identifier-naming.VirtualMethodCase
-    value:           camelBack
-  - key:             readability-identifier-naming.VirtualMethodPrefix
-    value:           ''
-  - key:             readability-identifier-naming.VirtualMethodSuffix
-    value:           ''
+SystemHeaders:   false
 ...
 

.github/workflows/cmake.yml

@@ -12,7 +12,7 @@ jobs:
     # well on Windows or Mac.  You can convert this to a matrix build if you need
     # cross-platform coverage.
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@v2
@@ -34,7 +34,13 @@ jobs:
       run: sudo apt-get update
 
     - name: Install dependencies
-      run: sudo apt-get install libsdl2-dev cmake build-essential git libunwind8-dev libboost-locale-dev libboost-filesystem-dev libboost-program-options-dev qtbase5-dev libvorbis-dev ninja-build g++-13
+      run: sudo apt-get install libsdl2-dev cmake build-essential git libunwind8-dev libboost-locale-dev libboost-filesystem-dev libboost-program-options-dev qtbase5-dev libvorbis-dev ninja-build 
+
+    - name: Install gcc-14
+      run: sudo apt install gcc-14 g++-14
+
+    - name: GCC 14 version check
+      run: echo "GCC-14:"; which gcc-14;gcc-14 --version;
 
     - name: Configure CMake
       # Use a bash shell so we can use the same syntax for environment variable
@@ -44,7 +50,7 @@ jobs:
       # Note the current convention is to use the -S and -B options here to specify source 
       # and build directories, but this is only available with CMake 3.13 and higher.  
       # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
-      run: CC=gcc-13 CXX=g++-13 cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -GNinja
+      run: CC=gcc-14 CXX=g++-14 cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -GNinja -DUSE_PCH=ON
 
     - name: Build
       working-directory: ${{runner.workspace}}/build

.github/workflows/lint.yml

@@ -5,6 +5,8 @@ on: [push, pull_request]
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
+  CLANG_FORMAT: clang-format-18
+  CLANG_TIDY: clang-tidy-18
 
 jobs:
   build:
@@ -35,7 +37,7 @@ jobs:
       run: sudo apt-get update
 
     - name: Install dependencies
-      run: sudo apt-get install libsdl2-dev cmake build-essential git libunwind8-dev libboost-locale-dev libboost-filesystem-dev libboost-program-options-dev qtbase5-dev libvorbis-dev ninja-build clang-format-15 clang-tidy-15
+      run: sudo apt-get install libsdl2-dev cmake build-essential git libunwind8-dev libboost-locale-dev libboost-filesystem-dev libboost-program-options-dev qtbase5-dev libvorbis-dev ninja-build ${CLANG_FORMAT} ${CLANG_TIDY}
 
     - name: Configure CMake
       # Use a bash shell so we can use the same syntax for environment variable
@@ -45,7 +47,7 @@ jobs:
       # Note the current convention is to use the -S and -B options here to specify source 
       # and build directories, but this is only available with CMake 3.13 and higher.  
       # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
-      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -GNinja -DCLANG_FORMAT=clang-format-15 -DCLANG_TIDY=clang-tidy-15
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -GNinja -DCLANG_FORMAT=${CLANG_FORMAT} -DCLANG_TIDY=${CLANG_TIDY}
 
     - name: Setup Environment (PR)  
       if: ${{ github.event_name == 'pull_request' }}  
@@ -65,14 +67,11 @@ jobs:
       working-directory: ${{runner.workspace}}
       shell: bash
       run: |
-        cd $GITHUB_WORKSPACE
-        if [ "${{env.BEFORE_COMMIT_SHA}}" == "0000000000000000000000000000000000000000" ]
-        then
-          echo '$GITHUB_WORKSPACE/tools/lint.sh ${{env.AFTER_COMMIT_SHA}}'
-          $GITHUB_WORKSPACE/tools/lint.sh ${{env.AFTER_COMMIT_SHA}}
-        else
-          echo '$GITHUB_WORKSPACE/tools/lint.sh ${{env.BEFORE_COMMIT_SHA}}..${{env.AFTER_COMMIT_SHA}}'
-          $GITHUB_WORKSPACE/tools/lint.sh ${{env.BEFORE_COMMIT_SHA}}..${{env.AFTER_COMMIT_SHA}}
+        cmake --build ${{runner.workspace}}/build -t format-sources
+        if [[ `git -C $GITHUB_WORKSPACE status --porcelain` ]]; then
+          echo "Format mismatch:";
+          git -C $GITHUB_WORKSPACE diff;
+          exit 1;
         fi
 
 
@@ -83,10 +82,10 @@ jobs:
         cd $GITHUB_WORKSPACE
         if [ "${{env.BEFORE_COMMIT_SHA}}" == "0000000000000000000000000000000000000000" ]
         then
-          echo 'CLANG_TIDY=clang-tidy-15 BUILD_DIR=${{runner.workspace}}/build $GITHUB_WORKSPACE/tools/lint-tidy.sh ${{env.AFTER_COMMIT_SHA}} || true;'
-          CLANG_TIDY=clang-tidy-15 BUILD_DIR=${{runner.workspace}}/build $GITHUB_WORKSPACE/tools/lint-tidy.sh ${{env.AFTER_COMMIT_SHA}} || true;
+          echo 'BUILD_DIR=${{runner.workspace}}/build $GITHUB_WORKSPACE/tools/lint-tidy.sh ${{env.AFTER_COMMIT_SHA}} || true;'
+          BUILD_DIR=${{runner.workspace}}/build $GITHUB_WORKSPACE/tools/lint-tidy.sh ${{env.AFTER_COMMIT_SHA}} || true;
         else
-          echo 'CLANG_TIDY=clang-tidy-15 BUILD_DIR=${{runner.workspace}}/build $GITHUB_WORKSPACE/tools/lint-tidy.sh ${{env.BEFORE_COMMIT_SHA}}..${{env.AFTER_COMMIT_SHA}} || true;'
-          CLANG_TIDY=clang-tidy-15 BUILD_DIR=${{runner.workspace}}/build $GITHUB_WORKSPACE/tools/lint-tidy.sh ${{env.BEFORE_COMMIT_SHA}}..${{env.AFTER_COMMIT_SHA}} || true;
+          echo 'BUILD_DIR=${{runner.workspace}}/build $GITHUB_WORKSPACE/tools/lint-tidy.sh ${{env.BEFORE_COMMIT_SHA}}..${{env.AFTER_COMMIT_SHA}} || true;'
+          BUILD_DIR=${{runner.workspace}}/build $GITHUB_WORKSPACE/tools/lint-tidy.sh ${{env.BEFORE_COMMIT_SHA}}..${{env.AFTER_COMMIT_SHA}} || true;
         fi
 

.gitmodules

@@ -23,3 +23,6 @@
 [submodule "dependencies/fmt"]
 	path = dependencies/fmt
 	url = https://github.com/fmtlib/fmt.git
+[submodule "dependencies/magic_enum"]
+	path = dependencies/magic_enum
+	url = https://github.com/Neargye/magic_enum.git