Merge pull request #10 from PixieCore/master

Switched to precompiled headers, compile time is very fast now.
This commit is contained in:
PixieCore 2021-07-19 15:51:49 +02:00 committed by GitHub
commit 91474ab2bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 124 additions and 96 deletions

View File

@ -1,5 +1,4 @@
#pragma once #pragma once
#include <d3d11.h>
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Initialization // Initialization

View File

@ -1,8 +1,4 @@
#pragma once #pragma once
#include <iostream>
#include <iomanip>
#include "utility.h"
void InstallOpcodes(); void InstallOpcodes();
inline HANDLE GameProcess = GetCurrentProcess(); inline HANDLE GameProcess = GetCurrentProcess();

View File

@ -1,8 +1,6 @@
#pragma once #pragma once
#include "imgui.h"
#include "serverlisting.h" #include "serverlisting.h"
#include "json.hpp"
#include <vector>
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Initialization // Initialization
void PrintDXAddress(); void PrintDXAddress();

View File

@ -1,8 +1,4 @@
#pragma once #pragma once
#include <iostream>
#include <iomanip>
#include "utility.h"
// Define the signatures or offsets to be searched and hooked // Define the signatures or offsets to be searched and hooked
namespace namespace

33
r5dev/include/pch.h Normal file
View File

@ -0,0 +1,33 @@
#pragma once
#pragma message("Pre-compiling headers.\n")
#include "httplib.h"
#define WIN32_LEAN_AND_MEAN // Prevent winsock2 redefinition.
#include <windows.h>
#include <detours.h>
#include <thread>
#include <fstream>
#include <stdio.h>
#include <filesystem>
#include <sstream>
#include <shlobj.h>
#include <objbase.h>
#include <cassert>
#include <iomanip>
#include <iostream>
#include <d3d11.h>
#include <string>
#include <Psapi.h>
#include <sinks/basic_file_sink.h>
#include <vector>
// Our headers
#include "imgui.h"
#include "imgui_impl_dx11.h"
#include "imgui_impl_win32.h"
#include "spdlog.h"
#include "utility.h"
#include "json.hpp"

View File

@ -1,6 +1,4 @@
#pragma once #pragma once
#include <string>
#include <iostream>
class ServerListing class ServerListing
{ {

View File

@ -1,7 +1,4 @@
#pragma once #pragma once
#include <Windows.h>
#include <Psapi.h>
#include <sinks/basic_file_sink.h>
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Internals // Internals

View File

@ -158,9 +158,8 @@
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;R5DEV_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;R5DEV_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile> <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<LanguageStandard_C>stdc17</LanguageStandard_C> <LanguageStandard_C>stdc17</LanguageStandard_C>
<LanguageStandard>stdcpp17</LanguageStandard> <LanguageStandard>stdcpp17</LanguageStandard>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
@ -287,6 +286,7 @@
<ClInclude Include="..\external\spdlog\include\stopwatch.h" /> <ClInclude Include="..\external\spdlog\include\stopwatch.h" />
<ClInclude Include="..\external\spdlog\include\tweakme.h" /> <ClInclude Include="..\external\spdlog\include\tweakme.h" />
<ClInclude Include="..\external\spdlog\include\version.h" /> <ClInclude Include="..\external\spdlog\include\version.h" />
<ClInclude Include="include\address.h" />
<ClInclude Include="include\console.h" /> <ClInclude Include="include\console.h" />
<ClInclude Include="include\enums.h" /> <ClInclude Include="include\enums.h" />
<ClInclude Include="include\gameclasses.h" /> <ClInclude Include="include\gameclasses.h" />
@ -298,29 +298,78 @@
<ClInclude Include="include\opcptc.h" /> <ClInclude Include="include\opcptc.h" />
<ClInclude Include="include\overlay.h" /> <ClInclude Include="include\overlay.h" />
<ClInclude Include="include\patterns.h" /> <ClInclude Include="include\patterns.h" />
<ClInclude Include="include\pch.h" />
<ClInclude Include="include\r5dev.h" /> <ClInclude Include="include\r5dev.h" />
<ClInclude Include="include\serverlisting.h" /> <ClInclude Include="include\serverlisting.h" />
<ClInclude Include="include\structs.h" /> <ClInclude Include="include\structs.h" />
<ClInclude Include="include\utility.h" /> <ClInclude Include="include\utility.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\external\imgui\src\imgui.cpp" /> <ClCompile Include="..\external\imgui\src\imgui.cpp">
<ClCompile Include="..\external\imgui\src\imgui_demo.cpp" /> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
<ClCompile Include="..\external\imgui\src\imgui_draw.cpp" /> </ClCompile>
<ClCompile Include="..\external\imgui\src\imgui_impl_dx11.cpp" /> <ClCompile Include="..\external\imgui\src\imgui_demo.cpp">
<ClCompile Include="..\external\imgui\src\imgui_impl_win32.cpp" /> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
<ClCompile Include="..\external\imgui\src\imgui_tables.cpp" /> </ClCompile>
<ClCompile Include="..\external\imgui\src\imgui_widgets.cpp" /> <ClCompile Include="..\external\imgui\src\imgui_draw.cpp">
<ClCompile Include="src\console.cpp" /> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
<ClCompile Include="src\dllmain.cpp" /> </ClCompile>
<ClCompile Include="src\gameclasses.cpp" /> <ClCompile Include="..\external\imgui\src\imgui_impl_dx11.cpp">
<ClCompile Include="src\hooks.cpp" /> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
<ClCompile Include="src\id3dx.cpp" /> </ClCompile>
<ClCompile Include="src\input.cpp" /> <ClCompile Include="..\external\imgui\src\imgui_impl_win32.cpp">
<ClCompile Include="src\opcptc.cpp" /> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
<ClCompile Include="src\overlay.cpp" /> </ClCompile>
<ClCompile Include="src\serverlisting.cpp" /> <ClCompile Include="..\external\imgui\src\imgui_tables.cpp">
<ClCompile Include="src\utility.cpp" /> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\external\imgui\src\imgui_widgets.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="src\console.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch.h</PrecompiledHeaderFile>
</ClCompile>
<ClCompile Include="src\dllmain.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch.h</PrecompiledHeaderFile>
</ClCompile>
<ClCompile Include="src\gameclasses.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch.h</PrecompiledHeaderFile>
</ClCompile>
<ClCompile Include="src\hooks.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch.h</PrecompiledHeaderFile>
</ClCompile>
<ClCompile Include="src\id3dx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch.h</PrecompiledHeaderFile>
</ClCompile>
<ClCompile Include="src\input.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch.h</PrecompiledHeaderFile>
</ClCompile>
<ClCompile Include="src\opcptc.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch.h</PrecompiledHeaderFile>
</ClCompile>
<ClCompile Include="src\overlay.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch.h</PrecompiledHeaderFile>
</ClCompile>
<ClCompile Include="src\pch.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch.h</PrecompiledHeaderFile>
</ClCompile>
<ClCompile Include="src\serverlisting.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch.h</PrecompiledHeaderFile>
</ClCompile>
<ClCompile Include="src\utility.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader>
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch.h</PrecompiledHeaderFile>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="r5dev.def" /> <None Include="r5dev.def" />

View File

@ -105,6 +105,9 @@
<ClCompile Include="src\gameclasses.cpp"> <ClCompile Include="src\gameclasses.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\pch.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="include\console.h"> <ClInclude Include="include\console.h">
@ -467,6 +470,12 @@
<ClInclude Include="include\json.hpp"> <ClInclude Include="include\json.hpp">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\address.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\pch.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="r5dev.def"> <None Include="r5dev.def">

View File

@ -1,10 +1,4 @@
#include <string> #include "pch.h"
#include <sstream>
#include <iostream>
#include <Windows.h>
#include <detours.h>
#include "id3dx.h" #include "id3dx.h"
#include "hooks.h" #include "hooks.h"
#include "opcptc.h" #include "opcptc.h"

View File

@ -1,13 +1,10 @@
#include <Windows.h> #include "pch.h"
#include <string>
#include "r5dev.h" #include "r5dev.h"
#include "id3dx.h" #include "id3dx.h"
#include "input.h" #include "input.h"
#include "hooks.h" #include "hooks.h"
#include "opcptc.h" #include "opcptc.h"
#include "console.h" #include "console.h"
#include "utility.h"
#include "gameclasses.h" #include "gameclasses.h"
//############################################################################# //#############################################################################

View File

@ -1,3 +1,4 @@
#include "pch.h"
#include "gameclasses.h" #include "gameclasses.h"
namespace GameGlobals namespace GameGlobals

View File

@ -1,10 +1,5 @@
#include <string> #include "pch.h"
#include <Windows.h>
#include <detours.h>
#include "patterns.h" #include "patterns.h"
#include "utility.h"
#include "structs.h" #include "structs.h"
#include "overlay.h" #include "overlay.h"
#include "hooks.h" #include "hooks.h"

View File

@ -1,10 +1,4 @@
#include <iomanip> #include "pch.h"
#include <iostream>
#include <stdio.h>
#include <d3d11.h>
#include <windows.h>
#include "id3dx.h" #include "id3dx.h"
#include "input.h" #include "input.h"
#include "enums.h" #include "enums.h"
@ -14,10 +8,6 @@
#include "patterns.h" #include "patterns.h"
#include "gameclasses.h" #include "gameclasses.h"
#include "imgui.h"
#include "imgui_impl_dx11.h"
#include "imgui_impl_win32.h"
#pragma comment(lib, "d3d11.lib") #pragma comment(lib, "d3d11.lib")
/*--------------------------------------------------------------------------------- /*---------------------------------------------------------------------------------

View File

@ -1,9 +1,4 @@
#include <cassert> #include "pch.h"
#include <windows.h>
#include <stdio.h>
#include "detours.h"
#include "input.h" #include "input.h"
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------

View File

@ -1,4 +1,4 @@
#include "windows.h" #include "pch.h"
#include "opcptc.h" #include "opcptc.h"
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------

View File

@ -1,27 +1,11 @@
#include "pch.h"
#include "overlay.h" #include "overlay.h"
#include <thread>
#include <fstream>
#include <stdio.h>
#include "httplib.h"
#include <windows.h>
#include <detours.h>
#include "hooks.h" #include "hooks.h"
#include "id3dx.h" #include "id3dx.h"
#include "console.h" #include "console.h"
#include "patterns.h" #include "patterns.h"
#include "gameclasses.h" #include "gameclasses.h"
#include "imgui.h"
#include "imgui_impl_dx11.h"
#include "imgui_impl_win32.h"
#include <filesystem>
#include <thread>
#include <sstream>
#include <shlobj.h>
#include <objbase.h>
#define DebugOverlay #define DebugOverlay

1
r5dev/src/pch.cpp Normal file
View File

@ -0,0 +1 @@
#include "pch.h"

View File

@ -1,6 +1,6 @@
#include "pch.h"
#include "serverlisting.h" #include "serverlisting.h"
#include "overlay.h" #include "overlay.h"
#include "httplib.h"
void ServerListing::Select() void ServerListing::Select()
{ {

View File

@ -1,9 +1,5 @@
#include <Windows.h> #include "pch.h"
#include <Psapi.h>
#include <stdio.h>
#include "utility.h" #include "utility.h"
#include "spdlog.h"
#include "hooks.h" #include "hooks.h"
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------