Merge pull request #34 from cortex-command-community/unpch-ccache

un-PCH and use ccache in CI

Author: Causeless

.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
           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,24 @@ jobs:
           new_release_version: ${{inputs.new_release_version}}
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
+      - 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 +180,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>

RTEA.vcxproj

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

Source/Activities/AreaEditor.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/AssemblyEditor.cpp

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

Source/Activities/GAScripted.cpp

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

Source/Activities/GameActivity.h

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

Source/Activities/GibEditor.cpp

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