Skip to content

Enable precompiled header for all platforms. #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MiranDMC wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enable precompiled header for all platforms. #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions plugin_II/game_II/cSampleManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions shared/Audio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
5 changes: 1 addition & 4 deletions shared/Audio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions shared/RefListUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion shared/game/CVector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#pragma once
#include "PluginBase.h"

#ifdef RW
#if defined(RW) || defined(UNREAL)
#include "RenderWare.h"
#else
struct RwV3d
Expand Down
2 changes: 1 addition & 1 deletion shared/game/CVector2D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#pragma once
#include "PluginBase.h"

#ifdef RW
#if defined(RW) || defined(UNREAL)
#include "RenderWare.h"
#else
struct RwV2d
Expand Down
2 changes: 1 addition & 1 deletion tools/premake/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
15 changes: 12 additions & 3 deletions tools/premake/stdafx_template.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#pragma once

#ifdef USE_PCH
#define NO_STRICT // fix minwindef.h

#include <algorithm>
#include <array>
#include <assert.h>
Expand Down Expand Up @@ -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