Merge pull request #313 from MiranDMC/precompiled_header_updates

Enable precompiled header for all platforms.

Author: gennariarmando

plugin_II/game_II/cSampleManager.h

@@ -7,12 +7,12 @@
 #pragma once
 #include "PluginBase.h"
 
-typedef void* HSTREAM;
+typedef DWORD HSTREAM;
 typedef unsigned int HPROVIDER;
-typedef void* H3DPOBJECT;
+typedef DWORD H3DPOBJECT;
 typedef H3DPOBJECT H3DSAMPLE;
-typedef void* HSAMPLE;
-typedef void* HDIGDRIVER;
+typedef DWORD HSAMPLE;
+typedef DWORD HDIGDRIVER;
 
 struct tSample {
     int offset;

shared/Audio.cpp

@@ -16,8 +16,6 @@
 #include "Rage.h"
 #endif
 
-#include "CVector.h"
-
 #include "CCamera.h"
 #pragma comment(lib, "bass.lib")
 // #pragma comment(lib, "bass_fx.lib")

shared/Audio.h

@@ -7,13 +7,10 @@
 #pragma once
 #if defined(GTA2) || defined(GTA3) || defined(GTAVC) || defined(GTASA) || defined(GTAIV)
 #include "PluginBase.h"
+#include <CVector.h>
 #include "bass/bass.h"
 #include <string>
 
-#ifndef GTA2
-#include "CMatrix.h"
-#endif
-
 namespace plugin {
     class BassSampleManager {
     public:

shared/RefListUtils.h

@@ -61,6 +61,9 @@ struct RefListUtils<RefList<Values...>> {
 #elif GTAIV
                 if (gameid == GAME_CE)
                     result += "GAME_CE";
+#elif GAME_UNREAL
+                if (true)
+                    result += std::to_string(gameid);
 #else
                 if (gameid == GAME_10EN)
                     result += "GAME_10EN";

shared/game/CVector.h

@@ -7,7 +7,7 @@
 #pragma once
 #include "PluginBase.h"
 
-#ifdef RW
+#if defined(RW) || defined(UNREAL)
     #include "RenderWare.h"
 #else
     struct RwV3d

shared/game/CVector2D.h

@@ -7,7 +7,7 @@
 #pragma once
 #include "PluginBase.h"
 
-#ifdef RW
+#if defined(RW) || defined(UNREAL)
     #include "RenderWare.h"
 #else
     struct RwV2d

tools/premake/premake5.lua

@@ -368,7 +368,7 @@ function pluginSdkStaticLibProject(projectName, sdkdir, outName, isPluginProject
         end
 
         -- precompiled header
-        if msbuild and (projNameLower == "plugin_iii" or projNameLower == "plugin_vc" or projNameLower == "plugin_sa" or projNameLower == "plugin_iv") then
+        if msbuild then
             pchheader "stdafx.h"
             forceincludes "stdafx.h"
             pchsource (path.getrelative(path.getabsolute("."), sdkdir .. "/shared/stdafx.cpp"))

tools/premake/stdafx_template.h

@@ -1,6 +1,8 @@
 #pragma once
 
 #ifdef USE_PCH
+    #define NO_STRICT // fix minwindef.h
+
     #include <algorithm>
     #include <array>
     #include <assert.h>
@@ -29,9 +31,16 @@
     #include <vector>
     #include <windows.h>
 
-#ifdef RW
-    #include <rwcore.h>
-#endif
+	#ifdef GTA2
+		// #include "GBH.h" TODO: fix d3dutil.h problems
+	#elif defined(RW) || defined(UNREAL)
+		#include "RenderWare.h"
+	#elif defined(RAGE)
+		#include "Rage.h"
+	#endif
 
+#ifndef GTA2 // TODO: fix d3dutil.h problems
 GENERATED_LIST
+#endif
+
 #endif