lld

.github/parameters/macports.yml

@@ -12,4 +12,5 @@ ports:
   - name: luajit
   - name: flac
   - name: dylibbundler
-  - name: tree
+  - name: tree
+  - name: ccache

.github/workflows/meson.yml

@@ -62,9 +62,14 @@ jobs:
       - name: Install Dependencies
         run: |
           sudo apt-get update -yq
-          sudo apt-get install --no-install-recommends wget liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev liblua5.2-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev libboost-dev libtbb-dev libsdl2-dev libsdl2-image-dev libopengl-dev libfuse2 ninja-build
+          sudo apt-get install --no-install-recommends wget liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev liblua5.2-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev libboost-dev libtbb-dev libsdl2-dev libsdl2-image-dev libopengl-dev libfuse2 ninja-build ccache lld
           sudo pip install meson
 
+      - name: ccache
+        uses: hendrikmuhs/[email protected]
+        with:
+          key: ${{ github.job }}-${{ matrix.os }}
+
       - name: Set Version
         if: ${{inputs.new_release_version}}
         uses: ./.github/actions/set_version
@@ -74,22 +79,22 @@ jobs:
 
       - name: Setup Meson
         env:
-          CC: "gcc"
-          CXX: "g++"
+          CC: "ccache gcc"
+          CXX: "ccache g++"
         run: |
           meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} -Db_lto=true build
 
       - name: Configure for AppImage
         if: ${{inputs.upload_artefacts}}
         env:
-          CC: "gcc"
-          CXX: "g++"
+          CC: "ccache gcc"
+          CXX: "ccache g++"
         run: meson configure -Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=/usr/lib/ --prefix=/usr/ build
 
       - name: Build
         env:
-          CC: "gcc"
-          CXX: "g++"
+          CC: "ccache gcc"
+          CXX: "ccache g++"
         run: |
           meson compile -C build
 
@@ -147,19 +152,27 @@ jobs:
           new_release_version: ${{inputs.new_release_version}}
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
+      # Note: macos-11 is too old to have precompiled ccache binaries, it gets built from source.
+      #       It's still a net win, as setting up ccache takes 4m51s, the CortexCommand rebuild takes less than a minute in most cases vs 8 minutes of rebuild when using PCH
+      #       This should become a non-issue when GitHub Actions updates to newer macos version.
+      - name: ccache
+        uses: hendrikmuhs/[email protected]
+        with:
+          key: ${{ github.job }}-${{ matrix.os }}
+
       - name: Setup Meson
         env:
-          CC: "gcc-${{env.GCC_VERSION}}"
-          CXX: "g++-${{env.GCC_VERSION}}"
+          CC: "ccache gcc-${{env.GCC_VERSION}}"
+          CXX: "ccache g++-${{env.GCC_VERSION}}"
           LDFLAGS: "-static-libgcc -static-libstdc++"
         run: |
           meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} -Db_lto=false build
 
       - name: Configure for App Bundle
         if: ${{inputs.upload_artefacts}}
         env:
-          CC: "gcc-${{env.GCC_VERSION}}"
-          CXX: "g++-${{env.GCC_VERSION}}"
+          CC: "ccache gcc-${{env.GCC_VERSION}}"
+          CXX: "ccache g++-${{env.GCC_VERSION}}"
           LDFLAGS: "-static-libgcc -static-libstdc++"
         run: |
           meson configure \
@@ -170,8 +183,8 @@ jobs:
 
       - name: Build
         env:
-          CC: "gcc-${{env.GCC_VERSION}}"
-          CXX: "g++-${{env.GCC_VERSION}}"
+          CC: "ccache gcc-${{env.GCC_VERSION}}"
+          CXX: "ccache g++-${{env.GCC_VERSION}}"
           LDFLAGS: "-static-libgcc -static-libstdc++"
         run: |
           meson compile -C build

RTEA.common.props

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;ALLEGRO_STATICLINK;ALLEGRO_NO_STD_HEADERS;ALLEGRO_NO_MAGIC_MAIN;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_WINDOWS;WIN32;NOMINMAX;NOGDI;NOKERNEL;NONLS;NOMEMMGR;NOGDICAPMASKS;NOVIRTUALKEYCODES;NOWINMESSAGES;NOWINSTYLES;NOMETAFILE;NOSCROLL;NOTEXTMETRIC;NOCOMM;NOKANJI;NOHELP;NOPROFILER;NODEFERWINDOWPOS;NOMCX;NOMENUS;NOICONS;NOKEYSTATES;NOSYSCOMMANDS;NORASTEROPS;NOSHOWWINDOW;OEMRESOURCE;NOATOM;NODRAWTEXT;NOCOLOR;NOCTLMGR;NOMSG;NOOPENFILE;NOSERVICE;NOSOUND;NOWH;NOWINOFFSETS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>

Source/Activities/AreaEditor.cpp

@@ -14,6 +14,7 @@
 #include "HeldDevice.h"
 #include "Scene.h"
 #include "DataModule.h"
+#include "System.h"
 
 #include "GUI.h"
 #include "AllegroBitmap.h"

Source/Activities/AssemblyEditor.cpp

@@ -14,6 +14,7 @@
 #include "HeldDevice.h"
 #include "Scene.h"
 #include "DataModule.h"
+#include "System.h"
 
 #include "GUI.h"
 #include "GUICollectionBox.h"

Source/Activities/GAScripted.cpp

@@ -26,6 +26,8 @@
 
 #include "tracy/Tracy.hpp"
 
+#include <fstream>
+
 using namespace RTE;
 
 ConcreteClassInfo(GAScripted, GameActivity, 0);

Source/Activities/GameActivity.h

@@ -11,6 +11,8 @@
 #include "Scene.h"
 #include "Actor.h"
 
+#include <array>
+#include <memory>
 namespace RTE {
 
 #define OBJARROWFRAMECOUNT 4

Source/Activities/GibEditor.cpp

@@ -24,6 +24,7 @@
 #include "GUIButton.h"
 #include "GUILabel.h"
 #include "GUIComboBox.h"
+#include "System.h"
 
 #include "GibEditorGUI.h"
 

Source/Activities/SceneEditor.cpp

@@ -23,6 +23,7 @@
 #include "GUIButton.h"
 #include "GUILabel.h"
 #include "GUIComboBox.h"
+#include "System.h"
 
 #include "SceneEditorGUI.h"
 #include "GameActivity.h"

Source/Entities/AHuman.h

@@ -10,6 +10,8 @@
 #include "Leg.h"
 #include "LimbPath.h"
 
+#include <array>
+
 struct BITMAP;
 
 namespace RTE {

Source/Entities/Arm.h

@@ -2,6 +2,8 @@
 
 #include "Attachable.h"
 
+#include <queue>
+
 namespace RTE {
 
 	class HeldDevice;

Source/Entities/HeldDevice.h

@@ -8,6 +8,9 @@
 #include "Attachable.h"
 #include "Actor.h"
 
+#include <array>
+#include <unordered_map>
+
 namespace RTE {
 
 	enum HeldDeviceType {

Source/Entities/MOSParticle.cpp

@@ -3,6 +3,8 @@
 #include "Atom.h"
 #include "PostProcessMan.h"
 
+#include <array>
+
 using namespace RTE;
 
 ConcreteClassInfo(MOSParticle, MovableObject, 1000);

Source/Entities/MOSRotating.h

@@ -8,6 +8,8 @@
 #include "MOSprite.h"
 #include "Gib.h"
 
+#include <unordered_set>
+
 namespace RTE {
 
 	class AtomGroup;

Source/Entities/Material.h

@@ -4,6 +4,8 @@
 #include "ContentFile.h"
 #include "Color.h"
 
+#include <cmath>
+
 namespace RTE {
 
 	/// Represents a material and holds all the relevant data.

Source/Entities/MovableObject.cpp

@@ -10,10 +10,14 @@
 #include "Actor.h"
 #include "SLTerrain.h"
 #include "PieMenu.h"
+#include "Serializable.h"
+#include "System.h"
 
 #include "Base64/base64.h"
 #include "tracy/Tracy.hpp"
 
+#include <array>
+
 using namespace RTE;
 
 AbstractClassInfo(MovableObject, SceneObject);

Source/Entities/MovableObject.h

@@ -13,6 +13,8 @@
 #include "Material.h"
 #include "MovableMan.h"
 
+#include <set>
+
 struct BITMAP;
 
 namespace RTE {

Source/Entities/PieMenu.h

@@ -4,6 +4,8 @@
 #include "Controller.h"
 #include "Matrix.h"
 
+#include <array>
+
 namespace RTE {
 
 	class Controller;

Source/Entities/SLTerrain.cpp

@@ -9,6 +9,9 @@
 #include "DataModule.h"
 #include "PresetMan.h"
 
+#include <array>
+#include <execution>
+
 using namespace RTE;
 
 ConcreteClassInfo(SLTerrain, SceneLayer, 0);

Source/Entities/Scene.h

@@ -10,6 +10,9 @@
 #include "Activity.h"
 #include "PathFinder.h"
 
+#include <array>
+#include <map>
+
 namespace RTE {
 
 	class ContentFile;

Source/Entities/SceneLayer.cpp

@@ -8,6 +8,8 @@
 
 #include "tracy/Tracy.hpp"
 
+#include <array>
+
 using namespace RTE;
 
 ConcreteClassInfo(SceneLayerTracked, Entity, 0);

Source/Entities/SceneLayer.h

@@ -4,6 +4,8 @@
 #include "ContentFile.h"
 #include "Box.h"
 
+#include <future>
+
 namespace RTE {
 
 	/// A scrolling layer of the Scene.

Source/Entities/SoundContainer.h

@@ -3,6 +3,8 @@
 #include "Entity.h"
 #include "AudioMan.h"
 
+#include <unordered_set>
+
 namespace RTE {
 	class Vector;
 	struct SoundData;

Source/GUI/GUIBanner.h

@@ -8,6 +8,9 @@
 #include "Timer.h"
 #include "allegro.h"
 
+#include <list>
+#include <map>
+
 struct BITMAP;
 
 #define MAXBANNERFONTCHARS 256

Source/GUI/GUIComboBox.cpp

@@ -1,6 +1,8 @@
 #include "GUI.h"
 #include "GUIComboBox.h"
 
+#include <cassert>
+
 using namespace RTE;
 
 GUIComboBox::GUIComboBox(GUIManager* Manager, GUIControlManager* ControlManager) :

Source/GUI/GUIControl.cpp

@@ -1,5 +1,7 @@
 #include "GUI.h"
 
+#include <cassert>
+
 using namespace RTE;
 
 GUIControl::GUIControl() {

Source/GUI/GUIControlManager.cpp

@@ -1,6 +1,8 @@
 #include "GUI.h"
 #include "PresetMan.h"
 
+#include <cassert>
+
 using namespace RTE;
 
 GUIControlManager::GUIControlManager() {

Source/GUI/GUIEvent.cpp

@@ -1,5 +1,7 @@
 #include "GUI.h"
 
+#include <cassert>
+
 using namespace RTE;
 
 GUIEvent::GUIEvent() {

Source/GUI/GUIFont.cpp

@@ -1,5 +1,7 @@
 #include "GUI.h"
 
+#include <cassert>
+
 using namespace RTE;
 
 GUIFont::GUIFont(const std::string& Name) {

Source/GUI/GUIListPanel.cpp

@@ -1,6 +1,8 @@
 #include "GUI.h"
 #include "GUIListPanel.h"
 
+#include <cassert>
+
 using namespace RTE;
 
 #define RIGHTTEXTWIDTH 36

Source/GUI/GUIManager.cpp

@@ -1,6 +1,8 @@
 #include "GUI.h"
 #include "Timer.h"
 
+#include <cassert>
+
 using namespace RTE;
 
 GUIManager::GUIManager(GUIInput* input) {

Source/GUI/GUIPanel.cpp

@@ -1,5 +1,7 @@
 #include "GUI.h"
 
+#include <cassert>
+
 using namespace RTE;
 
 GUIPanel::GUIPanel(GUIManager* Manager) {

Source/GUI/GUIProperties.cpp

@@ -1,5 +1,7 @@
 #include "GUI.h"
 
+#include <cassert>
+
 using namespace RTE;
 
 GUIProperties::GUIProperties(const std::string& Name) {

Source/GUI/GUIPropertyPage.cpp

@@ -1,6 +1,8 @@
 #include "GUI.h"
 #include "GUIPropertyPage.h"
 
+#include <cassert>
+
 using namespace RTE;
 
 GUIPropertyPage::GUIPropertyPage(GUIManager* Manager, GUIControlManager* ControlManager) :

Source/GUI/GUIReader.cpp

@@ -1,6 +1,8 @@
 #include "GUI.h"
 #include "GUIReader.h"
 
+#include <fstream>
+
 using namespace RTE;
 
 GUIReader::StreamInfo::StreamInfo(std::ifstream* stream, const std::string& filePath, int currentLine, int prevIndent) :