fix #includes to compile on non windows without pch

This commit is contained in:
Jonathan Gray 2013-04-23 17:39:09 +10:00
parent 53d289ddc2
commit 0c448c94df
71 changed files with 117 additions and 77 deletions

View file

@ -8,7 +8,7 @@
#include "../server/exe_headers.h"
#include "rm_headers.h"
#include "RM_Headers.h"
#ifdef _WIN32
#pragma optimize("p", on)

View file

@ -1,6 +1,6 @@
#include "../server/exe_headers.h"
#include "rm_headers.h"
#include "RM_Headers.h"
#include "../qcommon/cm_terrainmap.h"
/************************************************************************************************

View file

@ -10,13 +10,13 @@
#include "../server/exe_headers.h"
#include "rm_headers.h"
#include "RM_Headers.h"
//#include "rm_instance_npc.h"
#include "rm_instance_bsp.h"
#include "rm_instance_random.h"
#include "rm_instance_group.h"
#include "rm_instance_void.h"
//#include "RM_Instance_NPC.h"
#include "RM_Instance_BSP.h"
#include "RM_Instance_Random.h"
#include "RM_Instance_Group.h"
#include "RM_Instance_Void.h"
/************************************************************************************************
* CRMInstanceFile::CRMInstanceFile

View file

@ -11,9 +11,9 @@
#include "../qcommon/cm_local.h"
#include "../server/server.h"
#include "rm_headers.h"
#include "RM_Headers.h"
#include "rm_instance_bsp.h"
#include "RM_Instance_BSP.h"
#include "../client/vmachine.h"

View file

@ -9,9 +9,9 @@
#include "../server/exe_headers.h"
#include "rm_headers.h"
#include "RM_Headers.h"
#include "rm_instance_group.h"
#include "RM_Instance_Group.h"
/************************************************************************************************
* CRMGroupInstance::CRMGroupInstance

View file

@ -9,9 +9,9 @@
#include "../server/exe_headers.h"
#include "rm_headers.h"
#include "RM_Headers.h"
#include "rm_instance_random.h"
#include "RM_Instance_Random.h"
/************************************************************************************************
* CRMRandomInstance::CRMRandomInstance

View file

@ -9,9 +9,9 @@
#include "../server/exe_headers.h"
#include "rm_headers.h"
#include "RM_Headers.h"
#include "rm_instance_void.h"
#include "RM_Instance_Void.h"
/************************************************************************************************
* CRMVoidInstance::CRMVoidInstance

View file

@ -8,7 +8,7 @@
#include "../server/exe_headers.h"
#include "rm_headers.h"
#include "RM_Headers.h"
#include "../server/server.h"
CRMObjective *CRMManager::mCurObjective=0;

View file

@ -8,7 +8,7 @@
#include "../server/exe_headers.h"
#include "rm_headers.h"
#include "RM_Headers.h"
#define ARIOCHE_CLIPBRUSH_SIZE 300
#define CVAR_OBJECTIVE 0

View file

@ -9,7 +9,7 @@
#include "../server/exe_headers.h"
#include "rm_headers.h"
#include "RM_Headers.h"
/************************************************************************************************
* CRMObjective::CRMObjective

View file

@ -7,7 +7,7 @@
************************************************************************************************/
#include "../server/exe_headers.h"
#include "rm_headers.h"
#include "RM_Headers.h"
#define max(a,b) (((a) > (b)) ? (a) : (b))

View file

@ -18,6 +18,8 @@
#include "../qcommon/cm_randomterrain.h"
#endif
#include <string>
class CRMPathManager;
// directions you can proceed from cells

View file

@ -3,7 +3,7 @@
#include "../client/client.h"
#include "../qcommon/cm_local.h"
#include "../renderer/tr_types.h"
#include "rm_headers.h"
#include "RM_Headers.h"
//#include "../qcommon/q_imath.h"

View file

@ -71,6 +71,8 @@
#define STRING_H_INC
#endif
#include "../game/q_shared.h"
////////////////////////////////////////////////////////////////////////////////////////
// Forward Dec.

View file

@ -8,6 +8,7 @@
#include "cg_media.h"
#include "../game/objectives.h"
#include "../game/g_vehicles.h"
#include "../game/g_local.h"
#ifdef _XBOX
#include "../client/fffx.h"

View file

@ -6,10 +6,12 @@
//#include "cg_local.h"
#include "cg_media.h"
#include "../game/g_functions.h"
#include "../ghoul2/g2.h"
#include "../ghoul2/G2.h"
#include "FxScheduler.h"
#include "../game/wp_saber.h"
#include "../game/g_vehicles.h"
#include "../game/anims.h"
#include "../game/g_local.h"
extern void CG_AddSaberBlade( centity_t *cent, centity_t *scent, refEntity_t *saber, int renderfx, int modelIndex, vec3_t origin, vec3_t angles);
extern void CG_CheckSaberInWater( centity_t *cent, centity_t *scent, int saberNum, int modelIndex, vec3_t origin, vec3_t angles );

View file

@ -8,6 +8,7 @@
#include "../client/vmachine.h"
#include "cg_lights.h"
#include "../game/g_local.h"
#ifdef _IMMERSION
#include "../ff/ff.h"

View file

@ -10,6 +10,8 @@
#include "../game/anims.h"
#include "../game/wp_saber.h"
#include "../game/g_vehicles.h"
#include "../game/g_local.h"
#include "../game/b_local.h"
#include "../Rufl/hstring.h"
#define LOOK_SWING_SCALE 0.5f

View file

@ -7,6 +7,7 @@
//#include "cg_local.h"
#include "cg_media.h"
#include "../game/g_local.h"
#include "../game/g_vehicles.h"

View file

@ -10,6 +10,8 @@
#include "cg_lights.h"
#include "../game/wp_saber.h"
#include "../game/g_vehicles.h"
#include "../game/g_local.h"
#include "../game/g_functions.h"
#define MASK_CAMERACLIP (MASK_SOLID)
#define CAMERA_SIZE 4

View file

@ -8,6 +8,7 @@
#include "../game/g_vehicles.h"
#include "../game/anims.h"
#include "../game/g_local.h"
#ifdef _IMMERSION
#include "../ff/ff.h"

View file

@ -14,7 +14,7 @@
#else
#include "fffx.h"
#endif // _IMMERSION
#include "../ghoul2/g2.h"
#include "../ghoul2/G2.h"
#include "../RMG/RM_Headers.h"

View file

@ -9,10 +9,12 @@
#include "../mp3code/mp3struct.h"
// Open AL Specific
#include "openal/al.h"
#include "openal/alc.h"
#include <AL/al.h>
#include <AL/alc.h>
#ifdef HAVE_EAX
#include "eax/eax.h"
#include "eax/eaxman.h"
#endif
// Added for Open AL to know when to mute all sounds (e.g when app. loses focus)
void S_AL_MuteAllSounds(qboolean bMute);

View file

@ -8,6 +8,8 @@
#include "snd_local.h"
#include "cl_mp3.h"
#include <string>
// Open AL
void S_PreProcessLipSync(sfx_t *sfx);
extern int s_UseOpenAL;

View file

@ -8,6 +8,7 @@
#include "../qcommon/sstring.h"
#include <algorithm>
#include <string>
#ifdef _XBOX
#include "snd_local_console.h"

View file

@ -1,5 +1,6 @@
// vmachine.cpp -- wrapper to fake virtual machine for client
#include "../game/q_shared.h"
#include "vmachine.h"
#pragma warning (disable : 4514)
/*

View file

@ -15,7 +15,7 @@
#include "b_local.h"
#include "anims.h"
#include "g_navigator.h"
#include "g_Vehicles.h"
#include "g_vehicles.h"
#if !defined(RATL_VECTOR_VS_INC)
#include "../Ratl/vector_vs.h"
#endif

View file

@ -1,8 +1,8 @@
// leave this line at the top for all g_xxxx.cpp files...
#include "g_headers.h"
#include "G_Local.h"
#include "../rufl/hstring.h"
#include "g_local.h"
#include "../Rufl/hstring.h"
#define MAX_GTIMERS 16384

View file

@ -10,7 +10,7 @@
#include "anims.h"
#include "g_functions.h"
#include "wp_saber.h"
#include "g_Vehicles.h"
#include "g_vehicles.h"
extern qboolean G_CheckForStrongAttackMomentum( gentity_t *self );
extern void G_AddVoiceEvent( gentity_t *self, int event, int speakDebounceTime );

View file

@ -6,7 +6,7 @@
#include "b_public.h"
#include "anims.h"
#include "wp_saber.h"
#include "g_Vehicles.h"
#include "g_vehicles.h"
#if !defined(RUFL_HSTRING_INC)
#include "../Rufl/hstring.h"
#endif

View file

@ -1,7 +1,7 @@
#ifndef __Q3_INTERFACE__
#define __Q3_INTERFACE__
#include "../Icarus/IcarusInterface.h"
#include "../icarus/IcarusInterface.h"
//NOTENOTE: The enums and tables in this file will obviously bitch if they are included multiple times, don't do that

View file

@ -6,7 +6,7 @@
#include "g_local.h"
#include "say.h"
#include "AI.h"
#include "ai.h"
#define AI_TIMERS 0//turn on to see print-outs of AI/nav timing
//

View file

@ -2,7 +2,7 @@
#define __B_PUBLIC_H__
#include "bstate.h"
#include "AI.h"
#include "ai.h"
#define NPCAI_CHECK_WEAPON 0x00000001
#define NPCAI_BURST_WEAPON 0x00000002

View file

@ -14,7 +14,7 @@
// #include "../game/q_math.h"
//#endif
#ifdef _XBOX
#if defined(_XBOX) || defined(__GNUC__)
#define GAME_INCLUDE
#include "../game/b_local.h"
#include "../cgame/cg_local.h"

View file

@ -2,7 +2,7 @@
#include "g_headers.h"
#include "IcarusInterface.h"
#include "../icarus/IcarusInterface.h"
#include "Q3_Interface.h"
#include "g_local.h"
#include "g_functions.h"

View file

@ -1,7 +1,7 @@
// Precompiled header file for the game dll
#include "g_headers.h"
#include "NPC_Headers.h"
#include "npc_headers.h"
#include "../cgame/cg_headers.h"

View file

@ -11,7 +11,7 @@
//#endif
#if !defined(TEAMS_H_INC)
#include "../game/Teams.h"
#include "../game/teams.h"
#endif
//#if !defined(IGINTERFACE_H_INC)
@ -19,7 +19,7 @@
//#endif
// More stuff that we "need" on Xbox, as we don't use PCH
#ifdef _XBOX
#if defined(_XBOX) || defined(__GNUC__)
#include "../game/b_local.h"
#include "../game/g_functions.h"
#include "../game/g_nav.h"

View file

@ -4,7 +4,7 @@
#include "g_functions.h"
#include "objectives.h"
#include "../Icarus/IcarusInterface.h"
#include "../icarus/IcarusInterface.h"
int BMS_START = 0;

View file

@ -150,7 +150,7 @@ extern qboolean G2API_SetBoneAnglesIndex(CGhoul2Info *ghlInfo, const int index,
qhandle_t *modelList, int blendTime, int currentTime);
extern qboolean G2API_SetBoneAnimIndex(CGhoul2Info *ghlInfo, const int index, const int startFrame, const int endFrame, const int flags, const float animSpeed, const int currentTime, const float setFrame, const int blendTime);
*/
#include "../ghoul2/g2.h"
#include "../ghoul2/G2.h"
extern int SG_Read (unsigned long chid, void *pvAddress, int iLength, void **ppvAddressPtr);
extern int SG_ReadOptional (unsigned long chid, void *pvAddress, int iLength, void **ppvAddressPtr);
#endif

View file

@ -4,7 +4,7 @@
#include "g_headers.h"
#include "IcarusInterface.h"
#include "../icarus/IcarusInterface.h"
#include "Q3_Interface.h"
#include "g_local.h"
#include "fields.h"

View file

@ -4,10 +4,10 @@
#include "bg_public.h"
#include "g_public.h"
#include "b_public.h"
#include "../Icarus/Stdafx.h" //need stl
#include "../icarus/StdAfx.h" //need stl
#include "../renderer/tr_types.h"
#include "../cgame/cg_public.h"
#include "G_Vehicles.h"
#include "g_vehicles.h"
#include "hitlocs.h"
#include "bset.h"

View file

@ -13,7 +13,7 @@
#ifndef _JK2MP
#include "g_functions.h"
#include "g_vehicles.h"
#include "../CGame/cg_Local.h"
#include "../cgame/cg_local.h"
#else
#include "bg_vehicles.h"
#endif

View file

@ -46,6 +46,8 @@
#include <stdlib.h>
#include <time.h>
#include <ctype.h>
#include <limits.h>
#include <stdint.h>
#ifdef _XBOX
#define tvector(T) std::vector< T >

View file

@ -15,14 +15,14 @@
#include "../qcommon/qcommon.h"
#endif
#include "../renderer/MatComp.h"
#include "../renderer/matcomp.h"
#if !defined(G2_H_INC)
#include "G2.h"
#endif
//rww - RAGDOLL_BEGIN
#include <FLOAT.H>
#include <float.h>
#include "ghoul2_gore.h"
//rww - RAGDOLL_END

View file

@ -12,21 +12,21 @@
#include "../renderer/tr_local.h"
#endif
#include "../renderer/MatComp.h"
#include "../renderer/matcomp.h"
#if !defined(G2_H_INC)
#include "G2.h"
#endif
#if !defined (MINIHEAP_H_INC)
#include "../qcommon/miniheap.h"
#include "../qcommon/MiniHeap.h"
#endif
#define G2_MODEL_OK(g) ((g)&&(g)->mValid&&(g)->aHeader&&(g)->currentModel&&(g)->animModel)
#include "../server/server.h"
#include <FLOAT.H>
#include <float.h>
#ifdef _G2_GORE
#include "ghoul2_gore.h"

View file

@ -3,7 +3,7 @@
// -- jweier
// this include must remain at the top of every Icarus CPP file
#include "stdafx.h"
#include "StdAfx.h"
#include "IcarusInterface.h"
#include "IcarusImplementation.h"

View file

@ -4,6 +4,8 @@
#define __INTERPRETED_BLOCK_STREAM__
#include <assert.h>
#include <string.h>
#include <stdio.h>
typedef float vec3_t[3];

View file

@ -1,6 +1,6 @@
// IcarusImplementation.cpp
#include "stdafx.h"
#include "StdAfx.h"
#include "IcarusImplementation.h"
#include "BlockStream.h"
@ -8,6 +8,8 @@
#include "TaskManager.h"
#include "Sequencer.h"
#include "../game/q_shared.h"
#define STL_ITERATE( a, b ) for ( a = b.begin(); a != b.end(); a++ )
#define STL_INSERT( a, b ) a.insert( a.end(), b );

View file

@ -3,7 +3,7 @@
// -- jweier
// this include must remain at the top of every Icarus CPP file
#include "stdafx.h"
#include "StdAfx.h"
#include "IcarusImplementation.h"
#include "BlockStream.h"

View file

@ -3,7 +3,7 @@
// -- jweier
// this include must remain at the top of every Icarus CPP file
#include "stdafx.h"
#include "StdAfx.h"
#include "IcarusImplementation.h"
#include "BlockStream.h"

View file

@ -4,7 +4,7 @@
// this include must remain at the top of every Icarus CPP file
#include "stdafx.h"
#include "StdAfx.h"
#include "IcarusImplementation.h"
#include "BlockStream.h"

View file

@ -70,6 +70,11 @@
#include <stdio.h>
#ifndef WIN32
#include <stdint.h>
typedef int32_t INT32;
#endif
/*
* We need memory copying and zeroing functions, plus strncpy().
* ANSI and System V implementations declare these in <string.h>.

View file

@ -10,6 +10,10 @@
#include "small_header.h" // for SAMPLE and IN_OUT
#ifndef byte
typedef unsigned char byte;
#endif
typedef void (*SBT_FUNCTION) (float *sample, short *pcm, int n);
typedef void (*XFORM_FUNCTION) (void *pcm, int igr);
typedef IN_OUT(*DECODE_FUNCTION) (unsigned char *bs, unsigned char *pcm);

View file

@ -151,13 +151,6 @@ decode (standard decoder) reduction_code:
#include "mp3struct.h"
#include <assert.h>
#ifndef byte
typedef unsigned char byte;
#endif
typedef struct id3v1_1 {
char id[3];
char title[30]; // <file basename>

View file

@ -31,6 +31,13 @@
#define CEILING(a) \
((a)==(int)(a) ? (a) : (a)>0 ? 1+(int)(a) : -(1+(int)(-a)))
#ifndef WIN32
typedef struct {
int x;
int y;
} POINT;
#endif
#include <stdlib.h>
#endif

View file

@ -1,5 +1,5 @@
// Current version of the single player game
#include "../win32/autoversion.h"
#include "../win32/AutoVersion.h"
#ifdef _DEBUG
#define Q3_VERSION "(debug)JA: v"VERSION_STRING_DOTTED

View file

@ -13,7 +13,7 @@
*/
// leave this at the top for PCH reasons...
#include "common_headers.h"
#include "../game/common_headers.h"

View file

@ -1,4 +1,4 @@
#include "MatComp.h"
#include "matcomp.h"
#include <assert.h>
#include <math.h>
#include <stdio.h>

View file

@ -4,7 +4,7 @@
#include "tr_local.h"
#include "MatComp.h"
#include "matcomp.h"
#ifdef VV_LIGHTING
#include "tr_lightmanager.h"

View file

@ -1,7 +1,7 @@
#include "../server/exe_headers.h"
#include "tr_local.h"
#include "tr_worldeffects.h"
#include "tr_WorldEffects.h"
// Patches up the loaded map to handle the parameters passed from the UI

View file

@ -8,6 +8,8 @@
#include "../qcommon/stringed_ingame.h"
#include <string>
/////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// This file is shared in the single and multiplayer codebases, so be CAREFUL WHAT YOU ADD/CHANGE!!!!!

View file

@ -15,7 +15,7 @@
#include "tr_local.h"
#endif
#include "MatComp.h"
#include "matcomp.h"
#if !defined(_QCOMMON_H_)
#include "../qcommon/qcommon.h"
#endif
@ -57,7 +57,7 @@ void G2Time_ReportTimers(void)
#endif
//rww - RAGDOLL_BEGIN
#include <FLOAT.H>
#include <float.h>
//rww - RAGDOLL_END
extern cvar_t *r_Ghoul2UnSqash;

View file

@ -8,7 +8,7 @@
#include "tr_local.h"
#include "MatComp.h"
#include "matcomp.h"
#ifdef VV_LIGHTING
#include "tr_lightmanager.h"

View file

@ -5,7 +5,7 @@
#include "../server/exe_headers.h"
#include "tr_local.h"
#include "MatComp.h"
#include "matcomp.h"
#include "../qcommon/sstring.h"
#define LL(x) x=LittleLong(x)

View file

@ -2,7 +2,7 @@
//
//////////////////////////////////////////////////////////////////////
#include "../server/exe_headers.h"
#include "tr_QuickSprite.h"
#include "tr_quicksprite.h"
extern void R_BindAnimatedImage( const textureBundle_t *bundle );

View file

@ -5,8 +5,8 @@
#include "../server/exe_headers.h"
#include "tr_QuickSprite.h"
#include "tr_worldeffects.h"
#include "tr_quicksprite.h"
#include "tr_WorldEffects.h"
#include <float.h> //for isnan
/////===== Part of the VERTIGON system =====/////

View file

@ -14,7 +14,7 @@ Ghoul2 Insert Start
#endif
#if !defined (MINIHEAP_H_INC)
#include "../qcommon/miniheap.h"
#include "../qcommon/MiniHeap.h"
#endif
void CM_CleanLeafCache(void);

View file

@ -9,7 +9,7 @@
Ghoul2 Insert Start
*/
#if !defined (MINIHEAP_H_INC)
#include "../qcommon/miniheap.h"
#include "../qcommon/MiniHeap.h"
#endif
/*
Ghoul2 Insert End

View file

@ -17,7 +17,7 @@ Ghoul2 Insert Start
#include "../ghoul2/G2.h"
#endif
#if !defined (MINIHEAP_H_INC)
#include "../qcommon/miniheap.h"
#include "../qcommon/MiniHeap.h"
#endif
#ifdef _DEBUG

View file

@ -15,12 +15,16 @@
#include <termios.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#ifdef __linux__
#include <sys/vt.h>
#endif
#include <stdarg.h>
#include <stdio.h>
#include <signal.h>
#include <pthread.h>
#include <semaphore.h>
#include <dlfcn.h>
#include <unistd.h>
//#include "../qcommon/qcommon.h"
//#include "../client/keys.h"

View file

@ -16,7 +16,6 @@
#include <sys/wait.h>
#include <sys/mman.h>
#include <errno.h>
#include <mntent.h>
#include <dlfcn.h>