fix #includes to compile on non windows without pch

CODE-mp/cgame/cg_ents.c

@@ -7,7 +7,7 @@
 Ghoul2 Insert Start
 */
 #include "../game/q_shared.h"
-#include "../ghoul2/g2.h"
+#include "../ghoul2/G2.h"
 /*
 Ghoul2 Insert end
 */

CODE-mp/cgame/cg_event.c

@@ -4,7 +4,7 @@
 
 #include "cg_local.h"
 #include "fx_local.h"
-#include "../ghoul2/g2.h"
+#include "../ghoul2/G2.h"
 #include "../ui/ui_shared.h"
 
 // for the voice chats

CODE-mp/cgame/cg_players.c

@@ -2,7 +2,7 @@
 //
 // cg_players.c -- handle the media and animation for player entities
 #include "cg_local.h"
-#include "../ghoul2/g2.h"
+#include "../ghoul2/G2.h"
 
 extern stringID_table_t animTable [MAX_ANIMATIONS+1];
 

CODE-mp/cgame/cg_saga.c

@@ -1,5 +1,5 @@
 #include "cg_local.h"
-#include "bg_saga.h"
+#include "../game/bg_saga.h"
 
 #define DEFAULT_WIN_OBJECTIVE		"sound/chars/kyle/prototype/personal.mp3"
 #define DEFAULT_LOSE_OBJECTIVE		"sound/chars/kyle/prototype/isntworking.mp3"

CODE-mp/cgame/cg_turret.c

@@ -1,6 +1,6 @@
 #include "cg_local.h"
 #include "../game/q_shared.h"
-#include "../ghoul2/g2.h"
+#include "../ghoul2/G2.h"
 
 //rww - The turret is heavily dependant on bone angles. We can't happily set that on the server, so it is done client-only.
 

CODE-mp/client/FXExport.cpp

@@ -1,5 +1,5 @@
 #include "client.h"
-#include "FXScheduler.h"
+#include "FxScheduler.h"
 
 
 int	FX_RegisterEffect(const char *file)

CODE-mp/client/FxPrimitives.cpp

@@ -1,7 +1,7 @@
 #include "client.h"
 
 #if !defined(G2_H_INC)
-	#include "../ghoul2/g2_local.h"
+	#include "../ghoul2/G2_local.h"
 #endif
 
 #if !defined(FX_SCHEDULER_H_INC)

CODE-mp/client/cl_cgame.cpp

@@ -8,10 +8,10 @@
 	#include "FXExport.h"
 #endif
 
-#include "FXutil.h"
+#include "FxUtil.h"
 
 #if !defined(CROFFSYSTEM_H_INC)
-	#include "../qcommon/ROFFSystem.h"
+	#include "../qcommon/RoffSystem.h"
 #endif
 
 #ifdef _DONETPROFILE_

CODE-mp/client/cl_main.cpp

@@ -11,7 +11,7 @@
 
 #ifdef G2_COLLISION_ENABLED
 #if !defined (MINIHEAP_H_INC)
-#include "../qcommon/miniheap.h"
+#include "../qcommon/MiniHeap.h"
 #endif
 #endif
 

CODE-mp/client/cl_parse.cpp

@@ -2,7 +2,7 @@
 
 #include "client.h"
 #include "../qcommon/strip.h"
-#include "../ghoul2/g2_local.h"
+#include "../ghoul2/G2_local.h"
 #ifdef _DONETPROFILE_
 #include "../qcommon/INetProfile.h"
 #endif

CODE-mp/client/snd_local.h

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

CODE-mp/game/g_client.c

@@ -1,7 +1,7 @@
 // Copyright (C) 1999-2000 Id Software, Inc.
 //
 #include "g_local.h"
-#include "../ghoul2/g2.h"
+#include "../ghoul2/G2.h"
 
 // g_client.c -- client functions that don't happen every frame
 

CODE-mp/game/w_force.c

@@ -1,7 +1,7 @@
 #include "g_local.h"
 #include "w_saber.h"
 #include "ai_main.h"
-#include "../ghoul2/g2.h"
+#include "../ghoul2/G2.h"
 
 #define METROID_JUMP 1
 

CODE-mp/game/w_saber.c

@@ -2,7 +2,7 @@
 #include "bg_local.h" //Only because we use PM_SetAnim here once.
 #include "w_saber.h"
 #include "ai_main.h"
-#include "../ghoul2/g2.h"
+#include "../ghoul2/G2.h"
 
 #define SABER_BOX_SIZE 16.0f
 

CODE-mp/ghoul2/G2_API.cpp

@@ -16,7 +16,7 @@
 #include "G2_local.h"
 
 #ifdef G2_COLLISION_ENABLED
-#include "../qcommon/miniheap.h"
+#include "../qcommon/MiniHeap.h"
 #endif
 
 #include <set>
@@ -1370,4 +1370,4 @@ void G2API_AddSkinGore(CGhoul2Info_v &ghoul2,SSkinGoreData &gore)
 		G2_TraceModels(ghoul2, transHitLocation, transRayDirection, 0, gore.entNum, 0, lod);
 	}
 }
-#endif _SOF2
+#endif _SOF2

CODE-mp/ghoul2/G2_bones.cpp

@@ -14,7 +14,7 @@
 	#include "../qcommon/qcommon.h"
 #endif
 
-#include "../renderer/MatComp.h"
+#include "../renderer/matcomp.h"
 
 #if !defined(G2_H_INC)
 	#include "G2.h"
@@ -1238,4 +1238,4 @@ int	G2_Get_Bone_Index(CGhoul2Info *ghoul2, const char *boneName)
 	model_t		*mod_a = R_GetModelByHandle(mod_m->mdxm->animIndex); 
 
 	return (G2_Find_Bone(mod_a, ghoul2->mBlist, boneName));
-}
+}

CODE-mp/ghoul2/G2_misc.cpp

@@ -11,14 +11,14 @@
 	#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
 
 #include "../server/server.h"

CODE-mp/jpeg-6/jinclude.h

@@ -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>.

CODE-mp/mp3code/mp3struct.h

@@ -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);

CODE-mp/mp3code/towave.c

@@ -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>

CODE-mp/qcommon/RoffSystem.cpp

@@ -1,4 +1,4 @@
-#include "ROFFSystem.h"
+#include "RoffSystem.h"
 #include "qcommon.h"
 #include "../client/client.h"
 

CODE-mp/renderer/matcomp.c

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

CODE-mp/renderer/tr_ghoul2.cpp

@@ -10,7 +10,7 @@
 	#include "tr_local.h"
 #endif
 
-#include "MatComp.h"
+#include "matcomp.h"
 #if !defined(_QCOMMON_H_)
 	#include "../qcommon/qcommon.h"
 #endif
@@ -18,7 +18,7 @@
 	#include "../ghoul2/G2.h"
 #endif
 #include "../ghoul2/G2_local.h"
-#include "MatComp.h"
+#include "matcomp.h"
 
 #pragma warning (disable: 4512)	//default assignment operator could not be gened
 #include "../qcommon/disablewarnings.h"

CODE-mp/renderer/tr_init.cpp

@@ -12,7 +12,7 @@
 
 #ifdef G2_COLLISION_ENABLED
 #if !defined (MINIHEAP_H_INC)
-	#include "../qcommon/miniheap.h"
+	#include "../qcommon/MiniHeap.h"
 #endif
 
 #include "../ghoul2/G2_local.h"

CODE-mp/renderer/tr_quicksprite.cpp

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

CODE-mp/renderer/tr_scene.cpp

@@ -5,7 +5,7 @@
 	#include "../ghoul2/G2.h"
 #endif
 #include "../ghoul2/G2_local.h"
-#include "MatComp.h"
+#include "matcomp.h"
 
 #pragma warning (disable: 4512)	//default assignment operator could not be gened
 #include "../qcommon/disablewarnings.h"

CODE-mp/renderer/tr_shade.cpp

@@ -2,7 +2,7 @@
 
 #include "tr_local.h"
 
-#include "tr_QuickSprite.h"
+#include "tr_quicksprite.h"
 
 /*
 

CODE-mp/renderer/tr_surfacesprites.cpp

@@ -2,7 +2,7 @@
 
 #include "tr_local.h"
 
-#include "tr_QuickSprite.h"
+#include "tr_quicksprite.h"
 #include "tr_WorldEffects.h"
 
 

CODE-mp/server/sv_game.cpp

@@ -6,7 +6,7 @@
 #include "../qcommon/strip.h"
 
 #if !defined(CROFFSYSTEM_H_INC)
-	#include "../qcommon/ROFFSystem.h"
+	#include "../qcommon/RoffSystem.h"
 #endif
 
 #if !defined(G2_H_INC)

CODE-mp/server/sv_init.cpp

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