diff --git a/.github/parameters/macports.yml b/.github/parameters/macports.yml index 51778e668f..75741f9ebf 100644 --- a/.github/parameters/macports.yml +++ b/.github/parameters/macports.yml @@ -12,4 +12,5 @@ ports: - name: luajit - name: flac - name: dylibbundler - - name: tree \ No newline at end of file + - name: tree + - name: ccache diff --git a/.github/workflows/meson.yml b/.github/workflows/meson.yml index f52877bd8b..7d35c864f3 100644 --- a/.github/workflows/meson.yml +++ b/.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/ccache-action@v1.2 + 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,10 +152,18 @@ 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/ccache-action@v1.2 + 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 @@ -158,8 +171,8 @@ jobs: - 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 diff --git a/RTEA.common.props b/RTEA.common.props new file mode 100644 index 0000000000..5a95a2d870 --- /dev/null +++ b/RTEA.common.props @@ -0,0 +1,10 @@ + + + + + + + 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) + + + diff --git a/RTEA.vcxproj b/RTEA.vcxproj index 6fb4bab055..9ea6adc4e5 100644 --- a/RTEA.vcxproj +++ b/RTEA.vcxproj @@ -155,13 +155,14 @@ $(OutDir) WindowsLocalDebugger + /bigobj /Zm300 %(AdditionalOptions) /bigobj %(AdditionalOptions) Disabled $(ProjectDir);$(ProjectDir)\Source;$(ProjectDir)Source\System;$(ProjectDir)Source\Lua;$(ProjectDir)Source\Entities;$(ProjectDir)Source\Activities;$(ProjectDir)Source\Managers;$(ProjectDir)Source\Menus;$(ProjectDir)Source\GUI;$(ProjectDir)Source\GUI\Wrappers;$(ProjectDir)external\include\boost_1_75;$(ProjectDir)external\include\glm-0.9.9.8;$(ProjectDir)external\include\glad-2.0.0-beta;$(ProjectDir)external\include\LZ4-1.9.3\LZ4;$(ProjectDir)external\include\fmod-2.2.13;$(ProjectDir)external\include\thread-pool-3.5.0\include;$(ProjectDir)external\include\hopscotch-map-2.3.1\include;$(ProjectDir)external\sources\libpng-1.6.40\include;$(ProjectDir)external\sources\zlib-ng-2.1.3\include;$(ProjectDir)external\sources\allegro 4.4.3.1-custom\include;$(ProjectDir)external\sources\allegro 4.4.3.1-custom\addons\loadpng;$(ProjectDir)external\sources\SDL2-2.26.3\include;$(ProjectDir)external\sources\LuaJIT-2.1\src;$(ProjectDir)external\sources\luabind-0.7.1\;$(ProjectDir)external\sources\luabind-0.7.1\luabind;$(ProjectDir)external\sources\RakNet\include;$(ProjectDir)external\sources\minizip-ng-4.0.0\include;$(ProjectDir)external\sources\minizip-ng-4.0.0\src;$(ProjectDir)external\sources\tracy\public - _ITERATOR_DEBUG_LEVEL=0;WIN32_LEAN_AND_MEAN;ALLEGRO_STATICLINK;ALLEGRO_NO_STD_HEADERS;ALLEGRO_NO_MAGIC_MAIN;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;ZLIB_COMPAT;_WINDOWS;WIN32;DEBUG_BUILD;DEBUGMODE;TARGET_MACHINE_X86;%(PreprocessorDefinitions) + _ITERATOR_DEBUG_LEVEL=0;ZLIB_COMPAT;_WINDOWS;WIN32;DEBUG_BUILD;DEBUGMODE;TARGET_MACHINE_X86;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -207,13 +208,14 @@ $(IntDir)$(TargetName).bsc + /bigobj /Zm300 %(AdditionalOptions) /bigobj %(AdditionalOptions) MaxSpeed $(ProjectDir);$(ProjectDir)\Source;$(ProjectDir)Source\System;$(ProjectDir)Source\Lua;$(ProjectDir)Source\Entities;$(ProjectDir)Source\Activities;$(ProjectDir)Source\Managers;$(ProjectDir)Source\Menus;$(ProjectDir)Source\GUI;$(ProjectDir)Source\GUI\Wrappers;$(ProjectDir)external\include\boost_1_75;$(ProjectDir)external\include\glm-0.9.9.8;$(ProjectDir)external\include\glad-2.0.0-beta;$(ProjectDir)external\include\LZ4-1.9.3\LZ4;$(ProjectDir)external\include\fmod-2.2.13;$(ProjectDir)external\include\thread-pool-3.5.0\include;$(ProjectDir)external\include\hopscotch-map-2.3.1\include;$(ProjectDir)external\sources\libpng-1.6.40\include;$(ProjectDir)external\sources\zlib-ng-2.1.3\include;$(ProjectDir)external\sources\allegro 4.4.3.1-custom\include;$(ProjectDir)external\sources\allegro 4.4.3.1-custom\addons\loadpng;$(ProjectDir)external\sources\SDL2-2.26.3\include;$(ProjectDir)external\sources\LuaJIT-2.1\src;$(ProjectDir)external\sources\luabind-0.7.1\;$(ProjectDir)external\sources\luabind-0.7.1\luabind;$(ProjectDir)external\sources\RakNet\include;$(ProjectDir)external\sources\minizip-ng-4.0.0\include;$(ProjectDir)external\sources\minizip-ng-4.0.0\src;$(ProjectDir)external\sources\tracy\public - _ITERATOR_DEBUG_LEVEL=0;WIN32_LEAN_AND_MEAN;ALLEGRO_STATICLINK;ALLEGRO_NO_STD_HEADERS;ALLEGRO_NO_MAGIC_MAIN;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;ZLIB_COMPAT;_WINDOWS;WIN32;TRACY_ENABLE;TRACY_ON_DEMAND;DEBUG_BUILD;DEBUGMODE;%(PreprocessorDefinitions) + _ITERATOR_DEBUG_LEVEL=0;ZLIB_COMPAT;_WINDOWS;WIN32;TRACY_ENABLE;TRACY_ON_DEMAND;DEBUG_BUILD;DEBUGMODE;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -259,13 +261,14 @@ $(IntDir)$(TargetName).bsc + /bigobj /Zm300 %(AdditionalOptions) /bigobj %(AdditionalOptions) Disabled $(ProjectDir);$(ProjectDir)\Source;$(ProjectDir)Source\System;$(ProjectDir)Source\Lua;$(ProjectDir)Source\Entities;$(ProjectDir)Source\Activities;$(ProjectDir)Source\Managers;$(ProjectDir)Source\Menus;$(ProjectDir)Source\GUI;$(ProjectDir)Source\GUI\Wrappers;$(ProjectDir)external\include\boost_1_75;$(ProjectDir)external\include\glm-0.9.9.8;$(ProjectDir)external\include\glad-2.0.0-beta;$(ProjectDir)external\include\LZ4-1.9.3\LZ4;$(ProjectDir)external\include\fmod-2.2.13;$(ProjectDir)external\include\thread-pool-3.5.0\include;$(ProjectDir)external\include\hopscotch-map-2.3.1\include;$(ProjectDir)external\sources\libpng-1.6.40\include;$(ProjectDir)external\sources\zlib-ng-2.1.3\include;$(ProjectDir)external\sources\allegro 4.4.3.1-custom\include;$(ProjectDir)external\sources\allegro 4.4.3.1-custom\addons\loadpng;$(ProjectDir)external\sources\SDL2-2.26.3\include;$(ProjectDir)external\sources\LuaJIT-2.1\src;$(ProjectDir)external\sources\luabind-0.7.1\;$(ProjectDir)external\sources\luabind-0.7.1\luabind;$(ProjectDir)external\sources\RakNet\include;$(ProjectDir)external\sources\minizip-ng-4.0.0\include;$(ProjectDir)external\sources\minizip-ng-4.0.0\src;$(ProjectDir)external\sources\tracy\public - _ITERATOR_DEBUG_LEVEL=0;WIN32_LEAN_AND_MEAN;ALLEGRO_STATICLINK;ALLEGRO_NO_STD_HEADERS;ALLEGRO_NO_MAGIC_MAIN;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;ZLIB_COMPAT;_WINDOWS;WIN32;MIN_DEBUG_BUILD;DEBUGMODE;TARGET_MACHINE_X86;%(PreprocessorDefinitions) + _ITERATOR_DEBUG_LEVEL=0;ZLIB_COMPAT;_WINDOWS;WIN32;MIN_DEBUG_BUILD;DEBUGMODE;TARGET_MACHINE_X86;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -311,13 +314,14 @@ $(IntDir)$(TargetName).bsc + /bigobj /Zm300 %(AdditionalOptions) /bigobj %(AdditionalOptions) Disabled $(ProjectDir);$(ProjectDir)\Source;$(ProjectDir)Source\System;$(ProjectDir)Source\Lua;$(ProjectDir)Source\Entities;$(ProjectDir)Source\Activities;$(ProjectDir)Source\Managers;$(ProjectDir)Source\Menus;$(ProjectDir)Source\GUI;$(ProjectDir)Source\GUI\Wrappers;$(ProjectDir)external\include\boost_1_75;$(ProjectDir)external\include\glm-0.9.9.8;$(ProjectDir)external\include\glad-2.0.0-beta;$(ProjectDir)external\include\LZ4-1.9.3\LZ4;$(ProjectDir)external\include\fmod-2.2.13;$(ProjectDir)external\include\thread-pool-3.5.0\include;$(ProjectDir)external\include\hopscotch-map-2.3.1\include;$(ProjectDir)external\sources\libpng-1.6.40\include;$(ProjectDir)external\sources\zlib-ng-2.1.3\include;$(ProjectDir)external\sources\allegro 4.4.3.1-custom\include;$(ProjectDir)external\sources\allegro 4.4.3.1-custom\addons\loadpng;$(ProjectDir)external\sources\SDL2-2.26.3\include;$(ProjectDir)external\sources\LuaJIT-2.1\src;$(ProjectDir)external\sources\luabind-0.7.1\;$(ProjectDir)external\sources\luabind-0.7.1\luabind;$(ProjectDir)external\sources\RakNet\include;$(ProjectDir)external\sources\minizip-ng-4.0.0\include;$(ProjectDir)external\sources\minizip-ng-4.0.0\src;$(ProjectDir)external\sources\tracy\public - _ITERATOR_DEBUG_LEVEL=0;WIN32_LEAN_AND_MEAN;ALLEGRO_STATICLINK;ALLEGRO_NO_STD_HEADERS;ALLEGRO_NO_MAGIC_MAIN;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;ZLIB_COMPAT;_WINDOWS;WIN32;MIN_DEBUG_BUILD;DEBUGMODE;%(PreprocessorDefinitions) + _ITERATOR_DEBUG_LEVEL=0;ZLIB_COMPAT;_WINDOWS;WIN32;MIN_DEBUG_BUILD;DEBUGMODE;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -363,6 +367,7 @@ $(IntDir)$(TargetName).bsc + /bigobj /Zm300 %(AdditionalOptions) @@ -372,7 +377,7 @@ Speed false $(ProjectDir);$(ProjectDir)\Source;$(ProjectDir)Source\System;$(ProjectDir)Source\Lua;$(ProjectDir)Source\Entities;$(ProjectDir)Source\Activities;$(ProjectDir)Source\Managers;$(ProjectDir)Source\Menus;$(ProjectDir)Source\GUI;$(ProjectDir)Source\GUI\Wrappers;$(ProjectDir)external\include\boost_1_75;$(ProjectDir)external\include\glm-0.9.9.8;$(ProjectDir)external\include\glad-2.0.0-beta;$(ProjectDir)external\include\LZ4-1.9.3\LZ4;$(ProjectDir)external\include\fmod-2.2.13;$(ProjectDir)external\include\thread-pool-3.5.0\include;$(ProjectDir)external\include\hopscotch-map-2.3.1\include;$(ProjectDir)external\sources\libpng-1.6.40\include;$(ProjectDir)external\sources\zlib-ng-2.1.3\include;$(ProjectDir)external\sources\allegro 4.4.3.1-custom\include;$(ProjectDir)external\sources\allegro 4.4.3.1-custom\addons\loadpng;$(ProjectDir)external\sources\SDL2-2.26.3\include;$(ProjectDir)external\sources\LuaJIT-2.1\src;$(ProjectDir)external\sources\luabind-0.7.1\;$(ProjectDir)external\sources\luabind-0.7.1\luabind;$(ProjectDir)external\sources\RakNet\include;$(ProjectDir)external\sources\minizip-ng-4.0.0\include;$(ProjectDir)external\sources\minizip-ng-4.0.0\src;$(ProjectDir)external\sources\tracy\public - _ITERATOR_DEBUG_LEVEL=0;WIN32_LEAN_AND_MEAN;ALLEGRO_STATICLINK;ALLEGRO_NO_STD_HEADERS;ALLEGRO_NO_MAGIC_MAIN;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;ZLIB_COMPAT;_WINDOWS;WIN32;DEBUG_RELEASE_BUILD;NDEBUG;TRACY_ENABLE;TRACY_ON_DEMAND;TARGET_MACHINE_X86;%(PreprocessorDefinitions) + _ITERATOR_DEBUG_LEVEL=0;ZLIB_COMPAT;_WINDOWS;WIN32;DEBUG_RELEASE_BUILD;NDEBUG;TRACY_ENABLE;TRACY_ON_DEMAND;TARGET_MACHINE_X86;%(PreprocessorDefinitions) Sync MultiThreadedDLL false @@ -424,6 +429,7 @@ $(IntDir)$(TargetName).bsc + /bigobj /Zm300 %(AdditionalOptions) @@ -433,7 +439,7 @@ Speed false $(ProjectDir);$(ProjectDir)\Source;$(ProjectDir)Source\System;$(ProjectDir)Source\Lua;$(ProjectDir)Source\Entities;$(ProjectDir)Source\Activities;$(ProjectDir)Source\Managers;$(ProjectDir)Source\Menus;$(ProjectDir)Source\GUI;$(ProjectDir)Source\GUI\Wrappers;$(ProjectDir)external\include\boost_1_75;$(ProjectDir)external\include\glm-0.9.9.8;$(ProjectDir)external\include\glad-2.0.0-beta;$(ProjectDir)external\include\LZ4-1.9.3\LZ4;$(ProjectDir)external\include\fmod-2.2.13;$(ProjectDir)external\include\thread-pool-3.5.0\include;$(ProjectDir)external\include\hopscotch-map-2.3.1\include;$(ProjectDir)external\sources\libpng-1.6.40\include;$(ProjectDir)external\sources\zlib-ng-2.1.3\include;$(ProjectDir)external\sources\allegro 4.4.3.1-custom\include;$(ProjectDir)external\sources\allegro 4.4.3.1-custom\addons\loadpng;$(ProjectDir)external\sources\SDL2-2.26.3\include;$(ProjectDir)external\sources\LuaJIT-2.1\src;$(ProjectDir)external\sources\luabind-0.7.1\;$(ProjectDir)external\sources\luabind-0.7.1\luabind;$(ProjectDir)external\sources\RakNet\include;$(ProjectDir)external\sources\minizip-ng-4.0.0\include;$(ProjectDir)external\sources\minizip-ng-4.0.0\src;$(ProjectDir)external\sources\tracy\public - _ITERATOR_DEBUG_LEVEL=0;WIN32_LEAN_AND_MEAN;ALLEGRO_STATICLINK;ALLEGRO_NO_STD_HEADERS;ALLEGRO_NO_MAGIC_MAIN;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;ZLIB_COMPAT;_WINDOWS;WIN32;TRACY_ENABLE;TRACY_ON_DEMAND;PROFILING_BUILD;NDEBUG;TARGET_MACHINE_X86;%(PreprocessorDefinitions) + _ITERATOR_DEBUG_LEVEL=0;ZLIB_COMPAT;_WINDOWS;WIN32;TRACY_ENABLE;TRACY_ON_DEMAND;PROFILING_BUILD;NDEBUG;TARGET_MACHINE_X86;%(PreprocessorDefinitions) Sync MultiThreadedDLL false @@ -485,6 +491,7 @@ $(IntDir)$(TargetName).bsc + /bigobj /Zm300 %(AdditionalOptions) @@ -494,7 +501,7 @@ Speed false $(ProjectDir);$(ProjectDir)\Source;$(ProjectDir)Source\System;$(ProjectDir)Source\Lua;$(ProjectDir)Source\Entities;$(ProjectDir)Source\Activities;$(ProjectDir)Source\Managers;$(ProjectDir)Source\Menus;$(ProjectDir)Source\GUI;$(ProjectDir)Source\GUI\Wrappers;$(ProjectDir)external\include\boost_1_75;$(ProjectDir)external\include\glm-0.9.9.8;$(ProjectDir)external\include\glad-2.0.0-beta;$(ProjectDir)external\include\LZ4-1.9.3\LZ4;$(ProjectDir)external\include\fmod-2.2.13;$(ProjectDir)external\include\thread-pool-3.5.0\include;$(ProjectDir)external\include\hopscotch-map-2.3.1\include;$(ProjectDir)external\sources\libpng-1.6.40\include;$(ProjectDir)external\sources\zlib-ng-2.1.3\include;$(ProjectDir)external\sources\allegro 4.4.3.1-custom\include;$(ProjectDir)external\sources\allegro 4.4.3.1-custom\addons\loadpng;$(ProjectDir)external\sources\SDL2-2.26.3\include;$(ProjectDir)external\sources\LuaJIT-2.1\src;$(ProjectDir)external\sources\luabind-0.7.1\;$(ProjectDir)external\sources\luabind-0.7.1\luabind;$(ProjectDir)external\sources\RakNet\include;$(ProjectDir)external\sources\minizip-ng-4.0.0\include;$(ProjectDir)external\sources\minizip-ng-4.0.0\src;$(ProjectDir)external\sources\tracy\public - _ITERATOR_DEBUG_LEVEL=0;WIN32_LEAN_AND_MEAN;ALLEGRO_STATICLINK;ALLEGRO_NO_STD_HEADERS;ALLEGRO_NO_MAGIC_MAIN;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;ZLIB_COMPAT;_WINDOWS;WIN32;DEBUG_RELEASE_BUILD;NDEBUG;TRACY_ENABLE;TRACY_ON_DEMAND;%(PreprocessorDefinitions) + _ITERATOR_DEBUG_LEVEL=0;ZLIB_COMPAT;_WINDOWS;WIN32;DEBUG_RELEASE_BUILD;NDEBUG;TRACY_ENABLE;TRACY_ON_DEMAND;%(PreprocessorDefinitions) Sync MultiThreadedDLL false @@ -546,6 +553,7 @@ $(IntDir)$(TargetName).bsc + /bigobj /Zm300 %(AdditionalOptions) @@ -555,7 +563,7 @@ Speed true $(ProjectDir);$(ProjectDir)\Source;$(ProjectDir)Source\System;$(ProjectDir)Source\Lua;$(ProjectDir)Source\Entities;$(ProjectDir)Source\Activities;$(ProjectDir)Source\Managers;$(ProjectDir)Source\Menus;$(ProjectDir)Source\GUI;$(ProjectDir)Source\GUI\Wrappers;$(ProjectDir)external\include\boost_1_75;$(ProjectDir)external\include\glm-0.9.9.8;$(ProjectDir)external\include\glad-2.0.0-beta;$(ProjectDir)external\include\LZ4-1.9.3\LZ4;$(ProjectDir)external\include\fmod-2.2.13;$(ProjectDir)external\include\thread-pool-3.5.0\include;$(ProjectDir)external\include\hopscotch-map-2.3.1\include;$(ProjectDir)external\sources\libpng-1.6.40\include;$(ProjectDir)external\sources\zlib-ng-2.1.3\include;$(ProjectDir)external\sources\allegro 4.4.3.1-custom\include;$(ProjectDir)external\sources\allegro 4.4.3.1-custom\addons\loadpng;$(ProjectDir)external\sources\SDL2-2.26.3\include;$(ProjectDir)external\sources\LuaJIT-2.1\src;$(ProjectDir)external\sources\luabind-0.7.1\;$(ProjectDir)external\sources\luabind-0.7.1\luabind;$(ProjectDir)external\sources\RakNet\include;$(ProjectDir)external\sources\minizip-ng-4.0.0\include;$(ProjectDir)external\sources\minizip-ng-4.0.0\src;$(ProjectDir)external\sources\tracy\public - _ITERATOR_DEBUG_LEVEL=0;WIN32_LEAN_AND_MEAN;ALLEGRO_STATICLINK;ALLEGRO_NO_STD_HEADERS;ALLEGRO_NO_MAGIC_MAIN;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;ZLIB_COMPAT;_WINDOWS;WIN32;TRACY_ENABLE;TRACY_ON_DEMAND;PROFILING_BUILD;NDEBUG;%(PreprocessorDefinitions) + _ITERATOR_DEBUG_LEVEL=0;ZLIB_COMPAT;_WINDOWS;WIN32;TRACY_ENABLE;TRACY_ON_DEMAND;PROFILING_BUILD;NDEBUG;%(PreprocessorDefinitions) Sync MultiThreadedDLL false @@ -607,6 +615,7 @@ $(IntDir)$(TargetName).bsc + /bigobj /Zm300 %(AdditionalOptions) @@ -616,7 +625,7 @@ Speed true $(ProjectDir);$(ProjectDir)\Source;$(ProjectDir)Source\System;$(ProjectDir)Source\Lua;$(ProjectDir)Source\Entities;$(ProjectDir)Source\Activities;$(ProjectDir)Source\Managers;$(ProjectDir)Source\Menus;$(ProjectDir)Source\GUI;$(ProjectDir)Source\GUI\Wrappers;$(ProjectDir)external\include\boost_1_75;$(ProjectDir)external\include\glm-0.9.9.8;$(ProjectDir)external\include\glad-2.0.0-beta;$(ProjectDir)external\include\LZ4-1.9.3\LZ4;$(ProjectDir)external\include\fmod-2.2.13;$(ProjectDir)external\include\thread-pool-3.5.0\include;$(ProjectDir)external\include\hopscotch-map-2.3.1\include;$(ProjectDir)external\sources\libpng-1.6.40\include;$(ProjectDir)external\sources\zlib-ng-2.1.3\include;$(ProjectDir)external\sources\allegro 4.4.3.1-custom\include;$(ProjectDir)external\sources\allegro 4.4.3.1-custom\addons\loadpng;$(ProjectDir)external\sources\SDL2-2.26.3\include;$(ProjectDir)external\sources\LuaJIT-2.1\src;$(ProjectDir)external\sources\luabind-0.7.1\;$(ProjectDir)external\sources\luabind-0.7.1\luabind;$(ProjectDir)external\sources\RakNet\include;$(ProjectDir)external\sources\minizip-ng-4.0.0\include;$(ProjectDir)external\sources\minizip-ng-4.0.0\src;$(ProjectDir)external\sources\tracy\public - _ITERATOR_DEBUG_LEVEL=0;WIN32_LEAN_AND_MEAN;ALLEGRO_STATICLINK;ALLEGRO_NO_STD_HEADERS;ALLEGRO_NO_MAGIC_MAIN;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;ZLIB_COMPAT;_WINDOWS;WIN32;RELEASE_BUILD;NDEBUG;LUABIND_NO_ERROR_CHECKING;TRACY_ENABLE;TRACY_ON_DEMAND;TRACY_ONLY_LOCALHOST;TRACY_NO_BROADCAST;TARGET_MACHINE_X86;%(PreprocessorDefinitions) + _ITERATOR_DEBUG_LEVEL=0;ZLIB_COMPAT;_WINDOWS;WIN32;RELEASE_BUILD;NDEBUG;LUABIND_NO_ERROR_CHECKING;TRACY_ENABLE;TRACY_ON_DEMAND;TRACY_ONLY_LOCALHOST;TRACY_NO_BROADCAST;TARGET_MACHINE_X86;%(PreprocessorDefinitions) Sync MultiThreadedDLL false @@ -666,6 +675,7 @@ $(IntDir)$(TargetName).bsc + /bigobj /Zm300 %(AdditionalOptions) @@ -675,7 +685,7 @@ Speed true $(ProjectDir);$(ProjectDir)\Source;$(ProjectDir)Source\System;$(ProjectDir)Source\Lua;$(ProjectDir)Source\Entities;$(ProjectDir)Source\Activities;$(ProjectDir)Source\Managers;$(ProjectDir)Source\Menus;$(ProjectDir)Source\GUI;$(ProjectDir)Source\GUI\Wrappers;$(ProjectDir)external\include\boost_1_75;$(ProjectDir)external\include\glm-0.9.9.8;$(ProjectDir)external\include\glad-2.0.0-beta;$(ProjectDir)external\include\LZ4-1.9.3\LZ4;$(ProjectDir)external\include\fmod-2.2.13;$(ProjectDir)external\include\thread-pool-3.5.0\include;$(ProjectDir)external\include\hopscotch-map-2.3.1\include;$(ProjectDir)external\sources\libpng-1.6.40\include;$(ProjectDir)external\sources\zlib-ng-2.1.3\include;$(ProjectDir)external\sources\allegro 4.4.3.1-custom\include;$(ProjectDir)external\sources\allegro 4.4.3.1-custom\addons\loadpng;$(ProjectDir)external\sources\SDL2-2.26.3\include;$(ProjectDir)external\sources\LuaJIT-2.1\src;$(ProjectDir)external\sources\luabind-0.7.1\;$(ProjectDir)external\sources\luabind-0.7.1\luabind;$(ProjectDir)external\sources\RakNet\include;$(ProjectDir)external\sources\minizip-ng-4.0.0\include;$(ProjectDir)external\sources\minizip-ng-4.0.0\src;$(ProjectDir)external\sources\tracy\public - _ITERATOR_DEBUG_LEVEL=0;WIN32_LEAN_AND_MEAN;ALLEGRO_STATICLINK;ALLEGRO_NO_STD_HEADERS;ALLEGRO_NO_MAGIC_MAIN;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;ZLIB_COMPAT;_WINDOWS;WIN32;RELEASE_BUILD;NDEBUG;LUABIND_NO_ERROR_CHECKING;TRACY_ENABLE;TRACY_ON_DEMAND;TRACY_ONLY_LOCALHOST;TRACY_NO_BROADCAST;%(PreprocessorDefinitions) + _ITERATOR_DEBUG_LEVEL=0;ZLIB_COMPAT;_WINDOWS;WIN32;RELEASE_BUILD;NDEBUG;LUABIND_NO_ERROR_CHECKING;TRACY_ENABLE;TRACY_ON_DEMAND;TRACY_ONLY_LOCALHOST;TRACY_NO_BROADCAST;%(PreprocessorDefinitions) Sync MultiThreadedDLL false diff --git a/Source/Activities/AreaEditor.cpp b/Source/Activities/AreaEditor.cpp index 0b01fe6490..aecc071d70 100644 --- a/Source/Activities/AreaEditor.cpp +++ b/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" diff --git a/Source/Activities/AssemblyEditor.cpp b/Source/Activities/AssemblyEditor.cpp index 02264eed5f..3d103e407d 100644 --- a/Source/Activities/AssemblyEditor.cpp +++ b/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" diff --git a/Source/Activities/GAScripted.cpp b/Source/Activities/GAScripted.cpp index c6f0ca3895..b0c0e973cd 100644 --- a/Source/Activities/GAScripted.cpp +++ b/Source/Activities/GAScripted.cpp @@ -26,6 +26,8 @@ #include "tracy/Tracy.hpp" +#include + using namespace RTE; ConcreteClassInfo(GAScripted, GameActivity, 0); diff --git a/Source/Activities/GameActivity.h b/Source/Activities/GameActivity.h index c4f1ac0192..3d6bb21117 100644 --- a/Source/Activities/GameActivity.h +++ b/Source/Activities/GameActivity.h @@ -11,6 +11,8 @@ #include "Scene.h" #include "Actor.h" +#include +#include namespace RTE { #define OBJARROWFRAMECOUNT 4 diff --git a/Source/Activities/GibEditor.cpp b/Source/Activities/GibEditor.cpp index cedaba9fbb..16fc69c41e 100644 --- a/Source/Activities/GibEditor.cpp +++ b/Source/Activities/GibEditor.cpp @@ -24,6 +24,7 @@ #include "GUIButton.h" #include "GUILabel.h" #include "GUIComboBox.h" +#include "System.h" #include "GibEditorGUI.h" diff --git a/Source/Activities/SceneEditor.cpp b/Source/Activities/SceneEditor.cpp index 989bf45652..6680766a7e 100644 --- a/Source/Activities/SceneEditor.cpp +++ b/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" diff --git a/Source/Entities/AHuman.h b/Source/Entities/AHuman.h index f87f632e62..12280821a7 100644 --- a/Source/Entities/AHuman.h +++ b/Source/Entities/AHuman.h @@ -10,6 +10,8 @@ #include "Leg.h" #include "LimbPath.h" +#include + struct BITMAP; namespace RTE { diff --git a/Source/Entities/Arm.h b/Source/Entities/Arm.h index e69f78fdcb..1030f121aa 100644 --- a/Source/Entities/Arm.h +++ b/Source/Entities/Arm.h @@ -2,6 +2,8 @@ #include "Attachable.h" +#include + namespace RTE { class HeldDevice; diff --git a/Source/Entities/HeldDevice.h b/Source/Entities/HeldDevice.h index 1dd0b1ba52..1acdded068 100644 --- a/Source/Entities/HeldDevice.h +++ b/Source/Entities/HeldDevice.h @@ -8,6 +8,9 @@ #include "Attachable.h" #include "Actor.h" +#include +#include + namespace RTE { enum HeldDeviceType { diff --git a/Source/Entities/MOSParticle.cpp b/Source/Entities/MOSParticle.cpp index ac41c0fd8a..fd08dc8f5d 100644 --- a/Source/Entities/MOSParticle.cpp +++ b/Source/Entities/MOSParticle.cpp @@ -3,6 +3,8 @@ #include "Atom.h" #include "PostProcessMan.h" +#include + using namespace RTE; ConcreteClassInfo(MOSParticle, MovableObject, 1000); diff --git a/Source/Entities/MOSRotating.h b/Source/Entities/MOSRotating.h index b0795cea31..9528ea0469 100644 --- a/Source/Entities/MOSRotating.h +++ b/Source/Entities/MOSRotating.h @@ -8,6 +8,8 @@ #include "MOSprite.h" #include "Gib.h" +#include + namespace RTE { class AtomGroup; diff --git a/Source/Entities/Material.h b/Source/Entities/Material.h index ece9bf759d..20e055fee8 100644 --- a/Source/Entities/Material.h +++ b/Source/Entities/Material.h @@ -4,6 +4,8 @@ #include "ContentFile.h" #include "Color.h" +#include + namespace RTE { /// Represents a material and holds all the relevant data. diff --git a/Source/Entities/MovableObject.cpp b/Source/Entities/MovableObject.cpp index 0833fd3065..c4730e3bd4 100644 --- a/Source/Entities/MovableObject.cpp +++ b/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 + using namespace RTE; AbstractClassInfo(MovableObject, SceneObject); diff --git a/Source/Entities/MovableObject.h b/Source/Entities/MovableObject.h index f37a266053..c58b43cfd1 100644 --- a/Source/Entities/MovableObject.h +++ b/Source/Entities/MovableObject.h @@ -13,6 +13,8 @@ #include "Material.h" #include "MovableMan.h" +#include + struct BITMAP; namespace RTE { diff --git a/Source/Entities/PieMenu.h b/Source/Entities/PieMenu.h index 5107de075b..2ea1fae9cd 100644 --- a/Source/Entities/PieMenu.h +++ b/Source/Entities/PieMenu.h @@ -4,6 +4,8 @@ #include "Controller.h" #include "Matrix.h" +#include + namespace RTE { class Controller; diff --git a/Source/Entities/SLTerrain.cpp b/Source/Entities/SLTerrain.cpp index f6143880df..5d7bca955e 100644 --- a/Source/Entities/SLTerrain.cpp +++ b/Source/Entities/SLTerrain.cpp @@ -9,6 +9,9 @@ #include "DataModule.h" #include "PresetMan.h" +#include +#include + using namespace RTE; ConcreteClassInfo(SLTerrain, SceneLayer, 0); diff --git a/Source/Entities/Scene.h b/Source/Entities/Scene.h index a37d01a285..6f1be6351c 100644 --- a/Source/Entities/Scene.h +++ b/Source/Entities/Scene.h @@ -10,6 +10,9 @@ #include "Activity.h" #include "PathFinder.h" +#include +#include + namespace RTE { class ContentFile; diff --git a/Source/Entities/SceneLayer.cpp b/Source/Entities/SceneLayer.cpp index 85d275db6d..6be1cc8e82 100644 --- a/Source/Entities/SceneLayer.cpp +++ b/Source/Entities/SceneLayer.cpp @@ -8,6 +8,8 @@ #include "tracy/Tracy.hpp" +#include + using namespace RTE; ConcreteClassInfo(SceneLayerTracked, Entity, 0); diff --git a/Source/Entities/SceneLayer.h b/Source/Entities/SceneLayer.h index 313dcf57dc..ecfedf9e26 100644 --- a/Source/Entities/SceneLayer.h +++ b/Source/Entities/SceneLayer.h @@ -4,6 +4,8 @@ #include "ContentFile.h" #include "Box.h" +#include + namespace RTE { /// A scrolling layer of the Scene. diff --git a/Source/Entities/SoundContainer.h b/Source/Entities/SoundContainer.h index acf3fe84e0..7c7751e316 100644 --- a/Source/Entities/SoundContainer.h +++ b/Source/Entities/SoundContainer.h @@ -3,6 +3,8 @@ #include "Entity.h" #include "AudioMan.h" +#include + namespace RTE { class Vector; struct SoundData; diff --git a/Source/GUI/GUIBanner.h b/Source/GUI/GUIBanner.h index fc3303ad9e..56b0f74750 100644 --- a/Source/GUI/GUIBanner.h +++ b/Source/GUI/GUIBanner.h @@ -8,6 +8,9 @@ #include "Timer.h" #include "allegro.h" +#include +#include + struct BITMAP; #define MAXBANNERFONTCHARS 256 diff --git a/Source/GUI/GUIComboBox.cpp b/Source/GUI/GUIComboBox.cpp index 4aafb65121..47c2b468e6 100644 --- a/Source/GUI/GUIComboBox.cpp +++ b/Source/GUI/GUIComboBox.cpp @@ -1,6 +1,8 @@ #include "GUI.h" #include "GUIComboBox.h" +#include + using namespace RTE; GUIComboBox::GUIComboBox(GUIManager* Manager, GUIControlManager* ControlManager) : diff --git a/Source/GUI/GUIControl.cpp b/Source/GUI/GUIControl.cpp index b9fa0cbe74..b7690df3fa 100644 --- a/Source/GUI/GUIControl.cpp +++ b/Source/GUI/GUIControl.cpp @@ -1,5 +1,7 @@ #include "GUI.h" +#include + using namespace RTE; GUIControl::GUIControl() { diff --git a/Source/GUI/GUIControlManager.cpp b/Source/GUI/GUIControlManager.cpp index 51e820f5e8..7a2f0fa764 100644 --- a/Source/GUI/GUIControlManager.cpp +++ b/Source/GUI/GUIControlManager.cpp @@ -1,6 +1,8 @@ #include "GUI.h" #include "PresetMan.h" +#include + using namespace RTE; GUIControlManager::GUIControlManager() { diff --git a/Source/GUI/GUIEvent.cpp b/Source/GUI/GUIEvent.cpp index 4e3162875c..4c74d4653e 100644 --- a/Source/GUI/GUIEvent.cpp +++ b/Source/GUI/GUIEvent.cpp @@ -1,5 +1,7 @@ #include "GUI.h" +#include + using namespace RTE; GUIEvent::GUIEvent() { diff --git a/Source/GUI/GUIFont.cpp b/Source/GUI/GUIFont.cpp index 6a77a70d56..717afd4e74 100644 --- a/Source/GUI/GUIFont.cpp +++ b/Source/GUI/GUIFont.cpp @@ -1,5 +1,7 @@ #include "GUI.h" +#include + using namespace RTE; GUIFont::GUIFont(const std::string& Name) { diff --git a/Source/GUI/GUIListPanel.cpp b/Source/GUI/GUIListPanel.cpp index 73f28ce96b..75591af780 100644 --- a/Source/GUI/GUIListPanel.cpp +++ b/Source/GUI/GUIListPanel.cpp @@ -1,6 +1,8 @@ #include "GUI.h" #include "GUIListPanel.h" +#include + using namespace RTE; #define RIGHTTEXTWIDTH 36 diff --git a/Source/GUI/GUIManager.cpp b/Source/GUI/GUIManager.cpp index b4d2016c7b..4180476c0a 100644 --- a/Source/GUI/GUIManager.cpp +++ b/Source/GUI/GUIManager.cpp @@ -1,6 +1,8 @@ #include "GUI.h" #include "Timer.h" +#include + using namespace RTE; GUIManager::GUIManager(GUIInput* input) { diff --git a/Source/GUI/GUIPanel.cpp b/Source/GUI/GUIPanel.cpp index 9c4e013d5b..90ff5b0124 100644 --- a/Source/GUI/GUIPanel.cpp +++ b/Source/GUI/GUIPanel.cpp @@ -1,5 +1,7 @@ #include "GUI.h" +#include + using namespace RTE; GUIPanel::GUIPanel(GUIManager* Manager) { diff --git a/Source/GUI/GUIProperties.cpp b/Source/GUI/GUIProperties.cpp index a05add064f..493ee37d0c 100644 --- a/Source/GUI/GUIProperties.cpp +++ b/Source/GUI/GUIProperties.cpp @@ -1,5 +1,7 @@ #include "GUI.h" +#include + using namespace RTE; GUIProperties::GUIProperties(const std::string& Name) { diff --git a/Source/GUI/GUIPropertyPage.cpp b/Source/GUI/GUIPropertyPage.cpp index 5717ae68d2..394a768bfa 100644 --- a/Source/GUI/GUIPropertyPage.cpp +++ b/Source/GUI/GUIPropertyPage.cpp @@ -1,6 +1,8 @@ #include "GUI.h" #include "GUIPropertyPage.h" +#include + using namespace RTE; GUIPropertyPage::GUIPropertyPage(GUIManager* Manager, GUIControlManager* ControlManager) : diff --git a/Source/GUI/GUIReader.cpp b/Source/GUI/GUIReader.cpp index 25dc81dda8..3c504b04f9 100644 --- a/Source/GUI/GUIReader.cpp +++ b/Source/GUI/GUIReader.cpp @@ -1,6 +1,8 @@ #include "GUI.h" #include "GUIReader.h" +#include + using namespace RTE; GUIReader::StreamInfo::StreamInfo(std::ifstream* stream, const std::string& filePath, int currentLine, int prevIndent) : diff --git a/Source/GUI/GUIReader.h b/Source/GUI/GUIReader.h index 2fe25bf380..8673572bc0 100644 --- a/Source/GUI/GUIReader.h +++ b/Source/GUI/GUIReader.h @@ -1,5 +1,7 @@ #pragma once +#include + namespace RTE { /// Reads GUI objects from std::istreams. diff --git a/Source/GUI/GUIScrollPanel.cpp b/Source/GUI/GUIScrollPanel.cpp index d8c2d1b4a7..43059271f1 100644 --- a/Source/GUI/GUIScrollPanel.cpp +++ b/Source/GUI/GUIScrollPanel.cpp @@ -1,6 +1,8 @@ #include "GUI.h" #include "GUIScrollPanel.h" +#include + using namespace RTE; GUIScrollPanel::GUIScrollPanel(GUIManager* Manager) : diff --git a/Source/GUI/GUIScrollbar.cpp b/Source/GUI/GUIScrollbar.cpp index a202f53d3e..94f37439e2 100644 --- a/Source/GUI/GUIScrollbar.cpp +++ b/Source/GUI/GUIScrollbar.cpp @@ -1,6 +1,8 @@ #include "GUI.h" #include "GUIScrollbar.h" +#include + using namespace RTE; GUIScrollbar::GUIScrollbar(GUIManager* Manager, GUIControlManager* ControlManager) : diff --git a/Source/GUI/GUISkin.cpp b/Source/GUI/GUISkin.cpp index dbb6c3944b..fb4c648df2 100644 --- a/Source/GUI/GUISkin.cpp +++ b/Source/GUI/GUISkin.cpp @@ -2,6 +2,8 @@ #include "GUIReader.h" #include "PresetMan.h" +#include + using namespace RTE; GUISkin::GUISkin(GUIScreen* Screen) { diff --git a/Source/GUI/GUITextPanel.cpp b/Source/GUI/GUITextPanel.cpp index ce8c134850..706cfb9f43 100644 --- a/Source/GUI/GUITextPanel.cpp +++ b/Source/GUI/GUITextPanel.cpp @@ -1,6 +1,8 @@ #include "GUI.h" #include "GUITextPanel.h" +#include + using namespace RTE; GUITextPanel::GUITextPanel(GUIManager* Manager) : diff --git a/Source/GUI/GUIUtil.h b/Source/GUI/GUIUtil.h index 2307c1b170..96ec51d4a0 100644 --- a/Source/GUI/GUIUtil.h +++ b/Source/GUI/GUIUtil.h @@ -1,5 +1,7 @@ #pragma once +#include + namespace RTE { /// A utility class with misc static functions for different things. diff --git a/Source/GUI/GUIWriter.cpp b/Source/GUI/GUIWriter.cpp index 619af3188a..9f6d54fa73 100644 --- a/Source/GUI/GUIWriter.cpp +++ b/Source/GUI/GUIWriter.cpp @@ -1,5 +1,7 @@ #include "GUIWriter.h" +#include + using namespace RTE; void GUIWriter::Clear() { diff --git a/Source/GUI/GUIWriter.h b/Source/GUI/GUIWriter.h index 3b179acad2..a7c1cef631 100644 --- a/Source/GUI/GUIWriter.h +++ b/Source/GUI/GUIWriter.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + namespace RTE { /// Writes GUI objects to std::ostreams. diff --git a/Source/GUI/Wrappers/GUIInputWrapper.h b/Source/GUI/Wrappers/GUIInputWrapper.h index 59238c07cb..e44b98c794 100644 --- a/Source/GUI/Wrappers/GUIInputWrapper.h +++ b/Source/GUI/Wrappers/GUIInputWrapper.h @@ -3,6 +3,9 @@ #include "GUIInput.h" #include "SDL_scancode.h" +#include +#include + namespace RTE { class Timer; diff --git a/Source/Lua/LuabindObjectWrapper.h b/Source/Lua/LuabindObjectWrapper.h index a1901085b5..8056028bc1 100644 --- a/Source/Lua/LuabindObjectWrapper.h +++ b/Source/Lua/LuabindObjectWrapper.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + struct lua_State; namespace luabind::adl { diff --git a/Source/Main.cpp b/Source/Main.cpp index 31629b1457..9b58f1d9ed 100644 --- a/Source/Main.cpp +++ b/Source/Main.cpp @@ -48,6 +48,7 @@ #include "PrimitiveMan.h" #include "ThreadMan.h" #include "LuaMan.h" +#include "System.h" #include "tracy/Tracy.hpp" diff --git a/Source/Managers/AudioMan.cpp b/Source/Managers/AudioMan.cpp index 8f99694c08..ae9fb6c9ca 100644 --- a/Source/Managers/AudioMan.cpp +++ b/Source/Managers/AudioMan.cpp @@ -11,6 +11,8 @@ #include "PresetMan.h" #include "SoundSet.h" +#include + using namespace RTE; AudioMan::AudioMan() { diff --git a/Source/Managers/CameraMan.h b/Source/Managers/CameraMan.h index f08404f564..37463e5b44 100644 --- a/Source/Managers/CameraMan.h +++ b/Source/Managers/CameraMan.h @@ -4,6 +4,8 @@ #include "Timer.h" #include "Vector.h" +#include + #define g_CameraMan CameraMan::Instance() namespace RTE { diff --git a/Source/Managers/ConsoleMan.cpp b/Source/Managers/ConsoleMan.cpp index 8e7aee588e..0f08506a55 100644 --- a/Source/Managers/ConsoleMan.cpp +++ b/Source/Managers/ConsoleMan.cpp @@ -13,6 +13,7 @@ #include "GUICollectionBox.h" #include "GUITextBox.h" #include "GUILabel.h" +#include "System.h" using namespace RTE; diff --git a/Source/Managers/ConsoleMan.h b/Source/Managers/ConsoleMan.h index 801214506e..3b97c8c3cb 100644 --- a/Source/Managers/ConsoleMan.h +++ b/Source/Managers/ConsoleMan.h @@ -2,6 +2,10 @@ #include "Singleton.h" +#include +#include +#include + #define g_ConsoleMan ConsoleMan::Instance() namespace RTE { diff --git a/Source/Managers/FrameMan.cpp b/Source/Managers/FrameMan.cpp index 8347d1a78a..7db89eff6a 100644 --- a/Source/Managers/FrameMan.cpp +++ b/Source/Managers/FrameMan.cpp @@ -14,6 +14,7 @@ #include "SLTerrain.h" #include "SLBackground.h" #include "Scene.h" +#include "System.h" #include "GUI.h" #include "AllegroBitmap.h" diff --git a/Source/Managers/FrameMan.h b/Source/Managers/FrameMan.h index 50a3f2e662..eec8534a23 100644 --- a/Source/Managers/FrameMan.h +++ b/Source/Managers/FrameMan.h @@ -3,6 +3,10 @@ #include "ContentFile.h" #include "Timer.h" #include "Box.h" +#include "Hash.h" + +#include +#include #define g_FrameMan FrameMan::Instance() diff --git a/Source/Managers/LuaMan.cpp b/Source/Managers/LuaMan.cpp index c1e0f745a5..8756b1a7ae 100644 --- a/Source/Managers/LuaMan.cpp +++ b/Source/Managers/LuaMan.cpp @@ -3,6 +3,7 @@ #include "LuabindObjectWrapper.h" #include "LuaBindingRegisterDefinitions.h" #include "ThreadMan.h" +#include "System.h" #include "tracy/Tracy.hpp" #include "tracy/TracyLua.hpp" diff --git a/Source/Managers/MenuMan.cpp b/Source/Managers/MenuMan.cpp index 4581f3aecb..6facc35d9e 100644 --- a/Source/Managers/MenuMan.cpp +++ b/Source/Managers/MenuMan.cpp @@ -18,6 +18,7 @@ #include "PauseMenuGUI.h" #include "MetagameGUI.h" #include "LoadingScreen.h" +#include "System.h" using namespace RTE; diff --git a/Source/Managers/MenuMan.h b/Source/Managers/MenuMan.h index f2b360785c..d03ce96b14 100644 --- a/Source/Managers/MenuMan.h +++ b/Source/Managers/MenuMan.h @@ -2,6 +2,8 @@ #include "Singleton.h" +#include + #define g_MenuMan MenuMan::Instance() namespace RTE { diff --git a/Source/Managers/MetaMan.cpp b/Source/Managers/MetaMan.cpp index 301e3d8f02..790efc1f9a 100644 --- a/Source/Managers/MetaMan.cpp +++ b/Source/Managers/MetaMan.cpp @@ -12,6 +12,7 @@ #include "MetagameGUI.h" #include "Scene.h" #include "SLTerrain.h" +#include "System.h" using namespace RTE; diff --git a/Source/Managers/MetaMan.h b/Source/Managers/MetaMan.h index 66d5cbd126..11ec6c35b0 100644 --- a/Source/Managers/MetaMan.h +++ b/Source/Managers/MetaMan.h @@ -22,6 +22,8 @@ namespace RTE { + class System; + #define DEFAULTGAMENAME "NewGame" #define AUTOSAVENAME "AutoSave" #define METASAVEPATH System::GetUserdataDirectory() + c_UserConquestSavesModuleName + "/" diff --git a/Source/Managers/MovableMan.h b/Source/Managers/MovableMan.h index 6377558cab..43bef364bf 100644 --- a/Source/Managers/MovableMan.h +++ b/Source/Managers/MovableMan.h @@ -9,6 +9,11 @@ #include "Singleton.h" #include "Activity.h" +#include +#include +#include +#include + #define g_MovableMan MovableMan::Instance() namespace RTE { diff --git a/Source/Managers/NetworkServer.h b/Source/Managers/NetworkServer.h index 86cf4adb65..b5b4a33cf2 100644 --- a/Source/Managers/NetworkServer.h +++ b/Source/Managers/NetworkServer.h @@ -10,6 +10,13 @@ #include "Singleton.h" #include "NetworkMessages.h" +#include +#include +#include +#include +#include +#include + #define g_NetworkServer NetworkServer::Instance() ///////////////////////////////////////////////////////////////////////// diff --git a/Source/Managers/PerformanceMan.h b/Source/Managers/PerformanceMan.h index a456b6f56c..fac21aa757 100644 --- a/Source/Managers/PerformanceMan.h +++ b/Source/Managers/PerformanceMan.h @@ -3,7 +3,12 @@ #include "Singleton.h" #include "Timer.h" +#include #include +#include +#include +#include +#include #define g_PerformanceMan PerformanceMan::Instance() diff --git a/Source/Managers/PostProcessMan.h b/Source/Managers/PostProcessMan.h index b6111aab52..fade942866 100644 --- a/Source/Managers/PostProcessMan.h +++ b/Source/Managers/PostProcessMan.h @@ -7,6 +7,11 @@ #include #include "Shader.h" +#include +#include +#include +#include + #define g_PostProcessMan PostProcessMan::Instance() namespace RTE { diff --git a/Source/Managers/PresetMan.cpp b/Source/Managers/PresetMan.cpp index 32f2cf234f..8a91724b7a 100644 --- a/Source/Managers/PresetMan.cpp +++ b/Source/Managers/PresetMan.cpp @@ -16,6 +16,7 @@ #include "ConsoleMan.h" #include "LoadingScreen.h" #include "SettingsMan.h" +#include "System.h" using namespace RTE; diff --git a/Source/Managers/PresetMan.h b/Source/Managers/PresetMan.h index 78527775c5..b9f4f6bb25 100644 --- a/Source/Managers/PresetMan.h +++ b/Source/Managers/PresetMan.h @@ -8,6 +8,12 @@ #include "Entity.h" #include "Singleton.h" +#include +#include +#include +#include +#include + #define g_PresetMan PresetMan::Instance() namespace RTE { diff --git a/Source/Managers/PrimitiveMan.cpp b/Source/Managers/PrimitiveMan.cpp index b527a6b94e..8e007a6517 100644 --- a/Source/Managers/PrimitiveMan.cpp +++ b/Source/Managers/PrimitiveMan.cpp @@ -7,6 +7,8 @@ #include "tracy/Tracy.hpp" +#include + using namespace RTE; std::unique_ptr PrimitiveMan::MakeUniqueOfAppropriateTypeFromPrimitiveRawPtr(GraphicalPrimitive* primitive) { diff --git a/Source/Managers/SceneMan.h b/Source/Managers/SceneMan.h index 48f33d9339..dbb42ec07d 100644 --- a/Source/Managers/SceneMan.h +++ b/Source/Managers/SceneMan.h @@ -13,6 +13,13 @@ #include "ActivityMan.h" +#include +#include +#include +#include +#include +#include + #define g_SceneMan SceneMan::Instance() namespace RTE { diff --git a/Source/Managers/SettingsMan.cpp b/Source/Managers/SettingsMan.cpp index c176fcb29f..b167caba26 100644 --- a/Source/Managers/SettingsMan.cpp +++ b/Source/Managers/SettingsMan.cpp @@ -10,6 +10,7 @@ #include "UInputMan.h" #include "NetworkClient.h" #include "NetworkServer.h" +#include "System.h" using namespace RTE; diff --git a/Source/Managers/SettingsMan.h b/Source/Managers/SettingsMan.h index cafdcdab08..60466cce95 100644 --- a/Source/Managers/SettingsMan.h +++ b/Source/Managers/SettingsMan.h @@ -3,6 +3,9 @@ #include "Serializable.h" #include "Singleton.h" +#include +#include + #define g_SettingsMan SettingsMan::Instance() namespace RTE { diff --git a/Source/Managers/TimerMan.cpp b/Source/Managers/TimerMan.cpp index ea7c9d253c..4aeaa1cb61 100644 --- a/Source/Managers/TimerMan.cpp +++ b/Source/Managers/TimerMan.cpp @@ -4,11 +4,8 @@ #include "PerformanceMan.h" #include "SettingsMan.h" -#ifdef _WIN32 -#include -#elif _LINUX_OR_MACOSX_ -#include -#endif +#include +#include using namespace RTE; diff --git a/Source/Managers/TimerMan.h b/Source/Managers/TimerMan.h index 8ac9a68fe6..b1f272b36f 100644 --- a/Source/Managers/TimerMan.h +++ b/Source/Managers/TimerMan.h @@ -2,6 +2,9 @@ #include "Singleton.h" +#include +#include + #define g_TimerMan TimerMan::Instance() namespace RTE { diff --git a/Source/Managers/UInputMan.cpp b/Source/Managers/UInputMan.cpp index 80f272e7a6..4d364e88b1 100644 --- a/Source/Managers/UInputMan.cpp +++ b/Source/Managers/UInputMan.cpp @@ -10,6 +10,7 @@ #include "Icon.h" #include "GameActivity.h" #include "NetworkServer.h" +#include "System.h" #include "SDL.h" diff --git a/Source/Managers/UInputMan.h b/Source/Managers/UInputMan.h index 921158a76c..12704242e9 100644 --- a/Source/Managers/UInputMan.h +++ b/Source/Managers/UInputMan.h @@ -7,6 +7,11 @@ #include "SDL_keyboard.h" #include "SDL_events.h" +#include +#include +#include +#include + #define g_UInputMan UInputMan::Instance() extern "C" { diff --git a/Source/Menus/BuyMenuGUI.cpp b/Source/Menus/BuyMenuGUI.cpp index 9a2413892a..20a468a239 100644 --- a/Source/Menus/BuyMenuGUI.cpp +++ b/Source/Menus/BuyMenuGUI.cpp @@ -30,6 +30,7 @@ #include "HeldDevice.h" #include "AHuman.h" #include "ACraft.h" +#include "System.h" using namespace RTE; diff --git a/Source/Menus/BuyMenuGUI.h b/Source/Menus/BuyMenuGUI.h index 59f2646065..b13d356b3b 100644 --- a/Source/Menus/BuyMenuGUI.h +++ b/Source/Menus/BuyMenuGUI.h @@ -10,6 +10,8 @@ #include "Controller.h" #include "Loadout.h" +#include + struct BITMAP; namespace RTE { diff --git a/Source/Menus/GibEditorGUI.cpp b/Source/Menus/GibEditorGUI.cpp index 652b594fa8..fb6de0bdaa 100644 --- a/Source/Menus/GibEditorGUI.cpp +++ b/Source/Menus/GibEditorGUI.cpp @@ -16,6 +16,8 @@ #include "GUISound.h" #include "PieMenu.h" +#include + using namespace RTE; #define MAXZOOMFACTOR 5 diff --git a/Source/Menus/GibEditorGUI.h b/Source/Menus/GibEditorGUI.h index 5b3851ebe6..bcf4e2a2e8 100644 --- a/Source/Menus/GibEditorGUI.h +++ b/Source/Menus/GibEditorGUI.h @@ -11,6 +11,9 @@ #include "Controller.h" #include "PieSlice.h" +#include +#include + struct BITMAP; namespace RTE { diff --git a/Source/Menus/InventoryMenuGUI.h b/Source/Menus/InventoryMenuGUI.h index b5b468e52f..88f18af795 100644 --- a/Source/Menus/InventoryMenuGUI.h +++ b/Source/Menus/InventoryMenuGUI.h @@ -8,6 +8,12 @@ #include "AllegroScreen.h" #include "GUIInputWrapper.h" +#include +#include +#include +#include +#include + namespace RTE { class Controller; diff --git a/Source/Menus/LoadingScreen.cpp b/Source/Menus/LoadingScreen.cpp index 7865e3f7b9..02d960fe65 100644 --- a/Source/Menus/LoadingScreen.cpp +++ b/Source/Menus/LoadingScreen.cpp @@ -11,6 +11,7 @@ #include "GUIInputWrapper.h" #include "GUICollectionBox.h" #include "GUIListBox.h" +#include "System.h" using namespace RTE; diff --git a/Source/Menus/LoadingScreen.h b/Source/Menus/LoadingScreen.h index eac50bc39a..359d2fb598 100644 --- a/Source/Menus/LoadingScreen.h +++ b/Source/Menus/LoadingScreen.h @@ -2,6 +2,9 @@ #include "Singleton.h" +#include +#include + #define g_LoadingScreen LoadingScreen::Instance() namespace RTE { diff --git a/Source/Menus/MetagameGUI.cpp b/Source/Menus/MetagameGUI.cpp index 77a19b0001..cc7ab5d93e 100644 --- a/Source/Menus/MetagameGUI.cpp +++ b/Source/Menus/MetagameGUI.cpp @@ -38,6 +38,7 @@ #include "SLTerrain.h" #include "DataModule.h" #include "Loadout.h" +#include "System.h" using namespace RTE; diff --git a/Source/Menus/ModManagerGUI.h b/Source/Menus/ModManagerGUI.h index 0788600f11..3c5fbeb018 100644 --- a/Source/Menus/ModManagerGUI.h +++ b/Source/Menus/ModManagerGUI.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + namespace RTE { class AllegroScreen; diff --git a/Source/Menus/PauseMenuGUI.h b/Source/Menus/PauseMenuGUI.h index ba41c04a8f..3d239f0f25 100644 --- a/Source/Menus/PauseMenuGUI.h +++ b/Source/Menus/PauseMenuGUI.h @@ -2,6 +2,10 @@ #include "Timer.h" +#include +#include +#include + struct BITMAP; namespace RTE { diff --git a/Source/Menus/SaveLoadMenuGUI.cpp b/Source/Menus/SaveLoadMenuGUI.cpp index a79293e3ae..04d83fa821 100644 --- a/Source/Menus/SaveLoadMenuGUI.cpp +++ b/Source/Menus/SaveLoadMenuGUI.cpp @@ -19,6 +19,8 @@ #include "GUITextBox.h" #include "GUIComboBox.h" +#include + using namespace RTE; SaveLoadMenuGUI::SaveLoadMenuGUI(AllegroScreen* guiScreen, GUIInputWrapper* guiInput, bool createForPauseMenu) { diff --git a/Source/Menus/SaveLoadMenuGUI.h b/Source/Menus/SaveLoadMenuGUI.h index 8bb6accf21..137262efad 100644 --- a/Source/Menus/SaveLoadMenuGUI.h +++ b/Source/Menus/SaveLoadMenuGUI.h @@ -1,6 +1,9 @@ #pragma once #include +#include +#include +#include namespace RTE { diff --git a/Source/Menus/ScenarioActivityConfigGUI.h b/Source/Menus/ScenarioActivityConfigGUI.h index 9d9eeab178..d3883dd3f4 100644 --- a/Source/Menus/ScenarioActivityConfigGUI.h +++ b/Source/Menus/ScenarioActivityConfigGUI.h @@ -2,6 +2,8 @@ #include "Activity.h" +#include + namespace RTE { class GameActivity; diff --git a/Source/Menus/SceneEditorGUI.cpp b/Source/Menus/SceneEditorGUI.cpp index 18069f2065..2346020955 100644 --- a/Source/Menus/SceneEditorGUI.cpp +++ b/Source/Menus/SceneEditorGUI.cpp @@ -24,6 +24,9 @@ #include "Deployment.h" #include "BunkerAssemblyScheme.h" +#include +#include + using namespace RTE; #define MAXBRAINPATHCOST 10000 diff --git a/Source/Menus/SceneEditorGUI.h b/Source/Menus/SceneEditorGUI.h index 873be90b71..ac72327824 100644 --- a/Source/Menus/SceneEditorGUI.h +++ b/Source/Menus/SceneEditorGUI.h @@ -12,6 +12,9 @@ #include "PieSlice.h" #include "PathFinder.h" +#include +#include + struct BITMAP; namespace RTE { diff --git a/Source/Menus/SettingsGUI.h b/Source/Menus/SettingsGUI.h index 5b9b64d9d4..0a1ae2565e 100644 --- a/Source/Menus/SettingsGUI.h +++ b/Source/Menus/SettingsGUI.h @@ -6,6 +6,9 @@ #include "SettingsGameplayGUI.h" #include "SettingsMiscGUI.h" +#include +#include + namespace RTE { class AllegroScreen; diff --git a/Source/Menus/SettingsInputGUI.h b/Source/Menus/SettingsInputGUI.h index 916cc30ebb..7d10807dd0 100644 --- a/Source/Menus/SettingsInputGUI.h +++ b/Source/Menus/SettingsInputGUI.h @@ -4,6 +4,9 @@ struct BITMAP; +#include +#include + namespace RTE { class Controller; diff --git a/Source/Menus/SettingsInputMappingGUI.h b/Source/Menus/SettingsInputMappingGUI.h index 9114c8af74..7f1619f706 100644 --- a/Source/Menus/SettingsInputMappingGUI.h +++ b/Source/Menus/SettingsInputMappingGUI.h @@ -2,6 +2,9 @@ #include "SettingsInputMappingWizardGUI.h" +#include +#include + namespace RTE { class GUIControlManager; diff --git a/Source/Menus/SettingsVideoGUI.cpp b/Source/Menus/SettingsVideoGUI.cpp index 3e67d8d9bc..a67d82f471 100644 --- a/Source/Menus/SettingsVideoGUI.cpp +++ b/Source/Menus/SettingsVideoGUI.cpp @@ -20,6 +20,8 @@ #include #endif +#include + using namespace RTE; std::string SettingsVideoGUI::PresetResolutionRecord::GetDisplayString() const { diff --git a/Source/Menus/SettingsVideoGUI.h b/Source/Menus/SettingsVideoGUI.h index a2670b3936..d334e42f7d 100644 --- a/Source/Menus/SettingsVideoGUI.h +++ b/Source/Menus/SettingsVideoGUI.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + namespace RTE { class GUIControlManager; diff --git a/Source/Menus/TitleScreen.h b/Source/Menus/TitleScreen.h index 75b2ea9250..3830c465da 100644 --- a/Source/Menus/TitleScreen.h +++ b/Source/Menus/TitleScreen.h @@ -6,6 +6,11 @@ #include "MOSParticle.h" #include "SceneLayer.h" +#include +#include +#include +#include + namespace RTE { class AllegroScreen; diff --git a/Source/System/Constants.h b/Source/System/Constants.h index ec8c8b3163..00d295d2e2 100644 --- a/Source/System/Constants.h +++ b/Source/System/Constants.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + namespace RTE { #pragma region Type Definitions diff --git a/Source/System/ContentFile.cpp b/Source/System/ContentFile.cpp index eb0d796232..cd57c043bb 100644 --- a/Source/System/ContentFile.cpp +++ b/Source/System/ContentFile.cpp @@ -4,11 +4,14 @@ #include "PresetMan.h" #include "ConsoleMan.h" #include "RTETools.h" +#include "System.h" #include "png.h" #include "fmod/fmod.hpp" #include "fmod/fmod_errors.h" +#include + using namespace RTE; const std::string ContentFile::c_ClassName = "ContentFile"; diff --git a/Source/System/ContentFile.h b/Source/System/ContentFile.h index 2e62edc20e..4a89210fb7 100644 --- a/Source/System/ContentFile.h +++ b/Source/System/ContentFile.h @@ -2,6 +2,11 @@ #include "Serializable.h" +#include +#include +#include +#include + namespace FMOD { class Sound; } diff --git a/Source/System/Controller.h b/Source/System/Controller.h index 4a8c6fe4c6..c1e08b304b 100644 --- a/Source/System/Controller.h +++ b/Source/System/Controller.h @@ -3,6 +3,9 @@ #include "Timer.h" #include "Vector.h" +#include +#include + namespace RTE { class Actor; diff --git a/Source/System/DataModule.cpp b/Source/System/DataModule.cpp index 091a01288a..966178433b 100644 --- a/Source/System/DataModule.cpp +++ b/Source/System/DataModule.cpp @@ -3,6 +3,7 @@ #include "SceneMan.h" #include "LuaMan.h" #include "GameVersion.h" +#include "System.h" #include diff --git a/Source/System/DataModule.h b/Source/System/DataModule.h index 31bd2e77fd..cc2aed372d 100644 --- a/Source/System/DataModule.h +++ b/Source/System/DataModule.h @@ -3,6 +3,13 @@ #include "ContentFile.h" #include "Constants.h" +#include +#include +#include +#include +#include +#include + // struct DATAFILE; // DataFile loading not implemented. struct BITMAP; diff --git a/Source/System/Entity.h b/Source/System/Entity.h index 7d5ca25ac3..dcd5cf0698 100644 --- a/Source/System/Entity.h +++ b/Source/System/Entity.h @@ -3,6 +3,9 @@ #include "Serializable.h" #include "RTEError.h" +#include +#include + namespace RTE { typedef std::function MemoryAllocate; //!< Convenient name definition for the memory allocation callback function. diff --git a/Source/System/GLCheck.cpp b/Source/System/GLCheck.cpp index a715eee0cd..b10453836c 100644 --- a/Source/System/GLCheck.cpp +++ b/Source/System/GLCheck.cpp @@ -1,5 +1,9 @@ #include "GLCheck.h" #include "glad/gl.h" + +#include +#include + void CheckOpenGLError(const char* stmt, const char* fname, int line) { GLenum err = glGetError(); if (err != GL_NO_ERROR) { diff --git a/Source/System/GraphicalPrimitive.h b/Source/System/GraphicalPrimitive.h index 7650d8284f..f074a86a10 100644 --- a/Source/System/GraphicalPrimitive.h +++ b/Source/System/GraphicalPrimitive.h @@ -2,6 +2,10 @@ #include "MOSprite.h" +#include +#include +#include + namespace RTE { #pragma region Graphical Primitive diff --git a/Source/System/Hash.h b/Source/System/Hash.h new file mode 100644 index 0000000000..5047948420 --- /dev/null +++ b/Source/System/Hash.h @@ -0,0 +1,20 @@ +#pragma once + +#include +#include + +namespace std { + + /// Custom std::hash specialization to allow using std::array as key in hash table based containers. + template struct hash> { + size_t operator()(const array& arr) const { + hash hasher; + size_t outHash = 0; + for (size_t i = 0; i < Size; ++i) { + // Stolen from java.lang.String.hashCode. It seems to be a popular number, because it is prime, and 31 * x can be implemented quite efficiently as (x << 5) - x. + outHash = outHash * 31 + hasher(arr[i]); + } + return outHash; + } + }; +} // namespace std diff --git a/Source/System/InputScheme.h b/Source/System/InputScheme.h index 0adf0e9361..18c120b237 100644 --- a/Source/System/InputScheme.h +++ b/Source/System/InputScheme.h @@ -3,6 +3,9 @@ #include "InputMapping.h" #include "Constants.h" +#include +#include + namespace RTE { /// A complete input configuration scheme description for a single player. diff --git a/Source/System/MicroPather/micropather.h b/Source/System/MicroPather/micropather.h index 2fb9da31b3..d333fb8478 100644 --- a/Source/System/MicroPather/micropather.h +++ b/Source/System/MicroPather/micropather.h @@ -74,6 +74,8 @@ distribution. typedef unsigned MP_UPTR; #endif +#include + namespace micropather { #ifdef GRINLIZ_NO_STL diff --git a/Source/System/PathFinder.cpp b/Source/System/PathFinder.cpp index 5cf7393efd..b61b8788bb 100644 --- a/Source/System/PathFinder.cpp +++ b/Source/System/PathFinder.cpp @@ -7,6 +7,8 @@ #include "tracy/Tracy.hpp" +#include + using namespace RTE; // One pathfinder per thread, lazily initialized. Shouldn't access this directly, use GetPather() instead. diff --git a/Source/System/PathFinder.h b/Source/System/PathFinder.h index a438695e88..3656745c27 100644 --- a/Source/System/PathFinder.h +++ b/Source/System/PathFinder.h @@ -3,6 +3,12 @@ #include "Box.h" #include "System/MicroPather/micropather.h" +#include +#include +#include +#include +#include + using namespace micropather; namespace RTE { diff --git a/Source/System/PieQuadrant.h b/Source/System/PieQuadrant.h index 4b875ceead..b358fdb6c6 100644 --- a/Source/System/PieQuadrant.h +++ b/Source/System/PieQuadrant.h @@ -2,6 +2,10 @@ #include "PieSlice.h" +#include +#include +#include + namespace RTE { /// A quadrant in a PieMenu, for easy PieSlice organization. diff --git a/Source/System/RTEError.cpp b/Source/System/RTEError.cpp index dcf9489d6a..dd5cb5e5c5 100644 --- a/Source/System/RTEError.cpp +++ b/Source/System/RTEError.cpp @@ -4,6 +4,7 @@ #include "FrameMan.h" #include "ConsoleMan.h" #include "ActivityMan.h" +#include "System.h" #include "SDL_messagebox.h" @@ -13,6 +14,12 @@ #include "RTEStackTrace.h" #endif +#include +#include +#include +#include +#include + using namespace RTE; bool RTEError::s_CurrentlyAborting = false; diff --git a/Source/System/RTEError.h b/Source/System/RTEError.h index e02e80852e..30a4c0d48d 100644 --- a/Source/System/RTEError.h +++ b/Source/System/RTEError.h @@ -1,7 +1,5 @@ #pragma once -#include "System.h" - #include "allegro.h" #include "loadpng.h" @@ -17,6 +15,9 @@ #define AbortAction std::abort() #endif +#include +#include + namespace RTE { /// Class for runtime error handling. diff --git a/Source/System/RTEStackTrace.h b/Source/System/RTEStackTrace.h index 81abeacad1..82c574b684 100644 --- a/Source/System/RTEStackTrace.h +++ b/Source/System/RTEStackTrace.h @@ -2,6 +2,9 @@ #include "StackWalker/StackWalker.h" +#include +#include + namespace RTE { /// Class for dumping stack traces on Windows. diff --git a/Source/System/RTETools.cpp b/Source/System/RTETools.cpp index 149c574f73..0377b729f9 100644 --- a/Source/System/RTETools.cpp +++ b/Source/System/RTETools.cpp @@ -1,6 +1,9 @@ #include "RTETools.h" #include "Vector.h" +#include "System.h" + +#include namespace RTE { diff --git a/Source/System/RTETools.h b/Source/System/RTETools.h index 594f45f4ce..a82d0a5a3d 100644 --- a/Source/System/RTETools.h +++ b/Source/System/RTETools.h @@ -5,6 +5,11 @@ #include "RTEError.h" #include "Constants.h" +#include +#include +#include +#include + namespace RTE { class Vector; diff --git a/Source/System/Reader.cpp b/Source/System/Reader.cpp index 14f5fb16c2..db3232e38e 100644 --- a/Source/System/Reader.cpp +++ b/Source/System/Reader.cpp @@ -2,6 +2,9 @@ #include "ConsoleMan.h" #include "PresetMan.h" #include "SettingsMan.h" +#include "System.h" + +#include using namespace RTE; diff --git a/Source/System/Reader.h b/Source/System/Reader.h index ff9633f53c..386c579d5d 100644 --- a/Source/System/Reader.h +++ b/Source/System/Reader.h @@ -1,5 +1,11 @@ #pragma once +#include +#include +#include +#include +#include + namespace RTE { using ProgressCallback = std::function; //!< Convenient name definition for the progress report callback function. diff --git a/Source/System/Serializable.h b/Source/System/Serializable.h index 67cb7fa9cd..c2befacaeb 100644 --- a/Source/System/Serializable.h +++ b/Source/System/Serializable.h @@ -6,6 +6,7 @@ #include #include #include +#include namespace RTE { diff --git a/Source/System/Shader.cpp b/Source/System/Shader.cpp index 550381955e..7c43be6a8b 100644 --- a/Source/System/Shader.cpp +++ b/Source/System/Shader.cpp @@ -7,6 +7,8 @@ #include "System/System.h" #include "RTEError.h" +#include + using namespace RTE; Shader::Shader() : diff --git a/Source/System/StandardIncludes.h b/Source/System/StandardIncludes.h index 86da2f8454..9e49b74c20 100644 --- a/Source/System/StandardIncludes.h +++ b/Source/System/StandardIncludes.h @@ -1,51 +1,9 @@ #pragma once -// Convenience macro to not have to write this out. -#define _LINUX_OR_MACOSX_ (__unix__ || (__APPLE__ && __MACH__)) - // This restores features removed from the C++17 standard (auto_ptr and some other stuff). This is needed for LuaBind to work because it relies on it heavily. #define _HAS_AUTO_PTR_ETC 1 #define _LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR -// Disable a bunch of unneeded crap in WinAPI (on top of WIN32_LEAN_AND_MEAN) -#ifdef _WIN32 -#define NOMINMAX -#define NOGDI -#define NOKERNEL -#define NONLS -#define NOMEMMGR -#define NOGDICAPMASKS -#define NOVIRTUALKEYCODES -#define NOWINMESSAGES -#define NOWINSTYLES -#define NOMETAFILE -#define NOSCROLL -#define NOTEXTMETRIC -#define NOCOMM -#define NOKANJI -#define NOHELP -#define NOPROFILER -#define NODEFERWINDOWPOS -#define NOMCX -#define NOMENUS -#define NOICONS -#define NOKEYSTATES -#define NOSYSCOMMANDS -#define NORASTEROPS -#define NOSHOWWINDOW -#define OEMRESOURCE -#define NOATOM -#define NODRAWTEXT -#define NOCOLOR -#define NOCTLMGR -#define NOMSG -#define NOOPENFILE -#define NOSERVICE -#define NOSOUND -#define NOWH -#define NOWINOFFSETS -#endif - // Inclusion of relevant C++ Standard Library headers. #include #include @@ -116,18 +74,4 @@ #include "LimbPath.h" #include "Leg.h" -namespace std { - - /// Custom std::hash specialization to allow using std::array as key in hash table based containers. - template struct hash> { - size_t operator()(const array& arr) const { - hash hasher; - size_t outHash = 0; - for (size_t i = 0; i < Size; ++i) { - // Stolen from java.lang.String.hashCode. It seems to be a popular number, because it is prime, and 31 * x can be implemented quite efficiently as (x << 5) - x. - outHash = outHash * 31 + hasher(arr[i]); - } - return outHash; - } - }; -} // namespace std +#include "Hash.h" diff --git a/Source/System/System.cpp b/Source/System/System.cpp index 2d5e96ecd0..853e540cd9 100644 --- a/Source/System/System.cpp +++ b/Source/System/System.cpp @@ -5,6 +5,9 @@ #include "RTEError.h" +// Convenience macro to not have to write this out. +#define _LINUX_OR_MACOSX_ (__unix__ || (__APPLE__ && __MACH__)) + #ifdef _WIN32 #include "Windows.h" #elif defined _LINUX_OR_MACOSX_ @@ -16,6 +19,16 @@ #include #endif +#include +#include +#include +#include +#include +#include +#include +#include +#include + using namespace RTE; bool System::s_Quit = false; diff --git a/Source/System/System.h b/Source/System/System.h index f54798da41..4199ce5f05 100644 --- a/Source/System/System.h +++ b/Source/System/System.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include // only one use of std::filesystem::file_time_type +#include + namespace RTE { /// Class for the system functionality. diff --git a/Source/System/Writer.cpp b/Source/System/Writer.cpp index 2a37406e3e..31ca56c0f3 100644 --- a/Source/System/Writer.cpp +++ b/Source/System/Writer.cpp @@ -2,6 +2,7 @@ #include "System.h" #include +#include using namespace RTE; diff --git a/Source/System/Writer.h b/Source/System/Writer.h index 2a56ba9d93..cc8209fca0 100644 --- a/Source/System/Writer.h +++ b/Source/System/Writer.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + namespace RTE { /// Writes RTE objects to std::ostreams. diff --git a/Source/meson.build b/Source/meson.build index 5e1f233ccb..71b758b8b1 100644 --- a/Source/meson.build +++ b/Source/meson.build @@ -1,5 +1,9 @@ -pch = meson.current_source_dir()/'System/StandardIncludes.h' +if use_pch + pch = meson.current_source_dir()/'System/StandardIncludes.h' +else + pch = '' +endif sources = [] source_libs = [] source_inc_dirs += [include_directories( diff --git a/external/sources/allegro 4.4.3.1-custom/include/allegro/inline/fmaths.inl b/external/sources/allegro 4.4.3.1-custom/include/allegro/inline/fmaths.inl index 6c98b9191b..5a4a37922d 100644 --- a/external/sources/allegro 4.4.3.1-custom/include/allegro/inline/fmaths.inl +++ b/external/sources/allegro 4.4.3.1-custom/include/allegro/inline/fmaths.inl @@ -23,6 +23,8 @@ #include "asm.inl" #undef ALLEGRO_IMPORT_MATH_ASM +#include + #ifdef __cplusplus extern "C" { #endif diff --git a/meson.build b/meson.build index 57192c2502..29b71b7dda 100644 --- a/meson.build +++ b/meson.build @@ -25,10 +25,29 @@ if get_option('debug') and get_option('b_lto') warning('Link time optimization enabled in debug mode, debug symbols may not be fully available. Disable b_lto with "meson configure -Db_lto=false".') endif +use_pch = get_option('use_pch').enabled() + +if get_option('use_pch').auto() + ccache = find_program('ccache', required : false) + if ccache.found() + message('Detected ccache, disabling precompiled headers') + use_pch = false + else + message('Using precompiled headers') + use_pch = true + endif +endif + if compiler.get_argument_syntax()== 'gcc' # used for gcc compatible compilers # Build against system libraries on linux message('gcc detected') + lld = find_program('lld', required : false) + if lld.found() + message('Detected lld, using it for linking') + link_args += ['-fuse-ld=lld'] + endif + if host_machine.system() == 'linux' build_rpath = '$ORIGIN:$ORIGIN/../external/lib/linux/x86_64' # Set RUNPATH so that CCCP can find libfmod.so without needing to set LD_LIBRARY_PATH elif host_machine.system()=='darwin' @@ -78,7 +97,47 @@ elif compiler.get_argument_syntax()== 'msvc' if host_machine.cpu_family() == 'x86' elfname += ' x86' endif - preprocessor_flags += ['-D_CRT_SECURE_NO_DEPRECATE', '-D_WINDOWS', '-DWIN32', '-DWIN32_LEAN_AND_MEAN'] + preprocessor_flags += [ + '-D_CRT_SECURE_NO_DEPRECATE', + '-D_WINDOWS', + '-DWIN32', + '-DWIN32_LEAN_AND_MEAN', + '-DNOMINMAX', + '-DNOGDI', + '-DNOKERNEL', + '-DNONLS', + '-DNOMEMMGR', + '-DNOGDICAPMASKS', + '-DNOVIRTUALKEYCODES', + '-DNOWINMESSAGES', + '-DNOWINSTYLES', + '-DNOMETAFILE', + '-DNOSCROLL', + '-DNOTEXTMETRIC', + '-DNOCOMM', + '-DNOKANJI', + '-DNOHELP', + '-DNOPROFILER', + '-DNODEFERWINDOWPOS', + '-DNOMCX', + '-DNOMENUS', + '-DNOICONS', + '-DNOKEYSTATES', + '-DNOSYSCOMMANDS', + '-DNORASTEROPS', + '-DNOSHOWWINDOW', + '-DOEMRESOURCE', + '-DNOATOM', + '-DNODRAWTEXT', + '-DNOCOLOR', + '-DNOCTLMGR', + '-DNOMSG', + '-DNOOPENFILE', + '-DNOSERVICE', + '-DNOSOUND', + '-DNOWH', + '-DNOWINOFFSETS' + ] link_args+=['-ignore:4099', '-ignore:4217'] buildtype_debug = get_option('debug') if buildtype_debug diff --git a/meson_options.txt b/meson_options.txt index 2eb8dd3319..117de85587 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -11,3 +11,4 @@ option('tracy_enable', type: 'boolean', value: true, description: 'Enable Tracy option('tracy_callstack', type : 'integer', value : 0, description : 'Enfore callstack collection for tracy regions') option('tracy_on_demand', type : 'boolean', value : true, description : 'On-demand profiling') option('tracy_debuginfod', type : 'boolean', value : false, description : 'Enable debuginfod support') +option('use_pch', type : 'feature', value : 'auto')