Merge branch 'master' into sdl2

Conflicts: code/sdl/sdl_input.c
2024-11-10 14:52:00 +00:00 · 2013-08-16 23:34:08 +01:00 · 2013-08-16 23:34:08 +01:00 · bde7665462
commit bde7665462
parent d9d52f0306 d4c6711e51
97 changed files with 6333 additions and 546 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,3 +2,33 @@ build
 Makefile.local
 *.swp
 *tags
+
+# OS X
+####################
+.Spotlight-V100/
+.Trashes/
+._*
+.AppleDouble
+.DS_Store
+.LSOverride
+Icon?
+
+# Xcode
+####################
+*.mode1v3
+*.mode2v3
+*.pbxuser
+*.perspectivev3
+*.user
+*.xcuserstate
+*.moved-aside
+*~.nib
+.idea/
+DerivedData/
+project.xcworkspace/
+xcuserdata/
+profile
+!default.pbxuser
+!default.mode1v3
+!default.mode2v3
+!default.perspectivev3
--- a/9
+++ b/9
@ -1259,9 +1259,16 @@ ifneq ($(TARGETS),)
 endif

 $(B).zip: $(TARGETS)
-ifdef ARCHIVE
+ifeq ($(PLATFORM),darwin)
+  ifdef ARCHIVE
+	@("./make-macosx-app.sh" release $(ARCH); if [ "$$?" -eq 0 ] && [ -d "$(B)/ioquake3.app" ]; then rm -f $@; cd $(B) && zip --symlinks -r9 ../../$@ `find "ioquake3.app" -print | sed -e "s!$(B)/!!g"`; else rm -f $@; cd $(B) && zip -r9 ../../$@ $(NAKED_TARGETS); fi)
+  endif
+endif
+ifneq ($(PLATFORM),darwin)
+  ifdef ARCHIVE
 	@rm -f $@
 	@(cd $(B) && zip -r9 ../../$@ $(NAKED_TARGETS))
+  endif
 endif

 makedirs:
--- a/code/botlib/be_ai_char.c
+++ b/code/botlib/be_ai_char.c
@ -760,14 +760,11 @@ void Characteristic_String(int character, int index, char *buf, int size)
 	{
 		strncpy(buf, ch->c[index].value.string, size-1);
 		buf[size-1] = '\0';
-		return;
 	} //end if
 	else
 	{
 		botimport.Print(PRT_ERROR, "characteristic %d is not a string\n", index);
-		return;
 	} //end else if
-	return;
 } //end of the function Characteristic_String
 //===========================================================================
 //
--- a/code/botlib/be_ai_chat.c
+++ b/code/botlib/be_ai_chat.c
@ -1025,7 +1025,6 @@ bot_randomlist_t *BotLoadRandomStrings(char *filename)
 			} //end if
 			while(!PC_CheckTokenString(source, "}"))
 			{
-				size_t len;
 				if (!BotLoadChatMessage(source, chatmessagestring))
 				{
 					FreeSource(source);
@ -1507,7 +1506,6 @@ void BotMatchVariable(bot_match_t *match, int variable, char *buf, int size)
 	{
 		strcpy(buf, "");
 	} //end else
-	return;
 } //end of the function BotMatchVariable
 //===========================================================================
 //
--- a/code/botlib/be_ai_goal.c
+++ b/code/botlib/be_ai_goal.c
@ -691,7 +691,6 @@ void BotGoalName(int number, char *name, int size)
 		} //end for
 	} //end for
 	strcpy(name, "");
-	return;
 } //end of the function BotGoalName
 //===========================================================================
 //
--- a/code/botlib/be_ai_move.c
+++ b/code/botlib/be_ai_move.c
@ -3455,8 +3455,6 @@ void BotMoveToGoal(bot_moveresult_t *result, int movestate, bot_goal_t *goal, in
 	if (result->blocked) ms->reachability_time -= 10 * ms->thinktime;
 	//copy the last origin
 	VectorCopy(ms->origin, ms->lastorigin);
-	//return the movement result
-	return;
 } //end of the function BotMoveToGoal
 //===========================================================================
 //
--- a/code/cgame/cg_particles.c
+++ b/code/cgame/cg_particles.c
@ -636,7 +636,6 @@ void CG_AddParticleToScene (cparticle_t *p, vec3_t org, float alpha)
 	}
 	else if (p->type == P_FLAT_SCALEUP)
 	{
-		float width, height;
 		float sinR, cosR;

 		if (p->color == BLOODRED)
@ -1321,7 +1320,6 @@ void CG_ParticleExplosion (char *animStr, vec3_t origin, vec3_t vel, int duratio
 // Rafael Shrapnel
 void CG_AddParticleShrapnel (localEntity_t *le)
 {
-	return;
 }
 // done.

--- a/code/cgame/cg_predict.c
+++ b/code/cgame/cg_predict.c
@ -283,17 +283,17 @@ static void CG_TouchItem( centity_t *cent ) {
 	// We don't predict touching our own flag
 #ifdef MISSIONPACK
 	if( cgs.gametype == GT_1FCTF ) {
-		if( item->giTag != PW_NEUTRALFLAG ) {
+		if( item->giType == IT_TEAM && item->giTag != PW_NEUTRALFLAG ) {
 			return;
 		}
 	}
 #endif
 	if( cgs.gametype == GT_CTF ) {
 		if (cg.predictedPlayerState.persistant[PERS_TEAM] == TEAM_RED &&
-			item->giTag == PW_REDFLAG)
+			item->giType == IT_TEAM && item->giTag == PW_REDFLAG)
 			return;
 		if (cg.predictedPlayerState.persistant[PERS_TEAM] == TEAM_BLUE &&
-			item->giTag == PW_BLUEFLAG)
+			item->giType == IT_TEAM && item->giTag == PW_BLUEFLAG)
 			return;
 	}

--- a/code/client/cl_cgame.c
+++ b/code/client/cl_cgame.c
@ -186,15 +186,6 @@ void CL_AddCgameCommand( const char *cmdName ) {
 	Cmd_AddCommand( cmdName, NULL );
 }

-/*
-=====================
-CL_CgameError
-=====================
-*/
-void CL_CgameError( const char *string ) {
-	Com_Error( ERR_DROP, "%s", string );
-}
-

 /*
 =====================
--- a/code/client/cl_console.c
+++ b/code/client/cl_console.c
@ -191,8 +191,6 @@ void Con_Dump_f (void)
 	Q_strncpyz( filename, Cmd_Argv( 1 ), sizeof( filename ) );
 	COM_DefaultExtension( filename, sizeof( filename ), ".txt" );

-	Com_Printf ("Dumped console text to %s.\n", filename );
-
 	f = FS_FOpenFileWrite( filename );
 	if (!f)
 	{
@ -200,6 +198,8 @@ void Con_Dump_f (void)
 		return;
 	}

+	Com_Printf ("Dumped console text to %s.\n", filename );
+
 	// skip empty lines
 	for (l = con.current - con.totallines + 1 ; l <= con.current ; l++)
 	{
--- a/code/client/cl_keys.c
+++ b/code/client/cl_keys.c
@ -1000,7 +1000,7 @@ void Key_Bind_f (void)

 	if (c == 2)
 	{
-		if (keys[b].binding)
+		if (keys[b].binding && keys[b].binding[0])
 			Com_Printf ("\"%s\" = \"%s\"\n", Key_KeynumToString(b), keys[b].binding );
 		else
 			Com_Printf ("\"%s\" is not bound\n", Key_KeynumToString(b) );
@ -1275,6 +1275,9 @@ void CL_KeyDownEvent( int key, unsigned time )
 		return;
 	}

+	// send the bound action
+	CL_ParseBinding( key, qtrue, time );
+
 	// distribute the key down event to the apropriate handler
 	if ( Key_GetCatcher( ) & KEYCATCH_CONSOLE ) {
 		Console_Key( key );
@ -1291,10 +1294,6 @@ void CL_KeyDownEvent( int key, unsigned time )
 	} else if ( clc.state == CA_DISCONNECTED ) {
 		Console_Key( key );
 	}
-
-	// send the bound action
-	CL_ParseBinding( key, qtrue, time );
-	return;
 }

 /*
--- a/code/client/cl_main.c
+++ b/code/client/cl_main.c
@ -256,7 +256,7 @@ void CL_Voip_f( void )
 		reason = "Speex not initialized";
 	else if (!clc.voipEnabled)
 		reason = "Server doesn't support VoIP";
-	else if ( Cvar_VariableValue( "g_gametype" ) == GT_SINGLE_PLAYER || Cvar_VariableValue("ui_singlePlayerActive"))
+	else if (!clc.demoplaying && (Cvar_VariableValue( "g_gametype" ) == GT_SINGLE_PLAYER || Cvar_VariableValue("ui_singlePlayerActive")))
 		reason = "running in single-player mode";

 	if (reason != NULL) {
@ -3070,11 +3070,18 @@ CL_ShutdownRef
 ============
 */
 void CL_ShutdownRef( void ) {
-	if ( !re.Shutdown ) {
-		return;
+	if ( re.Shutdown ) {
+		re.Shutdown( qtrue );
 	}
-	re.Shutdown( qtrue );
+
 	Com_Memset( &re, 0, sizeof( re ) );
+
+#ifdef USE_RENDERER_DLOPEN
+	if ( rendererLib ) {
+		Sys_UnloadLibrary( rendererLib );
+		rendererLib = NULL;
+	}
+#endif
 }

 /*
@ -4145,6 +4152,9 @@ void CL_GlobalServers_f( void ) {
 				com_gamename->string, Cmd_Argv(2));
 		}
 	}
+	else if ( !Q_stricmp( com_gamename->string, LEGACY_MASTER_GAMENAME ) )
+		Com_sprintf(command, sizeof(command), "getservers %s",
+			Cmd_Argv(2));
 	else
 		Com_sprintf(command, sizeof(command), "getservers %s %s",
 			com_gamename->string, Cmd_Argv(2));
--- a/code/client/cl_parse.c
+++ b/code/client/cl_parse.c
@ -352,11 +352,6 @@ void CL_SystemInfoChanged( void ) {
 	// in some cases, outdated cp commands might get sent with this news serverId
 	cl.serverId = atoi( Info_ValueForKey( systemInfo, "sv_serverid" ) );

-	// don't set any vars when playing a demo
-	if ( clc.demoplaying ) {
-		return;
-	}
-
 #ifdef USE_VOIP
 #ifdef LEGACY_PROTOCOL
 	if(clc.compat)
@ -365,13 +360,15 @@ void CL_SystemInfoChanged( void ) {
 #endif
 	{
 		s = Info_ValueForKey( systemInfo, "sv_voip" );
-		if ( Cvar_VariableValue( "g_gametype" ) == GT_SINGLE_PLAYER || Cvar_VariableValue("ui_singlePlayerActive"))
-			clc.voipEnabled = qfalse;
-		else
-			clc.voipEnabled = atoi(s);
+		clc.voipEnabled = atoi(s);
 	}
 #endif

+	// don't set any vars when playing a demo
+	if ( clc.demoplaying ) {
+		return;
+	}
+
 	s = Info_ValueForKey( systemInfo, "sv_cheats" );
 	cl_connectedToCheatServer = atoi( s );
 	if ( !cl_connectedToCheatServer ) {
@ -789,7 +786,6 @@ void CL_ParseVoip ( msg_t *msg ) {
 	}

 	for (i = 0; i < frames; i++) {
-		char encoded[256];
 		const int len = MSG_ReadByte(msg);
 		if (len < 0) {
 			Com_DPrintf("VoIP: Short packet!\n");
--- a/code/client/snd_mix.c
+++ b/code/client/snd_mix.c
@ -164,7 +164,6 @@ void S_TransferPaintBuffer(int endtime)

 	if ( s_testsound->integer ) {
 		int		i;
-		int		count;

 		// write a fixed sine wave
 		count = (endtime - s_paintedtime);
--- a/code/client/snd_openal.c
+++ b/code/client/snd_openal.c
@ -1876,6 +1876,7 @@ static void S_AL_MusicSourceFree( void )
 {
 	// Release the output musicSource
 	S_AL_SrcUnlock(musicSourceHandle);
+	S_AL_SrcKill(musicSourceHandle);
 	musicSource = 0;
 	musicSourceHandle = -1;
 }
@ -1908,17 +1909,22 @@ S_AL_StopBackgroundTrack
 static
 void S_AL_StopBackgroundTrack( void )
 {
+	int		numBuffers;
+
 	if(!musicPlaying)
 		return;

 	// Stop playing
 	qalSourceStop(musicSource);

-	// De-queue the musicBuffers
-	qalSourceUnqueueBuffers(musicSource, NUM_MUSIC_BUFFERS, musicBuffers);
-
-	// Destroy the musicBuffers
-	qalDeleteBuffers(NUM_MUSIC_BUFFERS, musicBuffers);
+	// Un-queue any buffers, and delete them
+	qalGetSourcei( musicSource, AL_BUFFERS_PROCESSED, &numBuffers );
+	while( numBuffers-- )
+	{
+		ALuint buffer;
+		qalSourceUnqueueBuffers(musicSource, 1, &buffer);
+		qalDeleteBuffers(1, &buffer);
+	}

 	// Free the musicSource
 	S_AL_MusicSourceFree();
--- a/code/q3_ui/ui_players.c
+++ b/code/q3_ui/ui_players.c
@ -708,10 +708,10 @@ void UI_DrawPlayer( float x, float y, float w, float h, playerInfo_t *pi, int ti

 	dp_realtime = time;

-	if ( pi->pendingWeapon != -1 && dp_realtime > pi->weaponTimer ) {
+	if ( pi->pendingWeapon != WP_NUM_WEAPONS && dp_realtime > pi->weaponTimer ) {
 		pi->weapon = pi->pendingWeapon;
 		pi->lastWeapon = pi->pendingWeapon;
-		pi->pendingWeapon = -1;
+		pi->pendingWeapon = WP_NUM_WEAPONS;
 		pi->weaponTimer = 0;
 		if( pi->currentWeapon != pi->weapon ) {
 			trap_S_StartLocalSound( weaponChangeSound, CHAN_LOCAL );
@ -1136,7 +1136,7 @@ void UI_PlayerInfo_SetModel( playerInfo_t *pi, const char *model ) {
 	pi->weapon = WP_MACHINEGUN;
 	pi->currentWeapon = pi->weapon;
 	pi->lastWeapon = pi->weapon;
-	pi->pendingWeapon = -1;
+	pi->pendingWeapon = WP_NUM_WEAPONS;
 	pi->weaponTimer = 0;
 	pi->chat = qfalse;
 	pi->newModel = qtrue;
@ -1202,11 +1202,11 @@ void UI_PlayerInfo_SetInfo( playerInfo_t *pi, int legsAnim, int torsoAnim, vec3_
 		pi->torso.yawAngle = viewAngles[YAW];
 		pi->torso.yawing = qfalse;

-		if ( weaponNumber != -1 ) {
+		if ( weaponNumber != WP_NUM_WEAPONS ) {
 			pi->weapon = weaponNumber;
 			pi->currentWeapon = weaponNumber;
 			pi->lastWeapon = weaponNumber;
-			pi->pendingWeapon = -1;
+			pi->pendingWeapon = WP_NUM_WEAPONS;
 			pi->weaponTimer = 0;
 			UI_PlayerInfo_SetWeapon( pi, pi->weapon );
 		}
@ -1215,8 +1215,8 @@ void UI_PlayerInfo_SetInfo( playerInfo_t *pi, int legsAnim, int torsoAnim, vec3_
 	}

 	// weapon
-	if ( weaponNumber == -1 ) {
-		pi->pendingWeapon = -1;
+	if ( weaponNumber == WP_NUM_WEAPONS ) {
+		pi->pendingWeapon = WP_NUM_WEAPONS;
 		pi->weaponTimer = 0;
 	}
 	else if ( weaponNumber != WP_NONE ) {
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@ -1411,8 +1411,6 @@ void Com_InitSmallZoneMemory( void ) {
 		Com_Error( ERR_FATAL, "Small zone data failed to allocate %1.1f megs", (float)s_smallZoneTotal / (1024*1024) );
 	}
 	Z_ClearZone( smallzone, s_smallZoneTotal );
-	
-	return;
 }

 void Com_InitZoneMemory( void ) {
@ -2248,7 +2246,7 @@ Just throw a fatal error to
 test error shutdown procedures
 =============
 */
-static void Com_Error_f (void) {
+static void __attribute__((__noreturn__)) Com_Error_f (void) {
 	if ( Cmd_Argc() > 1 ) {
 		Com_Error( ERR_DROP, "Testing drop error" );
 	} else {
@ -2541,8 +2539,9 @@ static void Com_WriteCDKey( const char *filename, const char *ikey ) {
 out:
 #ifndef _WIN32
 	umask(savedumask);
+#else
+	;
 #endif
-	return;
 }
 #endif

--- a/code/qcommon/files.c
+++ b/code/qcommon/files.c
@ -1398,7 +1398,7 @@ Return the searchpath in "startSearch".
 =================
 */

-vmInterpret_t FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, int enableDll)
+int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, int enableDll)
 {
 	searchpath_t *search, *lastSearch;
 	directory_t *dir;
@ -2810,7 +2810,6 @@ void FS_Which_f( void ) {
 	}

 	Com_Printf("File not found: \"%s\"\n", filename);
-	return;
 }


--- a/code/qcommon/q_shared.c
+++ b/code/qcommon/q_shared.c
@ -286,15 +286,22 @@ PARSING
 static	char	com_token[MAX_TOKEN_CHARS];
 static	char	com_parsename[MAX_TOKEN_CHARS];
 static	int		com_lines;
+static	int		com_tokenline;

 void COM_BeginParseSession( const char *name )
 {
-	com_lines = 0;
+	com_lines = 1;
+	com_tokenline = 0;
 	Com_sprintf(com_parsename, sizeof(com_parsename), "%s", name);
 }

 int COM_GetCurrentParseLine( void )
 {
+	if ( com_tokenline )
+	{
+		return com_tokenline;
+	}
+
 	return com_lines;
 }

@ -312,7 +319,7 @@ void COM_ParseError( char *format, ... )
 	Q_vsnprintf (string, sizeof(string), format, argptr);
 	va_end (argptr);

-	Com_Printf("ERROR: %s, line %d: %s\n", com_parsename, com_lines, string);
+	Com_Printf("ERROR: %s, line %d: %s\n", com_parsename, COM_GetCurrentParseLine(), string);
 }

 void COM_ParseWarning( char *format, ... )
@ -324,7 +331,7 @@ void COM_ParseWarning( char *format, ... )
 	Q_vsnprintf (string, sizeof(string), format, argptr);
 	va_end (argptr);

-	Com_Printf("WARNING: %s, line %d: %s\n", com_parsename, com_lines, string);
+	Com_Printf("WARNING: %s, line %d: %s\n", com_parsename, COM_GetCurrentParseLine(), string);
 }

 /*
@ -434,6 +441,7 @@ char *COM_ParseExt( char **data_p, qboolean allowLineBreaks )
 	data = *data_p;
 	len = 0;
 	com_token[0] = 0;
+	com_tokenline = 0;

 	// make sure incoming data is valid
 	if ( !data )
@ -473,6 +481,10 @@ char *COM_ParseExt( char **data_p, qboolean allowLineBreaks )
 			data += 2;
 			while ( *data && ( *data != '*' || data[1] != '/' ) ) 
 			{
+				if ( *data == '\n' )
+				{
+					com_lines++;
+				}
 				data++;
 			}
 			if ( *data ) 
@ -486,6 +498,9 @@ char *COM_ParseExt( char **data_p, qboolean allowLineBreaks )
 		}
 	}

+	// token starts on this line
+	com_tokenline = com_lines;
+
 	// handle quoted strings
 	if (c == '\"')
 	{
@ -499,6 +514,10 @@ char *COM_ParseExt( char **data_p, qboolean allowLineBreaks )
 				*data_p = ( char * ) data;
 				return com_token;
 			}
+			if ( c == '\n' )
+			{
+				com_lines++;
+			}
 			if (len < MAX_TOKEN_CHARS - 1)
 			{
 				com_token[len] = c;
@ -517,8 +536,6 @@ char *COM_ParseExt( char **data_p, qboolean allowLineBreaks )
 		}
 		data++;
 		c = *data;
-		if ( c == '\n' )
-			com_lines++;
 	} while (c>32);

 	com_token[len] = 0;
@ -546,16 +563,14 @@ void COM_MatchToken( char **buf_p, char *match ) {
 =================
 SkipBracedSection

-The next token should be an open brace.
+The next token should be an open brace or set depth to 1 if already parsed it.
 Skips until a matching close brace is found.
 Internal brace depths are properly skipped.
 =================
 */
-void SkipBracedSection (char **program) {
+qboolean SkipBracedSection (char **program, int depth) {
 	char			*token;
-	int				depth;

-	depth = 0;
 	do {
 		token = COM_ParseExt( program, qtrue );
 		if( token[1] == 0 ) {
@ -567,6 +582,8 @@ void SkipBracedSection (char **program) {
 			}
 		}
 	} while( depth && *program );
+
+	return ( depth == 0 );
 }

 /*
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@ -51,6 +51,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // Heartbeat for dpmaster protocol. You shouldn't change this unless you know what you're doing
 #define HEARTBEAT_FOR_MASTER		"DarkPlaces"

+// When com_gamename is LEGACY_MASTER_GAMENAME, use quake3 master protocol.
+// You shouldn't change this unless you know what you're doing
+#define LEGACY_MASTER_GAMENAME		"Quake3Arena"
+#define LEGACY_HEARTBEAT_FOR_MASTER	"QuakeArena-1"
+
 #define BASETA				"missionpack"

 #ifndef PRODUCT_VERSION
@ -752,7 +757,7 @@ typedef struct pc_token_s

 void	COM_MatchToken( char**buf_p, char *match );

-void SkipBracedSection (char **program);
+qboolean SkipBracedSection (char **program, int depth);
 void SkipRestOfLine ( char **data );

 void Parse1DMatrix (char **buf_p, int x, float *m);
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@ -624,7 +624,7 @@ qboolean FS_FileExists( const char *file );

 qboolean FS_CreatePath (char *OSPath);

-vmInterpret_t FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, int enableDll);
+int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, int enableDll);

 char   *FS_BuildOSPath( const char *base, const char *game, const char *qpath );
 qboolean FS_CompareZipChecksum(const char *zipfile);
--- a/code/qcommon/vm_powerpc.c
+++ b/code/qcommon/vm_powerpc.c
@ -45,11 +45,7 @@ static clock_t time_total_vm = 0;
 #endif

 /* exit() won't be called but use it because it is marked with noreturn */
-#define DIE( reason ) \
-	do { \
-		Com_Error(ERR_DROP, "vm_powerpc compiler error: " reason); \
-		exit(1); \
-	} while(0)
+#define DIE( reason ) Com_Error( ERR_DROP, "vm_powerpc compiler error: " reason )

 /*
 * vm_powerpc uses large quantities of memory during compilation,
@ -1965,8 +1961,6 @@ PPC_ComputeCode( vm_t *vm )
 			di_now = di_first;
 		}
 	}
-
-	return;
 }

 static void
--- a/code/qcommon/vm_sparc.c
+++ b/code/qcommon/vm_sparc.c
@ -701,7 +701,7 @@ static void dst_insn_append(struct func_info * const fp)

 static void ErrJump(void)
 { 
-	Com_Error(ERR_DROP, "program tried to execute code outside VM\n");
+	Com_Error(ERR_DROP, "program tried to execute code outside VM");
 	exit(1);
 }

--- a/code/qcommon/vm_x86.c
+++ b/code/qcommon/vm_x86.c
@ -381,10 +381,9 @@ Error handler for jump/call to invalid instruction number
 =================
 */

-static void ErrJump(void)
+static void __attribute__((__noreturn__)) ErrJump(void)
 { 
 	Com_Error(ERR_DROP, "program tried to execute code outside VM");
-	exit(1);
 }

 /*
--- a/code/renderercommon/tr_font.c
+++ b/code/renderercommon/tr_font.c
@ -73,10 +73,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 #ifdef BUILD_FREETYPE
 #include <ft2build.h>
+#include FT_FREETYPE_H
 #include FT_ERRORS_H
 #include FT_SYSTEM_H
 #include FT_IMAGE_H
-#include FT_FREETYPE_H
 #include FT_OUTLINE_H

 #define _FLOOR(x)  ((x) & -64)
@ -401,6 +401,7 @@ void RE_RegisterFont(const char *fontName, int pointSize, fontInfo_t *font) {
 			font->glyphs[i].glyph = RE_RegisterShaderNoMip(font->glyphs[i].shaderName);
 		}
 		Com_Memcpy(&registeredFont[registeredFontCount++], font, sizeof(fontInfo_t));
+		ri.FS_FreeFile(faceData);
 		return;
 	}

@ -435,12 +436,12 @@ void RE_RegisterFont(const char *fontName, int pointSize, fontInfo_t *font) {
 	// make a 256x256 image buffer, once it is full, register it, clean it and keep going 
 	// until all glyphs are rendered

-	out = ri.Malloc(1024*1024);
+	out = ri.Malloc(256*256);
 	if (out == NULL) {
 		ri.Printf(PRINT_WARNING, "RE_RegisterFont: ri.Malloc failure during output image creation.\n");
 		return;
 	}
-	Com_Memset(out, 0, 1024*1024);
+	Com_Memset(out, 0, 256*256);

 	maxHeight = 0;

@ -499,11 +500,12 @@ void RE_RegisterFont(const char *fontName, int pointSize, fontInfo_t *font) {
 				Q_strncpyz(font->glyphs[j].shaderName, name, sizeof(font->glyphs[j].shaderName));
 			}
 			lastStart = i;
-			Com_Memset(out, 0, 1024*1024);
+			Com_Memset(out, 0, 256*256);
 			xOut = 0;
 			yOut = 0;
 			ri.Free(imageBuff);
-			i++;
+			if(i == GLYPH_END)
+				i++;
 		} else {
 			Com_Memcpy(&font->glyphs[i], glyph, sizeof(glyphInfo_t));
 			i++;
--- a/code/renderercommon/tr_image_jpg.c
+++ b/code/renderercommon/tr_image_jpg.c
@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #  endif
 #endif

-static void R_JPGErrorExit(j_common_ptr cinfo)
+static void __attribute__((__noreturn__)) R_JPGErrorExit(j_common_ptr cinfo)
 {
  char buffer[JMSG_LENGTH_MAX];
  
--- a/code/renderergl1/tr_backend.c
+++ b/code/renderergl1/tr_backend.c
@ -668,9 +668,10 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 		qglDepthRange (0, 1);
 	}

-#if 0
-	RB_DrawSun();
-#endif
+	if (r_drawSun->integer) {
+		RB_DrawSun(0.1, tr.sunShader);
+	}
+
 	// darken down any stencil shadows
 	RB_ShadowFinish();		

--- a/code/renderergl1/tr_cmds.c
+++ b/code/renderergl1/tr_cmds.c
@ -21,8 +21,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include "tr_local.h"

-volatile renderCommandList_t	*renderCommandList;
-
 /*
 =====================
 R_PerformanceCounters
--- a/code/renderergl1/tr_flares.c
+++ b/code/renderergl1/tr_flares.c
@ -352,8 +352,8 @@ void RB_RenderFlare( flare_t *f ) {

 	VectorScale(f->color, f->drawIntensity * intensity, color);

-// Calculations for fogging
-	if(tr.world && f->fogNum < tr.world->numfogs)
+	// Calculations for fogging
+	if(tr.world && f->fogNum > 0 && f->fogNum < tr.world->numfogs)
 	{
 		tess.numVertexes = 1;
 		VectorCopy(f->origin, tess.xyz[0]);
--- a/code/renderergl1/tr_local.h
+++ b/code/renderergl1/tr_local.h
@ -1327,7 +1327,7 @@ SKIES
 void R_BuildCloudData( shaderCommands_t *shader );
 void R_InitSkyTexCoords( float cloudLayerHeight );
 void R_DrawSkyBox( shaderCommands_t *shader );
-void RB_DrawSun( void );
+void RB_DrawSun( float scale, shader_t *shader );
 void RB_ClipSkyPolygons( shaderCommands_t *shader );

 /*
@ -1594,8 +1594,6 @@ extern	int		max_polyverts;

 extern	backEndData_t	*backEndData;	// the second one may not be allocated

-extern	volatile renderCommandList_t	*renderCommandList;
-

 void *R_GetCommandBuffer( int bytes );
 void RB_ExecuteRenderCommands( const void *data );
--- a/code/renderergl1/tr_model.c
+++ b/code/renderergl1/tr_model.c
@ -458,15 +458,15 @@ static qboolean R_LoadMD3 (model_t *mod, int lod, void *buffer, const char *mod_
        LL(surf->ofsXyzNormals);
        LL(surf->ofsEnd);
 		
-		if ( surf->numVerts > SHADER_MAX_VERTEXES ) {
+		if ( surf->numVerts >= SHADER_MAX_VERTEXES ) {
 			ri.Printf(PRINT_WARNING, "R_LoadMD3: %s has more than %i verts on %s (%i).\n",
-				mod_name, SHADER_MAX_VERTEXES, surf->name[0] ? surf->name : "a surface",
+				mod_name, SHADER_MAX_VERTEXES - 1, surf->name[0] ? surf->name : "a surface",
 				surf->numVerts );
 			return qfalse;
 		}
-		if ( surf->numTriangles*3 > SHADER_MAX_INDEXES ) {
+		if ( surf->numTriangles*3 >= SHADER_MAX_INDEXES ) {
 			ri.Printf(PRINT_WARNING, "R_LoadMD3: %s has more than %i triangles on %s (%i).\n",
-				mod_name, SHADER_MAX_INDEXES / 3, surf->name[0] ? surf->name : "a surface",
+				mod_name, ( SHADER_MAX_INDEXES / 3 ) - 1, surf->name[0] ? surf->name : "a surface",
 				surf->numTriangles );
 			return qfalse;
 		}
@ -736,17 +736,17 @@ static qboolean R_LoadMDR( model_t *mod, void *buffer, int filesize, const char
 			// numBoneReferences and BoneReferences generally seem to be unused
 			
 			// now do the checks that may fail.
-			if ( surf->numVerts > SHADER_MAX_VERTEXES ) 
+			if ( surf->numVerts >= SHADER_MAX_VERTEXES ) 
 			{
 				ri.Printf(PRINT_WARNING, "R_LoadMDR: %s has more than %i verts on %s (%i).\n",
-					  mod_name, SHADER_MAX_VERTEXES, surf->name[0] ? surf->name : "a surface",
+					  mod_name, SHADER_MAX_VERTEXES - 1, surf->name[0] ? surf->name : "a surface",
 					  surf->numVerts );
 				return qfalse;
 			}
-			if ( surf->numTriangles*3 > SHADER_MAX_INDEXES ) 
+			if ( surf->numTriangles*3 >= SHADER_MAX_INDEXES ) 
 			{
 				ri.Printf(PRINT_WARNING, "R_LoadMDR: %s has more than %i triangles on %s (%i).\n",
-					  mod_name, SHADER_MAX_INDEXES / 3, surf->name[0] ? surf->name : "a surface",
+					  mod_name, ( SHADER_MAX_INDEXES / 3 ) - 1, surf->name[0] ? surf->name : "a surface",
 					  surf->numTriangles );
 				return qfalse;
 			}
@ -953,15 +953,15 @@ static qboolean R_LoadMD4( model_t *mod, void *buffer, const char *mod_name ) {
 			LL(surf->ofsVerts);
 			LL(surf->ofsEnd);
 			
-			if ( surf->numVerts > SHADER_MAX_VERTEXES ) {
+			if ( surf->numVerts >= SHADER_MAX_VERTEXES ) {
 				ri.Printf(PRINT_WARNING, "R_LoadMD4: %s has more than %i verts on %s (%i).\n",
-					mod_name, SHADER_MAX_VERTEXES, surf->name[0] ? surf->name : "a surface",
+					mod_name, SHADER_MAX_VERTEXES - 1, surf->name[0] ? surf->name : "a surface",
 					surf->numVerts );
 				return qfalse;
 			}
-			if ( surf->numTriangles*3 > SHADER_MAX_INDEXES ) {
+			if ( surf->numTriangles*3 >= SHADER_MAX_INDEXES ) {
 				ri.Printf(PRINT_WARNING, "R_LoadMD4: %s has more than %i triangles on %s (%i).\n",
-					mod_name, SHADER_MAX_INDEXES / 3, surf->name[0] ? surf->name : "a surface",
+					mod_name, ( SHADER_MAX_INDEXES / 3 ) - 1, surf->name[0] ? surf->name : "a surface",
 					surf->numTriangles );
 				return qfalse;
 			}
--- a/code/renderergl1/tr_model_iqm.c
+++ b/code/renderergl1/tr_model_iqm.c
@ -206,7 +206,7 @@ qboolean R_LoadIQM( model_t *mod, void *buffer, int filesize, const char *mod_na
 	}
 	vertexarray = (iqmVertexArray_t *)((byte *)header + header->ofs_vertexarrays);
 	for( i = 0; i < header->num_vertexarrays; i++, vertexarray++ ) {
-		int	j, n, *intPtr;
+		int n, *intPtr;

 		if( vertexarray->size <= 0 || vertexarray->size > 4 ) {
 			return qfalse;
@ -318,17 +318,17 @@ qboolean R_LoadIQM( model_t *mod, void *buffer, int filesize, const char *mod_na
 		}

 		// check ioq3 limits
-		if ( mesh->num_vertexes > SHADER_MAX_VERTEXES ) 
+		if ( mesh->num_vertexes >= SHADER_MAX_VERTEXES ) 
 		{
 			ri.Printf(PRINT_WARNING, "R_LoadIQM: %s has more than %i verts on %s (%i).\n",
-				  mod_name, SHADER_MAX_VERTEXES, meshName[0] ? meshName : "a surface",
+				  mod_name, SHADER_MAX_VERTEXES - 1, meshName[0] ? meshName : "a surface",
 				  mesh->num_vertexes );
 			return qfalse;
 		}
-		if ( mesh->num_triangles*3 > SHADER_MAX_INDEXES ) 
+		if ( mesh->num_triangles*3 >= SHADER_MAX_INDEXES ) 
 		{
 			ri.Printf(PRINT_WARNING, "R_LoadIQM: %s has more than %i triangles on %s (%i).\n",
-				  mod_name, SHADER_MAX_INDEXES / 3, meshName[0] ? meshName : "a surface",
+				  mod_name, ( SHADER_MAX_INDEXES / 3 ) - 1, meshName[0] ? meshName : "a surface",
 				  mesh->num_triangles );
 			return qfalse;
 		}
@ -953,10 +953,10 @@ void RB_IQMSurfaceAnim( surfaceType_t *surface ) {
 	float		jointMats[IQM_MAX_JOINTS * 12];
 	int		i;

-	vec4_t		*outXYZ = &tess.xyz[tess.numVertexes];
-	vec4_t		*outNormal = &tess.normal[tess.numVertexes];
-	vec2_t		(*outTexCoord)[2] = &tess.texCoords[tess.numVertexes];
-	color4ub_t	*outColor = &tess.vertexColors[tess.numVertexes];
+	vec4_t		*outXYZ;
+	vec4_t		*outNormal;
+	vec2_t		(*outTexCoord)[2];
+	color4ub_t	*outColor;

 	int	frame = data->num_frames ? backEnd.currentEntity->e.frame % data->num_frames : 0;
 	int	oldframe = data->num_frames ? backEnd.currentEntity->e.oldframe % data->num_frames : 0;
@ -968,6 +968,11 @@ void RB_IQMSurfaceAnim( surfaceType_t *surface ) {

 	RB_CHECKOVERFLOW( surf->num_vertexes, surf->num_triangles * 3 );

+	outXYZ = &tess.xyz[tess.numVertexes];
+	outNormal = &tess.normal[tess.numVertexes];
+	outTexCoord = &tess.texCoords[tess.numVertexes];
+	outColor = &tess.vertexColors[tess.numVertexes];
+
 	// compute interpolated joint matrices
 	if ( data->num_joints > 0 ) {
 		ComputePoseMats( data, frame, oldframe, backlerp, jointMats );
--- a/code/renderergl1/tr_shader.c
+++ b/code/renderergl1/tr_shader.c
@ -1668,7 +1668,7 @@ static void ComputeStageIteratorFunc( void )
 	if ( shader.isSky )
 	{
 		shader.optimalStageIteratorFunc = RB_StageIteratorSky;
-		goto done;
+		return;
 	}

 	if ( r_ignoreFastPath->integer )
@ -1694,7 +1694,7 @@ static void ComputeStageIteratorFunc( void )
 							if ( !shader.numDeforms )
 							{
 								shader.optimalStageIteratorFunc = RB_StageIteratorVertexLitTexture;
-								goto done;
+								return;
 							}
 						}
 					}
@ -1720,16 +1720,12 @@ static void ComputeStageIteratorFunc( void )
 						if ( shader.multitextureEnv )
 						{
 							shader.optimalStageIteratorFunc = RB_StageIteratorLightmappedMultitexture;
-							goto done;
 						}
 					}
 				}
 			}
 		}
 	}
-
-done:
-	return;
 }

 typedef struct {
@ -2386,7 +2382,7 @@ static char *FindShaderInShaderText( const char *shadername ) {
 		}
 		else {
 			// skip the definition
-			SkipBracedSection( &p );
+			SkipBracedSection( &p, 0 );
 		}
 	}

@ -2920,6 +2916,8 @@ static void ScanAndLoadShaderFiles( void )
 	int i;
 	char *oldp, *token, *hashMem, *textEnd;
 	int shaderTextHashTableSizes[MAX_SHADERTEXT_HASH], hash, size;
+	char shaderName[MAX_QPATH];
+	int shaderLine;

 	long sum = 0, summand;
 	// scan for shader files
@ -2949,26 +2947,40 @@ static void ScanAndLoadShaderFiles( void )
 		
 		// Do a simple check on the shader structure in that file to make sure one bad shader file cannot fuck up all other shaders.
 		p = buffers[i];
+		COM_BeginParseSession(filename);
 		while(1)
 		{
 			token = COM_ParseExt(&p, qtrue);
 			
 			if(!*token)
 				break;
-			
-			oldp = p;
-			
+
+			Q_strncpyz(shaderName, token, sizeof(shaderName));
+			shaderLine = COM_GetCurrentParseLine();
+
 			token = COM_ParseExt(&p, qtrue);
-			if(token[0] != '{' && token[1] != '\0')
+			if(token[0] != '{' || token[1] != '\0')
 			{
-				ri.Printf(PRINT_WARNING, "WARNING: Bad shader file %s has incorrect syntax.\n", filename);
+				ri.Printf(PRINT_WARNING, "WARNING: Ignoring shader file %s. Shader \"%s\" on line %d missing opening brace",
+							filename, shaderName, shaderLine);
+				if (token[0])
+				{
+					ri.Printf(PRINT_WARNING, " (found \"%s\" on line %d)", token, COM_GetCurrentParseLine());
+				}
+				ri.Printf(PRINT_WARNING, ".\n");
 				ri.FS_FreeFile(buffers[i]);
 				buffers[i] = NULL;
 				break;
 			}

-			SkipBracedSection(&oldp);
-			p = oldp;
+			if(!SkipBracedSection(&p, 1))
+			{
+				ri.Printf(PRINT_WARNING, "WARNING: Ignoring shader file %s. Shader \"%s\" on line %d missing closing brace.\n",
+							filename, shaderName, shaderLine);
+				ri.FS_FreeFile(buffers[i]);
+				buffers[i] = NULL;
+				break;
+			}
 		}
 			
 		
@ -3012,7 +3024,7 @@ static void ScanAndLoadShaderFiles( void )
 		hash = generateHashValue(token, MAX_SHADERTEXT_HASH);
 		shaderTextHashTableSizes[hash]++;
 		size++;
-		SkipBracedSection(&p);
+		SkipBracedSection(&p, 0);
 	}

 	size += MAX_SHADERTEXT_HASH;
@ -3038,7 +3050,7 @@ static void ScanAndLoadShaderFiles( void )
 		hash = generateHashValue(token, MAX_SHADERTEXT_HASH);
 		shaderTextHashTable[hash][shaderTextHashTableSizes[hash]++] = oldp;

-		SkipBracedSection(&p);
+		SkipBracedSection(&p, 0);
 	}

 	return;
--- a/code/renderergl1/tr_sky.c
+++ b/code/renderergl1/tr_sky.c
@ -696,23 +696,21 @@ void R_InitSkyTexCoords( float heightCloud )
 /*
 ** RB_DrawSun
 */
-void RB_DrawSun( void ) {
+void RB_DrawSun( float scale, shader_t *shader ) {
 	float		size;
 	float		dist;
 	vec3_t		origin, vec1, vec2;
-	vec3_t		temp;
+	byte		sunColor[4] = { 255, 255, 255, 255 };

 	if ( !backEnd.skyRenderedThisView ) {
 		return;
 	}
-	if ( !r_drawSun->integer ) {
-		return;
-	}
+
 	qglLoadMatrixf( backEnd.viewParms.world.modelMatrix );
 	qglTranslatef (backEnd.viewParms.or.origin[0], backEnd.viewParms.or.origin[1], backEnd.viewParms.or.origin[2]);

 	dist = 	backEnd.viewParms.zFar / 1.75;		// div sqrt(3)
-	size = dist * 0.4;
+	size = dist * scale;

 	VectorScale( tr.sunDirection, dist, origin );
 	PerpendicularVector( vec1, tr.sunDirection );
@ -724,58 +722,9 @@ void RB_DrawSun( void ) {
 	// farthest depth range
 	qglDepthRange( 1.0, 1.0 );

-	// FIXME: use quad stamp
-	RB_BeginSurface( tr.sunShader, tess.fogNum );
-		VectorCopy( origin, temp );
-		VectorSubtract( temp, vec1, temp );
-		VectorSubtract( temp, vec2, temp );
-		VectorCopy( temp, tess.xyz[tess.numVertexes] );
-		tess.texCoords[tess.numVertexes][0][0] = 0;
-		tess.texCoords[tess.numVertexes][0][1] = 0;
-		tess.vertexColors[tess.numVertexes][0] = 255;
-		tess.vertexColors[tess.numVertexes][1] = 255;
-		tess.vertexColors[tess.numVertexes][2] = 255;
-		tess.numVertexes++;
+	RB_BeginSurface( shader, 0 );

-		VectorCopy( origin, temp );
-		VectorAdd( temp, vec1, temp );
-		VectorSubtract( temp, vec2, temp );
-		VectorCopy( temp, tess.xyz[tess.numVertexes] );
-		tess.texCoords[tess.numVertexes][0][0] = 0;
-		tess.texCoords[tess.numVertexes][0][1] = 1;
-		tess.vertexColors[tess.numVertexes][0] = 255;
-		tess.vertexColors[tess.numVertexes][1] = 255;
-		tess.vertexColors[tess.numVertexes][2] = 255;
-		tess.numVertexes++;
-
-		VectorCopy( origin, temp );
-		VectorAdd( temp, vec1, temp );
-		VectorAdd( temp, vec2, temp );
-		VectorCopy( temp, tess.xyz[tess.numVertexes] );
-		tess.texCoords[tess.numVertexes][0][0] = 1;
-		tess.texCoords[tess.numVertexes][0][1] = 1;
-		tess.vertexColors[tess.numVertexes][0] = 255;
-		tess.vertexColors[tess.numVertexes][1] = 255;
-		tess.vertexColors[tess.numVertexes][2] = 255;
-		tess.numVertexes++;
-
-		VectorCopy( origin, temp );
-		VectorSubtract( temp, vec1, temp );
-		VectorAdd( temp, vec2, temp );
-		VectorCopy( temp, tess.xyz[tess.numVertexes] );
-		tess.texCoords[tess.numVertexes][0][0] = 1;
-		tess.texCoords[tess.numVertexes][0][1] = 0;
-		tess.vertexColors[tess.numVertexes][0] = 255;
-		tess.vertexColors[tess.numVertexes][1] = 255;
-		tess.vertexColors[tess.numVertexes][2] = 255;
-		tess.numVertexes++;
-
-		tess.indexes[tess.numIndexes++] = 0;
-		tess.indexes[tess.numIndexes++] = 1;
-		tess.indexes[tess.numIndexes++] = 2;
-		tess.indexes[tess.numIndexes++] = 0;
-		tess.indexes[tess.numIndexes++] = 2;
-		tess.indexes[tess.numIndexes++] = 3;
+	RB_AddQuadStamp(origin, vec1, vec2, sunColor);

 	RB_EndSurface();

--- a/code/renderergl1/tr_surface.c
+++ b/code/renderergl1/tr_surface.c
@ -1157,6 +1157,7 @@ Draws x/y/z lines from the origin for orientation debugging
 */
 static void RB_SurfaceAxis( void ) {
 	GL_Bind( tr.whiteImage );
+	GL_State( GLS_DEFAULT );
 	qglLineWidth( 3 );
 	qglBegin( GL_LINES );
 	qglColor3f( 1,0,0 );
@ -1202,7 +1203,6 @@ static void RB_SurfaceEntity( surfaceType_t *surfType ) {
 		RB_SurfaceAxis();
 		break;
 	}
-	return;
 }

 static void RB_SurfaceBad( surfaceType_t *surfType ) {
--- a/code/renderergl2/tr_bsp.c
+++ b/code/renderergl2/tr_bsp.c
@ -350,7 +350,7 @@ static	void R_LoadLightmaps( lump_t *l, lump_t *surfs ) {
 				}

 				if (!size)
-					ri.Error(ERR_DROP, "Bad header for %s!\n", filename);
+					ri.Error(ERR_DROP, "Bad header for %s!", filename);

 				size -= 2;
 				p += 2;
@ -368,10 +368,10 @@ static	void R_LoadLightmaps( lump_t *l, lump_t *surfs ) {

 #if 0 // HDRFILE_RGBE
 				if (size != tr.lightmapSize * tr.lightmapSize * 4)
-					ri.Error(ERR_DROP, "Bad size for %s (%i)!\n", filename, size);
+					ri.Error(ERR_DROP, "Bad size for %s (%i)!", filename, size);
 #else // HDRFILE_FLOAT
 				if (size != tr.lightmapSize * tr.lightmapSize * 12)
-					ri.Error(ERR_DROP, "Bad size for %s (%i)!\n", filename, size);
+					ri.Error(ERR_DROP, "Bad size for %s (%i)!", filename, size);
 #endif
 			}
 			else
@ -524,11 +524,13 @@ static float FatPackU(float input, int lightmapnum)
 	if (tr.worldDeluxeMapping)
 		lightmapnum >>= 1;

-	lightmapnum %= (tr.fatLightmapStep * tr.fatLightmapStep);
-
 	if(tr.fatLightmapSize > 0)
 	{
-		int             x = lightmapnum % tr.fatLightmapStep;
+		int             x;
+
+		lightmapnum %= (tr.fatLightmapStep * tr.fatLightmapStep);
+
+		x = lightmapnum % tr.fatLightmapStep;

 		return (input / ((float)tr.fatLightmapStep)) + ((1.0 / ((float)tr.fatLightmapStep)) * (float)x);
 	}
@ -544,11 +546,13 @@ static float FatPackV(float input, int lightmapnum)
 	if (tr.worldDeluxeMapping)
 		lightmapnum >>= 1;

-	lightmapnum %= (tr.fatLightmapStep * tr.fatLightmapStep);
-
 	if(tr.fatLightmapSize > 0)
 	{
-		int             y = lightmapnum / tr.fatLightmapStep;
+		int             y;
+
+		lightmapnum %= (tr.fatLightmapStep * tr.fatLightmapStep);
+
+		y = lightmapnum / tr.fatLightmapStep;

 		return (input / ((float)tr.fatLightmapStep)) + ((1.0 / ((float)tr.fatLightmapStep)) * (float)y);
 	}
@ -2184,7 +2188,7 @@ static	void R_LoadSurfaces( lump_t *surfs, lump_t *verts, lump_t *indexLump ) {
 		{
 			//ri.Printf(PRINT_ALL, "Found!\n");
 			if (size != sizeof(float) * 3 * (verts->filelen / sizeof(*dv)))
-				ri.Error(ERR_DROP, "Bad size for %s (%i, expected %i)!\n", filename, size, (int)((sizeof(float)) * 3 * (verts->filelen / sizeof(*dv))));
+				ri.Error(ERR_DROP, "Bad size for %s (%i, expected %i)!", filename, size, (int)((sizeof(float)) * 3 * (verts->filelen / sizeof(*dv))));
 		}
 	}

@ -2685,7 +2689,7 @@ void R_LoadLightGrid( lump_t *l ) {

 			if (size != sizeof(float) * 6 * numGridPoints)
 			{
-				ri.Error(ERR_DROP, "Bad size for %s (%i, expected %i)!\n", filename, size, (int)(sizeof(float)) * 6 * numGridPoints);
+				ri.Error(ERR_DROP, "Bad size for %s (%i, expected %i)!", filename, size, (int)(sizeof(float)) * 6 * numGridPoints);
 			}

 			w->hdrLightGrid = ri.Hunk_Alloc(size, h_low);
@ -3352,12 +3356,12 @@ void RE_LoadWorldMap( const char *name ) {
 	if (0)
 	{
 		world_t	*w;
-
-		w = &s_worldData;
 		uint8_t *primaryLightGrid, *data;
 		int lightGridSize;
 		int i;

+		w = &s_worldData;
+
 		lightGridSize = w->lightGridBounds[0] * w->lightGridBounds[1] * w->lightGridBounds[2];
 		primaryLightGrid = ri.Malloc(lightGridSize * sizeof(*primaryLightGrid));

@ -3376,6 +3380,7 @@ void RE_LoadWorldMap( const char *name ) {
 			gridLightCol[0] = ByteToFloat(data[3]);
 			gridLightCol[1] = ByteToFloat(data[4]);
 			gridLightCol[2] = ByteToFloat(data[5]);
+			(void)gridLightCol; // Suppress unused-but-set-variable warning

 			lat = data[7];
 			lng = data[6];
--- a/code/renderergl2/tr_cmds.c
+++ b/code/renderergl2/tr_cmds.c
@ -21,8 +21,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include "tr_local.h"

-volatile renderCommandList_t	*renderCommandList;
-
 /*
 =====================
 R_PerformanceCounters
--- a/code/renderergl2/tr_extratypes.h
+++ b/code/renderergl2/tr_extratypes.h
@ -25,11 +25,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 // tr_extratypes.h, for mods that want to extend tr_types.h without losing compatibility with original VMs

-// extra renderfx flags start at 0x0400
-#define RF_SUNFLARE			0x0400
-
 // extra refdef flags start at 0x0008
-#define RDF_NOFOG		0x0008		// don't apply fog
+#define RDF_NOFOG		0x0008		// don't apply fog to polys added using RE_AddPolyToScene
 #define RDF_EXTRA		0x0010		// Makro - refdefex_t to follow after refdef_t
 #define RDF_SUNLIGHT    0x0020      // SmileTheory - render sunlight and shadows

--- a/code/renderergl2/tr_fbo.c
+++ b/code/renderergl2/tr_fbo.c
@ -107,7 +107,7 @@ FBO_t          *FBO_Create(const char *name, int width, int height)

 	if(strlen(name) >= MAX_QPATH)
 	{
-		ri.Error(ERR_DROP, "FBO_Create: \"%s\" is too long\n", name);
+		ri.Error(ERR_DROP, "FBO_Create: \"%s\" is too long", name);
 	}

 	if(width <= 0 || width > glRefConfig.maxRenderbufferSize)
--- a/code/renderergl2/tr_flares.c
+++ b/code/renderergl2/tr_flares.c
@ -352,8 +352,8 @@ void RB_RenderFlare( flare_t *f ) {

 	VectorScale(f->color, f->drawIntensity * intensity, color);

-// Calculations for fogging
-	if(tr.world && f->fogNum < tr.world->numfogs)
+	// Calculations for fogging
+	if(tr.world && f->fogNum > 0 && f->fogNum < tr.world->numfogs)
 	{
 		tess.numVertexes = 1;
 		VectorCopy(f->origin, tess.xyz[0]);
--- a/code/renderergl2/tr_glsl.c
+++ b/code/renderergl2/tr_glsl.c
@ -431,7 +431,8 @@ static void GLSL_LinkProgram(GLhandleARB program)
 	if(!linked)
 	{
 		GLSL_PrintInfoLog(program, qfalse);
-		ri.Error(ERR_DROP, "\nshaders failed to link");
+		ri.Printf(PRINT_ALL, "\n");
+		ri.Error(ERR_DROP, "shaders failed to link");
 	}
 }

@ -445,7 +446,8 @@ static void GLSL_ValidateProgram(GLhandleARB program)
 	if(!validated)
 	{
 		GLSL_PrintInfoLog(program, qfalse);
-		ri.Error(ERR_DROP, "\nshaders failed to validate");
+		ri.Printf(PRINT_ALL, "\n");
+		ri.Error(ERR_DROP, "shaders failed to validate");
 	}
 }

--- a/code/renderergl2/tr_local.h
+++ b/code/renderergl2/tr_local.h
@ -2652,8 +2652,6 @@ extern	int		max_polyverts;

 extern	backEndData_t	*backEndData;	// the second one may not be allocated

-extern	volatile renderCommandList_t	*renderCommandList;
-

 void *R_GetCommandBuffer( int bytes );
 void RB_ExecuteRenderCommands( const void *data );
--- a/code/renderergl2/tr_model.c
+++ b/code/renderergl2/tr_model.c
@ -495,17 +495,17 @@ static qboolean R_LoadMD3(model_t * mod, int lod, void *buffer, int bufferSize,
 		LL(md3Surf->ofsXyzNormals);
 		LL(md3Surf->ofsEnd);

-		if(md3Surf->numVerts > SHADER_MAX_VERTEXES)
+		if(md3Surf->numVerts >= SHADER_MAX_VERTEXES)
 		{
 			ri.Printf(PRINT_WARNING, "R_LoadMD3: %s has more than %i verts on %s (%i).\n",
-				modName, SHADER_MAX_VERTEXES, md3Surf->name[0] ? md3Surf->name : "a surface",
+				modName, SHADER_MAX_VERTEXES - 1, md3Surf->name[0] ? md3Surf->name : "a surface",
 				md3Surf->numVerts );
 			return qfalse;
 		}
-		if(md3Surf->numTriangles * 3 > SHADER_MAX_INDEXES)
+		if(md3Surf->numTriangles * 3 >= SHADER_MAX_INDEXES)
 		{
 			ri.Printf(PRINT_WARNING, "R_LoadMD3: %s has more than %i triangles on %s (%i).\n",
-				modName, SHADER_MAX_INDEXES / 3, md3Surf->name[0] ? md3Surf->name : "a surface",
+				modName, ( SHADER_MAX_INDEXES / 3 ) - 1, md3Surf->name[0] ? md3Surf->name : "a surface",
 				md3Surf->numTriangles );
 			return qfalse;
 		}
@ -996,17 +996,17 @@ static qboolean R_LoadMDR( model_t *mod, void *buffer, int filesize, const char
 			// numBoneReferences and BoneReferences generally seem to be unused
 			
 			// now do the checks that may fail.
-			if ( surf->numVerts > SHADER_MAX_VERTEXES ) 
+			if ( surf->numVerts >= SHADER_MAX_VERTEXES ) 
 			{
 				ri.Printf(PRINT_WARNING, "R_LoadMDR: %s has more than %i verts on %s (%i).\n",
-					  mod_name, SHADER_MAX_VERTEXES, surf->name[0] ? surf->name : "a surface",
+					  mod_name, SHADER_MAX_VERTEXES - 1, surf->name[0] ? surf->name : "a surface",
 					  surf->numVerts );
 				return qfalse;
 			}
-			if ( surf->numTriangles*3 > SHADER_MAX_INDEXES ) 
+			if ( surf->numTriangles*3 >= SHADER_MAX_INDEXES ) 
 			{
 				ri.Printf(PRINT_WARNING, "R_LoadMDR: %s has more than %i triangles on %s (%i).\n",
-					  mod_name, SHADER_MAX_INDEXES / 3, surf->name[0] ? surf->name : "a surface",
+					  mod_name, ( SHADER_MAX_INDEXES / 3 ) - 1, surf->name[0] ? surf->name : "a surface",
 					  surf->numTriangles );
 				return qfalse;
 			}
@ -1213,15 +1213,15 @@ static qboolean R_LoadMD4( model_t *mod, void *buffer, const char *mod_name ) {
 			LL(surf->ofsVerts);
 			LL(surf->ofsEnd);
 			
-			if ( surf->numVerts > SHADER_MAX_VERTEXES ) {
+			if ( surf->numVerts >= SHADER_MAX_VERTEXES ) {
 				ri.Printf(PRINT_WARNING, "R_LoadMD4: %s has more than %i verts on %s (%i).\n",
-					mod_name, SHADER_MAX_VERTEXES, surf->name[0] ? surf->name : "a surface",
+					mod_name, SHADER_MAX_VERTEXES - 1, surf->name[0] ? surf->name : "a surface",
 					surf->numVerts );
 				return qfalse;
 			}
-			if ( surf->numTriangles*3 > SHADER_MAX_INDEXES ) {
+			if ( surf->numTriangles*3 >= SHADER_MAX_INDEXES ) {
 				ri.Printf(PRINT_WARNING, "R_LoadMD4: %s has more than %i triangles on %s (%i).\n",
-					mod_name, SHADER_MAX_INDEXES / 3, surf->name[0] ? surf->name : "a surface",
+					mod_name, ( SHADER_MAX_INDEXES / 3 ) - 1, surf->name[0] ? surf->name : "a surface",
 					surf->numTriangles );
 				return qfalse;
 			}
--- a/code/renderergl2/tr_model_iqm.c
+++ b/code/renderergl2/tr_model_iqm.c
@ -206,7 +206,7 @@ qboolean R_LoadIQM( model_t *mod, void *buffer, int filesize, const char *mod_na
 	}
 	vertexarray = (iqmVertexArray_t *)((byte *)header + header->ofs_vertexarrays);
 	for( i = 0; i < header->num_vertexarrays; i++, vertexarray++ ) {
-		int	j, n, *intPtr;
+		int	n, *intPtr;

 		if( vertexarray->size <= 0 || vertexarray->size > 4 ) {
 			return qfalse;
@ -318,17 +318,17 @@ qboolean R_LoadIQM( model_t *mod, void *buffer, int filesize, const char *mod_na
 		}

 		// check ioq3 limits
-		if ( mesh->num_vertexes > SHADER_MAX_VERTEXES ) 
+		if ( mesh->num_vertexes >= SHADER_MAX_VERTEXES ) 
 		{
 			ri.Printf(PRINT_WARNING, "R_LoadIQM: %s has more than %i verts on %s (%i).\n",
-				  mod_name, SHADER_MAX_VERTEXES, meshName[0] ? meshName : "a surface",
+				  mod_name, SHADER_MAX_VERTEXES - 1, meshName[0] ? meshName : "a surface",
 				  mesh->num_vertexes );
 			return qfalse;
 		}
-		if ( mesh->num_triangles*3 > SHADER_MAX_INDEXES ) 
+		if ( mesh->num_triangles*3 >= SHADER_MAX_INDEXES ) 
 		{
 			ri.Printf(PRINT_WARNING, "R_LoadIQM: %s has more than %i triangles on %s (%i).\n",
-				  mod_name, SHADER_MAX_INDEXES / 3, meshName[0] ? meshName : "a surface",
+				  mod_name, ( SHADER_MAX_INDEXES / 3 ) - 1, meshName[0] ? meshName : "a surface",
 				  mesh->num_triangles );
 			return qfalse;
 		}
@ -953,10 +953,10 @@ void RB_IQMSurfaceAnim( surfaceType_t *surface ) {
 	float		jointMats[IQM_MAX_JOINTS * 12];
 	int		i;

-	vec4_t		*outXYZ = &tess.xyz[tess.numVertexes];
-	vec4_t		*outNormal = &tess.normal[tess.numVertexes];
-	vec2_t		(*outTexCoord)[2] = &tess.texCoords[tess.numVertexes];
-	vec4_t	*outColor = &tess.vertexColors[tess.numVertexes];
+	vec4_t		*outXYZ;
+	vec4_t		*outNormal;
+	vec2_t		(*outTexCoord)[2];
+	vec4_t	*outColor;

 	int	frame = data->num_frames ? backEnd.currentEntity->e.frame % data->num_frames : 0;
 	int	oldframe = data->num_frames ? backEnd.currentEntity->e.oldframe % data->num_frames : 0;
@ -968,6 +968,11 @@ void RB_IQMSurfaceAnim( surfaceType_t *surface ) {

 	RB_CHECKOVERFLOW( surf->num_vertexes, surf->num_triangles * 3 );

+	outXYZ = &tess.xyz[tess.numVertexes];
+	outNormal = &tess.normal[tess.numVertexes];
+	outTexCoord = &tess.texCoords[tess.numVertexes];
+	outColor = &tess.vertexColors[tess.numVertexes];
+
 	// compute interpolated joint matrices
 	if ( data->num_joints > 0 ) {
 		ComputePoseMats( data, frame, oldframe, backlerp, jointMats );
--- a/code/renderergl2/tr_shade.c
+++ b/code/renderergl2/tr_shade.c
@ -415,6 +415,7 @@ static void ProjectDlightTexture( void ) {

 		backEnd.pc.c_totalIndexes += tess.numIndexes;
 		backEnd.pc.c_dlightIndexes += tess.numIndexes;
+		backEnd.pc.c_dlightVertexes += tess.numVertexes;
 	}
 }

@ -874,6 +875,7 @@ static void ForwardDlight( void ) {

 		backEnd.pc.c_totalIndexes += tess.numIndexes;
 		backEnd.pc.c_dlightIndexes += tess.numIndexes;
+		backEnd.pc.c_dlightVertexes += tess.numVertexes;
 	}
 }

--- a/code/renderergl2/tr_shade_calc.c
+++ b/code/renderergl2/tr_shade_calc.c
@ -456,10 +456,10 @@ static void Autosprite2Deform( void ) {
 	vec3_t	forward;

 	if ( tess.numVertexes & 3 ) {
-		ri.Printf( PRINT_WARNING, "Autosprite2 shader %s had odd vertex count", tess.shader->name );
+		ri.Printf( PRINT_WARNING, "Autosprite2 shader %s had odd vertex count\n", tess.shader->name );
 	}
 	if ( tess.numIndexes != ( tess.numVertexes >> 2 ) * 6 ) {
-		ri.Printf( PRINT_WARNING, "Autosprite2 shader %s had odd index count", tess.shader->name );
+		ri.Printf( PRINT_WARNING, "Autosprite2 shader %s had odd index count\n", tess.shader->name );
 	}

 	if ( backEnd.currentEntity != &tr.worldEntity ) {
--- a/code/renderergl2/tr_shader.c
+++ b/code/renderergl2/tr_shader.c
@ -3018,7 +3018,7 @@ static char *FindShaderInShaderText( const char *shadername ) {
 		}
 		else {
 			// skip the definition
-			SkipBracedSection( &p );
+			SkipBracedSection( &p, 0 );
 		}
 	}

@ -3542,6 +3542,8 @@ static void ScanAndLoadShaderFiles( void )
 	int i;
 	char *oldp, *token, *hashMem, *textEnd;
 	int shaderTextHashTableSizes[MAX_SHADERTEXT_HASH], hash, size;
+	char shaderName[MAX_QPATH];
+	int shaderLine;

 	long sum = 0, summand;
 	// scan for shader files
@ -3585,26 +3587,40 @@ static void ScanAndLoadShaderFiles( void )
 		
 		// Do a simple check on the shader structure in that file to make sure one bad shader file cannot fuck up all other shaders.
 		p = buffers[i];
+		COM_BeginParseSession(filename);
 		while(1)
 		{
 			token = COM_ParseExt(&p, qtrue);
 			
 			if(!*token)
 				break;
-			
-			oldp = p;
-			
+
+			Q_strncpyz(shaderName, token, sizeof(shaderName));
+			shaderLine = COM_GetCurrentParseLine();
+
 			token = COM_ParseExt(&p, qtrue);
-			if(token[0] != '{' && token[1] != '\0')
+			if(token[0] != '{' || token[1] != '\0')
 			{
-				ri.Printf(PRINT_WARNING, "WARNING: Bad shader file %s has incorrect syntax.\n", filename);
+				ri.Printf(PRINT_WARNING, "WARNING: Ignoring shader file %s. Shader \"%s\" on line %d missing opening brace",
+							filename, shaderName, shaderLine);
+				if (token[0])
+				{
+					ri.Printf(PRINT_WARNING, " (found \"%s\" on line %d)", token, COM_GetCurrentParseLine());
+				}
+				ri.Printf(PRINT_WARNING, ".\n");
 				ri.FS_FreeFile(buffers[i]);
 				buffers[i] = NULL;
 				break;
 			}

-			SkipBracedSection(&oldp);
-			p = oldp;
+			if(!SkipBracedSection(&p, 1))
+			{
+				ri.Printf(PRINT_WARNING, "WARNING: Ignoring shader file %s. Shader \"%s\" on line %d missing closing brace.\n",
+							filename, shaderName, shaderLine);
+				ri.FS_FreeFile(buffers[i]);
+				buffers[i] = NULL;
+				break;
+			}
 		}
 			
 		
@ -3648,7 +3664,7 @@ static void ScanAndLoadShaderFiles( void )
 		hash = generateHashValue(token, MAX_SHADERTEXT_HASH);
 		shaderTextHashTableSizes[hash]++;
 		size++;
-		SkipBracedSection(&p);
+		SkipBracedSection(&p, 0);
 	}

 	size += MAX_SHADERTEXT_HASH;
@ -3674,7 +3690,7 @@ static void ScanAndLoadShaderFiles( void )
 		hash = generateHashValue(token, MAX_SHADERTEXT_HASH);
 		shaderTextHashTable[hash][shaderTextHashTableSizes[hash]++] = oldp;

-		SkipBracedSection(&p);
+		SkipBracedSection(&p, 0);
 	}

 	return;
--- a/code/renderergl2/tr_surface.c
+++ b/code/renderergl2/tr_surface.c
@ -1515,6 +1515,7 @@ static void RB_SurfaceAxis( void ) {
 	// FIXME: implement this
 #if 0
 	GL_Bind( tr.whiteImage );
+	GL_State( GLS_DEFAULT );
 	qglLineWidth( 3 );
 	qglBegin( GL_LINES );
 	qglColor3f( 1,0,0 );
@ -1561,7 +1562,6 @@ static void RB_SurfaceEntity( surfaceType_t *surfType ) {
 		RB_SurfaceAxis();
 		break;
 	}
-	return;
 }

 static void RB_SurfaceBad( surfaceType_t *surfType ) {
--- a/code/renderergl2/tr_world.c
+++ b/code/renderergl2/tr_world.c
@ -36,6 +36,10 @@ static qboolean	R_CullSurface( msurface_t *surf ) {
 		return qfalse;
 	}

+	if ( *surf->data == SF_GRID && r_nocurves->integer ) {
+		return qtrue;
+	}
+
 	if (surf->cullinfo.type & CULLINFO_PLANE)
 	{
 		// Only true for SF_FACE, so treat like its own function
@ -157,7 +161,6 @@ static int R_DlightSurface( msurface_t *surf, int dlightBits ) {
 	
 	if ( surf->cullinfo.type & CULLINFO_PLANE )
 	{
-		int i;
 		for ( i = 0 ; i < tr.refdef.num_dlights ; i++ ) {
 			if ( ! ( dlightBits & ( 1 << i ) ) ) {
 				continue;
@ -219,6 +222,8 @@ static int R_DlightSurface( msurface_t *surf, int dlightBits ) {

 	if ( dlightBits ) {
 		tr.pc.c_dlightSurfaces++;
+	} else {
+		tr.pc.c_dlightSurfacesCulled++;
 	}

 	return dlightBits;
@ -238,7 +243,6 @@ static int R_PshadowSurface( msurface_t *surf, int pshadowBits ) {
 	
 	if ( surf->cullinfo.type & CULLINFO_PLANE )
 	{
-		int i;
 		for ( i = 0 ; i < tr.refdef.num_pshadows ; i++ ) {
 			if ( ! ( pshadowBits & ( 1 << i ) ) ) {
 				continue;
@ -554,7 +558,7 @@ static void R_RecursiveWorldNode( mnode_t *node, int planeBits, int dlightBits,
 		}

 		// add merged and unmerged surfaces
-		if (tr.world->viewSurfaces)
+		if (tr.world->viewSurfaces && !r_nocurves->integer)
 			view = tr.world->viewSurfaces + node->firstmarksurface;
 		else
 			view = tr.world->marksurfaces + node->firstmarksurface;
--- a/code/sdl/sdl_glimp.c
+++ b/code/sdl/sdl_glimp.c
@ -820,7 +820,7 @@ void GLimp_EndFrame( void )

 			// SDL_WM_ToggleFullScreen didn't work, so do it the slow way
 			if( !sdlToggled )
-				ri.Cmd_ExecuteText(EXEC_APPEND, "vid_restart");
+				ri.Cmd_ExecuteText(EXEC_APPEND, "vid_restart\n");

 			ri.IN_Restart( );
 		}
--- a/code/sdl/sdl_input.c
+++ b/code/sdl/sdl_input.c
@ -790,15 +790,15 @@ static void IN_ProcessEvents( void )
 			case SDL_MOUSEBUTTONDOWN:
 			case SDL_MOUSEBUTTONUP:
 				{
-					unsigned char b;
+					int b;
 					switch( e.button.button )
 					{
-						case 1:   b = K_MOUSE1;     break;
-						case 2:   b = K_MOUSE3;     break;
-						case 3:   b = K_MOUSE2;     break;
-						case 4:   b = K_MOUSE4;     break;
-						case 5:   b = K_MOUSE5;     break;
-						default:  b = K_AUX1 + ( e.button.button - 8 ) % 16; break;
+						case SDL_BUTTON_LEFT:   b = K_MOUSE1;     break;
+						case SDL_BUTTON_MIDDLE: b = K_MOUSE3;     break;
+						case SDL_BUTTON_RIGHT:  b = K_MOUSE2;     break;
+						case SDL_BUTTON_X1:     b = K_MOUSE4;     break;
+						case SDL_BUTTON_X2:     b = K_MOUSE5;     break;
+						default:                b = K_AUX1 + ( e.button.button - SDL_BUTTON_X2 + 1 ) % 16; break;
 					}
 					Com_QueueEvent( 0, SE_KEY, b,
 						( e.type == SDL_MOUSEBUTTONDOWN ? qtrue : qfalse ), 0, NULL );
@ -885,7 +885,7 @@ void IN_Frame( void )
 	if( ( vidRestartTime != 0 ) && ( vidRestartTime < Sys_Milliseconds( ) ) )
 	{
 		vidRestartTime = 0;
-		Cbuf_AddText( "vid_restart" );
+		Cbuf_AddText( "vid_restart\n" );
 	}
 }

--- a/code/server/server.h
+++ b/code/server/server.h
@ -78,7 +78,6 @@ typedef struct {
 	int				snapshotCounter;	// incremented for each snapshot built
 	int				timeResidual;		// <= 1000 / sv_frame->value
 	int				nextFrameTime;		// when time > nextFrameTime, process world
-	struct cmodel_s	*models[MAX_MODELS];
 	char			*configstrings[MAX_CONFIGSTRINGS];
 	svEntity_t		svEntities[MAX_GENTITIES];

@ -308,6 +307,28 @@ extern	cvar_t	*sv_voip;
 //
 // sv_main.c
 //
+typedef struct leakyBucket_s leakyBucket_t;
+struct leakyBucket_s {
+	netadrtype_t	type;
+
+	union {
+		byte	_4[4];
+		byte	_6[16];
+	} ipv;
+
+	int						lastTime;
+	signed char		burst;
+
+	long					hash;
+
+	leakyBucket_t *prev, *next;
+};
+
+extern leakyBucket_t outboundLeakyBucket;
+
+qboolean SVC_RateLimit( leakyBucket_t *bucket, int burst, int period );
+qboolean SVC_RateLimitAddress( netadr_t from, int burst, int period );
+
 void SV_FinalMessage (char *message);
 void QDECL SV_SendServerCommand( client_t *cl, const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));

--- a/code/server/sv_client.c
+++ b/code/server/sv_client.c
@ -67,6 +67,20 @@ void SV_GetChallenge(netadr_t from)
 		return;
 	}

+	// Prevent using getchallenge as an amplifier
+	if ( SVC_RateLimitAddress( from, 10, 1000 ) ) {
+		Com_DPrintf( "SV_GetChallenge: rate limit from %s exceeded, dropping request\n",
+			NET_AdrToString( from ) );
+		return;
+	}
+
+	// Allow getchallenge to be DoSed relatively easily, but prevent
+	// excess outbound bandwidth usage when being flooded inbound
+	if ( SVC_RateLimit( &outboundLeakyBucket, 10, 100 ) ) {
+		Com_DPrintf( "SV_GetChallenge: rate limit exceeded, dropping request\n" );
+		return;
+	}
+
 	gameName = Cmd_Argv(2);

 #ifdef LEGACY_PROTOCOL
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
@ -252,6 +252,9 @@ void SV_MasterHeartbeat(const char *message)
 	if ( svs.time < svs.nextHeartbeatTime )
 		return;

+	if ( !Q_stricmp( com_gamename->string, LEGACY_MASTER_GAMENAME ) )
+		message = LEGACY_HEARTBEAT_FOR_MASTER;
+
 	svs.nextHeartbeatTime = svs.time + HEARTBEAT_MSEC;

 	// send to group masters
@ -354,30 +357,13 @@ CONNECTIONLESS COMMANDS
 ==============================================================================
 */

-typedef struct leakyBucket_s leakyBucket_t;
-struct leakyBucket_s {
-	netadrtype_t	type;
-
-	union {
-		byte	_4[4];
-		byte	_6[16];
-	} ipv;
-
-	int						lastTime;
-	signed char		burst;
-
-	long					hash;
-
-	leakyBucket_t *prev, *next;
-};
-
 // This is deliberately quite large to make it more of an effort to DoS
 #define MAX_BUCKETS			16384
 #define MAX_HASHES			1024

 static leakyBucket_t buckets[ MAX_BUCKETS ];
 static leakyBucket_t *bucketHashes[ MAX_HASHES ];
-static leakyBucket_t outboundLeakyBucket;
+leakyBucket_t outboundLeakyBucket;

 /*
 ================
@ -494,7 +480,7 @@ static leakyBucket_t *SVC_BucketForAddress( netadr_t address, int burst, int per
 SVC_RateLimit
 ================
 */
-static qboolean SVC_RateLimit( leakyBucket_t *bucket, int burst, int period ) {
+qboolean SVC_RateLimit( leakyBucket_t *bucket, int burst, int period ) {
 	if ( bucket != NULL ) {
 		int now = Sys_Milliseconds();
 		int interval = now - bucket->lastTime;
@ -526,7 +512,7 @@ SVC_RateLimitAddress
 Rate limit for a particular address
 ================
 */
-static qboolean SVC_RateLimitAddress( netadr_t from, int burst, int period ) {
+qboolean SVC_RateLimitAddress( netadr_t from, int burst, int period ) {
 	leakyBucket_t *bucket = SVC_BucketForAddress( from, burst, period );

 	return SVC_RateLimit( bucket, burst, period );
--- a/code/server/sv_world.c
+++ b/code/server/sv_world.c
@ -257,7 +257,6 @@ void SV_LinkEntity( sharedEntity_t *gEnt ) {
 	if ( gEnt->r.bmodel && (angles[0] || angles[1] || angles[2]) ) {
 		// expand for rotation
 		float		max;
-		int			i;

 		max = RadiusFromBounds( gEnt->r.mins, gEnt->r.maxs );
 		for (i=0 ; i<3 ; i++) {
--- a/code/sys/con_win32.c
+++ b/code/sys/con_win32.c
@ -37,6 +37,7 @@ static CONSOLE_CURSOR_INFO qconsole_orig_cursorinfo;
 // cmd history
 static char qconsole_history[ QCONSOLE_HISTORY ][ MAX_EDIT_LINE ];
 static int qconsole_history_pos = -1;
+static int qconsole_history_lines = 0;
 static int qconsole_history_oldest = 0;

 // current edit buffer
@ -107,6 +108,9 @@ static void CON_HistAdd( void )
 	Q_strncpyz( qconsole_history[ qconsole_history_oldest ], qconsole_line,
 		sizeof( qconsole_history[ qconsole_history_oldest ] ) );

+	if( qconsole_history_lines < QCONSOLE_HISTORY )
+		qconsole_history_lines++;
+
 	if( qconsole_history_oldest >= QCONSOLE_HISTORY - 1 )
 		qconsole_history_oldest = 0;
 	else
@ -128,7 +132,7 @@ static void CON_HistPrev( void )
 		( QCONSOLE_HISTORY - 1 ) : ( qconsole_history_pos - 1 );

 	// don' t allow looping through history
-	if( pos == qconsole_history_oldest )
+	if( pos == qconsole_history_oldest || pos >= qconsole_history_lines )
 		return;

 	qconsole_history_pos = pos;
@ -146,12 +150,17 @@ static void CON_HistNext( void )
 {
 	int pos;

+	// don' t allow looping through history
+	if( qconsole_history_pos == qconsole_history_oldest )
+		return;
+
 	pos = ( qconsole_history_pos >= QCONSOLE_HISTORY - 1 ) ?
 		0 : ( qconsole_history_pos + 1 ); 

 	// clear the edit buffer if they try to advance to a future command
 	if( pos == qconsole_history_oldest )
 	{
+		qconsole_history_pos = pos;
 		qconsole_line[ 0 ] = '\0';
 		qconsole_linelen = 0;
 		return;
--- a/code/sys/sys_unix.c
+++ b/code/sys/sys_unix.c
@ -123,7 +123,7 @@ qboolean Sys_RandomBytes( byte *string, int len )
 	if( !fp )
 		return qfalse;

-	if( !fread( string, sizeof( byte ), len, fp ) )
+	if( fread( string, sizeof( byte ), len, fp ) != len )
 	{
 		fclose( fp );
 		return qfalse;
--- a/code/tools/asm/q3asm.c
+++ b/code/tools/asm/q3asm.c
@ -250,7 +250,6 @@ static void hashtable_init (hashtable_t *H, int buckets)
 {
  H->buckets = buckets;
  H->table = calloc(H->buckets, sizeof(*(H->table)));
-  return;
 }

 static hashtable_t *hashtable_new (int buckets)
@ -285,7 +284,6 @@ static void hashtable_add (hashtable_t *H, int hashvalue, void *datum)
    }
  hc->data = datum;
  hc->next = 0;
-  return;
 }

 static hashchain_t *hashtable_get (hashtable_t *H, int hashvalue)
--- a/code/tools/lcc/cpp/cpp.c
+++ b/code/tools/lcc/cpp/cpp.c
@ -250,7 +250,6 @@ control(Tokenrow *trp)
 		break;
 	}
 	setempty(trp);
-	return;
 }

 void *
--- a/code/tools/lcc/cpp/include.c
+++ b/code/tools/lcc/cpp/include.c
@ -108,7 +108,6 @@ doinclude(Tokenrow *trp)
 	return;
 syntax:
 	error(ERROR, "Syntax error in #include");
-	return;
 }

 /*
--- a/code/tools/lcc/cpp/macro.c
+++ b/code/tools/lcc/cpp/macro.c
@ -218,7 +218,6 @@ expand(Tokenrow *trp, Nlist *np)
 	insertrow(trp, ntokc, &ntr);
 	trp->tp -= rowlen(&ntr);
 	dofree(ntr.bp);
-	return;
 }	

 /*
--- a/code/ui/ui_main.c
+++ b/code/ui/ui_main.c
@ -118,7 +118,7 @@ static void UI_StartServerRefresh(qboolean full);
 static void UI_StopServerRefresh( void );
 static void UI_DoServerRefresh( void );
 static void UI_FeederSelection(float feederID, int index);
-static void UI_BuildServerDisplayList(qboolean force);
+static void UI_BuildServerDisplayList(int force);
 static void UI_BuildServerStatus(qboolean force);
 static void UI_BuildFindPlayerList(qboolean force);
 static int QDECL UI_ServersQsortCompare( const void *arg1, const void *arg2 );
@ -3762,7 +3762,7 @@ static void UI_BinaryServerInsertion(int num) {
 UI_BuildServerDisplayList
 ==================
 */
-static void UI_BuildServerDisplayList(qboolean force) {
+static void UI_BuildServerDisplayList(int force) {
 	int i, count, clients, maxClients, ping, game, len, visible;
 	char info[MAX_STRING_CHARS];
 //	qboolean startRefresh = qtrue; TTimo: unused
--- a/code/ui/ui_players.c
+++ b/code/ui/ui_players.c
@ -714,10 +714,10 @@ void UI_DrawPlayer( float x, float y, float w, float h, playerInfo_t *pi, int ti

 	dp_realtime = time;

-	if ( pi->pendingWeapon != -1 && dp_realtime > pi->weaponTimer ) {
+	if ( pi->pendingWeapon != WP_NUM_WEAPONS && dp_realtime > pi->weaponTimer ) {
 		pi->weapon = pi->pendingWeapon;
 		pi->lastWeapon = pi->pendingWeapon;
-		pi->pendingWeapon = -1;
+		pi->pendingWeapon = WP_NUM_WEAPONS;
 		pi->weaponTimer = 0;
 		if( pi->currentWeapon != pi->weapon ) {
 			trap_S_StartLocalSound( weaponChangeSound, CHAN_LOCAL );
@ -1254,7 +1254,7 @@ void UI_PlayerInfo_SetModel( playerInfo_t *pi, const char *model, const char *he
 	pi->weapon = WP_MACHINEGUN;
 	pi->currentWeapon = pi->weapon;
 	pi->lastWeapon = pi->weapon;
-	pi->pendingWeapon = -1;
+	pi->pendingWeapon = WP_NUM_WEAPONS;
 	pi->weaponTimer = 0;
 	pi->chat = qfalse;
 	pi->newModel = qtrue;
@ -1293,11 +1293,11 @@ void UI_PlayerInfo_SetInfo( playerInfo_t *pi, int legsAnim, int torsoAnim, vec3_
 		pi->torso.yawAngle = viewAngles[YAW];
 		pi->torso.yawing = qfalse;

-		if ( weaponNumber != -1 ) {
+		if ( weaponNumber != WP_NUM_WEAPONS ) {
 			pi->weapon = weaponNumber;
 			pi->currentWeapon = weaponNumber;
 			pi->lastWeapon = weaponNumber;
-			pi->pendingWeapon = -1;
+			pi->pendingWeapon = WP_NUM_WEAPONS;
 			pi->weaponTimer = 0;
 			UI_PlayerInfo_SetWeapon( pi, pi->weapon );
 		}
@ -1306,8 +1306,8 @@ void UI_PlayerInfo_SetInfo( playerInfo_t *pi, int legsAnim, int torsoAnim, vec3_
 	}

 	// weapon
-	if ( weaponNumber == -1 ) {
-		pi->pendingWeapon = -1;
+	if ( weaponNumber == WP_NUM_WEAPONS ) {
+		pi->pendingWeapon = WP_NUM_WEAPONS;
 		pi->weaponTimer = 0;
 	}
 	else if ( weaponNumber != WP_NONE ) {
--- a/code/zlib/inffast.c
+++ b/code/zlib/inffast.c
@ -298,7 +298,6 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                                 257 + (end - out) : 257 - (out - end));
    state->hold = hold;
    state->bits = bits;
-    return;
 }

 /*
--- a/jenkins-ci-build.sh
+++ b/jenkins-ci-build.sh
@ -1,6 +1,9 @@
 #!/bin/bash

+UNAME=`uname`
 MASTER_DIR=`dirname $0`
+BUILD_DEFAULT="release"
+
 cd ${MASTER_DIR}

 if [ "$OPTIONS" = "all_options" ];
@ -9,7 +12,20 @@ then
    export USE_FREETYPE=1
 fi

-CORES=`awk '/^processor/ { N++} END { print N }' /proc/cpuinfo`
+if [ "$UNAME" == "Darwin" ]; then
+	CORES=`sysctl -n hw.ncpu`
+elif [ "$UNAME" == "Linux" ]; then
+	CORES=`awk '/^processor/ { N++} END { print N }' /proc/cpuinfo`
+fi
+
+echo "platform      : ${UNAME}"
+echo "cores         : ${CORES}"
+if [ "${BUILD_TYPE}" == "" ]; then
+	BUILD_TYPE="${BUILD_DEFAULT}"
+	echo "build type    : defaulting to ${BUILD_TYPE}"
+else
+	echo "build type    : ${BUILD_TYPE}"
+fi

 make -j${CORES} distclean ${BUILD_TYPE}

--- a/make-macosx-app.sh
+++ b/make-macosx-app.sh
@ -0,0 +1,375 @@
+#!/bin/bash
+
+# Let's make the user give us a target to work with.
+# architecture is assumed universal if not specified, and is optional.
+# if arch is defined, it we will store the .app bundle in the target arch build directory
+if [ $# == 0 ] || [ $# -gt 2 ]; then
+	echo "Usage:   $0 target <arch>"
+	echo "Example: $0 release x86"
+	echo "Valid targets are:"
+	echo " release"
+	echo " debug"
+	echo
+	echo "Optional architectures are:"
+	echo " x86"
+	echo " x86_64"
+	echo " ppc"
+	echo
+	exit 1
+fi
+
+# validate target name
+if [ "$1" == "release" ]; then
+	TARGET_NAME="release"
+elif [ "$1" == "debug" ]; then
+	TARGET_NAME="debug"
+else
+	echo "Invalid target: $1"
+	echo "Valid targets are:"
+	echo " release"
+	echo " debug"
+	exit 1
+fi
+
+CURRENT_ARCH=""
+
+# validate the architecture if it was specified
+if [ "$2" != "" ]; then
+	if [ "$2" == "x86" ]; then
+		CURRENT_ARCH="x86"
+	elif [ "$2" == "x86_64" ]; then
+		CURRENT_ARCH="x86_64"
+	elif [ "$2" == "ppc" ]; then
+		CURRENT_ARCH="ppc"
+	else
+		echo "Invalid architecture: $1"
+		echo "Valid architectures are:"
+		echo " x86"
+		echo " x86_64"
+		echo " ppc"
+		echo
+		exit 1
+	fi
+fi
+
+# symlinkArch() creates a symlink with the architecture suffix.
+# meant for universal binaries, but also handles the way this script generates
+# application bundles for a single architecture as well.
+function symlinkArch()
+{
+    EXT="dylib"
+    SEP="${3}"
+    SRCFILE="${1}"
+    DSTFILE="${2}${SEP}"
+    DSTPATH="${4}"
+
+    if [ ! -e "${DSTPATH}/${SRCFILE}.${EXT}" ]; then
+        echo "**** ERROR: missing ${SRCFILE}.${EXT} from ${MACOS}"
+        exit 1
+    fi
+
+    if [ ! -d "${DSTPATH}" ]; then
+        echo "**** ERROR: path not found ${DSTPATH}"
+        exit 1
+    fi
+
+    pushd "${DSTPATH}" > /dev/null
+
+    IS32=`file "${SRCFILE}.${EXT}" | grep "i386"`
+    IS64=`file "${SRCFILE}.${EXT}" | grep "x86_64"`
+    ISPPC=`file "${SRCFILE}.${EXT}" | grep "ppc"`
+
+    if [ "${IS32}" != "" ]; then
+        if [ ! -L "${DSTFILE}x86.${EXT}" ]; then
+            ln -s "${SRCFILE}.${EXT}" "${DSTFILE}x86.${EXT}"
+        fi
+    elif [ -L "${DSTFILE}x86.${EXT}" ]; then
+        rm "${DSTFILE}x86.${EXT}"
+    fi
+
+    if [ "${IS64}" != "" ]; then
+        if [ ! -L "${DSTFILE}x86_64.${EXT}" ]; then
+            ln -s "${SRCFILE}.${EXT}" "${DSTFILE}x86_64.${EXT}"
+        fi
+    elif [ -L "${DSTFILE}x86_64.${EXT}" ]; then
+        rm "${DSTFILE}x86_64.${EXT}"
+    fi
+
+    if [ "${ISPPC}" != "" ]; then
+        if [ ! -L "${DSTFILE}ppc.${EXT}" ]; then
+            ln -s "${SRCFILE}.${EXT}" "${DSTFILE}ppc.${EXT}"
+        fi
+    elif [ -L "${DSTFILE}ppc.${EXT}" ]; then
+        rm "${DSTFILE}ppc.${EXT}"
+    fi
+
+    popd > /dev/null
+}
+
+SEARCH_ARCHS="																	\
+	x86																			\
+	x86_64																		\
+	ppc																			\
+"
+
+HAS_LIPO=`command -v lipo`
+HAS_CP=`command -v cp`
+
+# if lipo is not available, we cannot make a universal binary, print a warning
+if [ ! -x "${HAS_LIPO}" ] && [ "${CURRENT_ARCH}" == "" ]; then
+	CURRENT_ARCH=`uname -m`
+	if [ "${CURRENT_ARCH}" == "i386" ]; then CURRENT_ARCH="x86"; fi
+	echo "$0 cannot make a universal binary, falling back to architecture ${CURRENT_ARCH}"
+fi
+
+# if the optional arch parameter is used, replace SEARCH_ARCHS to only work with one
+if [ "${CURRENT_ARCH}" != "" ]; then
+	SEARCH_ARCHS="${CURRENT_ARCH}"
+fi
+
+AVAILABLE_ARCHS=""
+
+IOQ3_VERSION=`grep '^VERSION=' Makefile | sed -e 's/.*=\(.*\)/\1/'`
+IOQ3_CLIENT_ARCHS=""
+IOQ3_SERVER_ARCHS=""
+IOQ3_RENDERER_GL1_ARCHS=""
+IOQ3_RENDERER_GL2_ARCHS=""
+IOQ3_CGAME_ARCHS=""
+IOQ3_GAME_ARCHS=""
+IOQ3_UI_ARCHS=""
+IOQ3_MP_CGAME_ARCHS=""
+IOQ3_MP_GAME_ARCHS=""
+IOQ3_MP_UI_ARCHS=""
+
+BASEDIR="baseq3"
+MISSIONPACKDIR="missionpack"
+
+CGAME="cgame"
+GAME="qagame"
+UI="ui"
+
+RENDERER_OPENGL="renderer_opengl"
+
+DEDICATED_NAME="ioq3ded"
+
+CGAME_NAME="${CGAME}.dylib"
+GAME_NAME="${GAME}.dylib"
+UI_NAME="${UI}.dylib"
+
+RENDERER_OPENGL1_NAME="${RENDERER_OPENGL}1.dylib"
+RENDERER_OPENGL2_NAME="${RENDERER_OPENGL}2.dylib"
+
+ICNSDIR="misc"
+ICNS="quake3_flat.icns"
+PKGINFO="APPLIOQ3"
+
+OBJROOT="build"
+#BUILT_PRODUCTS_DIR="${OBJROOT}/${TARGET_NAME}-darwin-${CURRENT_ARCH}"
+PRODUCT_NAME="ioquake3"
+WRAPPER_EXTENSION="app"
+WRAPPER_NAME="${PRODUCT_NAME}.${WRAPPER_EXTENSION}"
+CONTENTS_FOLDER_PATH="${WRAPPER_NAME}/Contents"
+UNLOCALIZED_RESOURCES_FOLDER_PATH="${CONTENTS_FOLDER_PATH}/Resources"
+EXECUTABLE_FOLDER_PATH="${CONTENTS_FOLDER_PATH}/MacOS"
+EXECUTABLE_NAME="${PRODUCT_NAME}"
+
+# loop through the architectures to build string lists for each universal binary
+for ARCH in $SEARCH_ARCHS; do
+	CURRENT_ARCH=${ARCH}
+	BUILT_PRODUCTS_DIR="${OBJROOT}/${TARGET_NAME}-darwin-${CURRENT_ARCH}"
+	IOQ3_CLIENT="${EXECUTABLE_NAME}.${CURRENT_ARCH}"
+	IOQ3_SERVER="${DEDICATED_NAME}.${CURRENT_ARCH}"
+	IOQ3_RENDERER_GL1="${RENDERER_OPENGL}1_${CURRENT_ARCH}.dylib"
+	IOQ3_RENDERER_GL2="${RENDERER_OPENGL}2_${CURRENT_ARCH}.dylib"
+	IOQ3_CGAME="${CGAME}${CURRENT_ARCH}.dylib"
+	IOQ3_GAME="${GAME}${CURRENT_ARCH}.dylib"
+	IOQ3_UI="${UI}${CURRENT_ARCH}.dylib"
+
+	if [ ! -d ${BUILT_PRODUCTS_DIR} ]; then
+		CURRENT_ARCH=""
+		BUILT_PRODUCTS_DIR=""
+		continue
+	fi
+
+	# executables
+	if [ -e ${BUILT_PRODUCTS_DIR}/${IOQ3_CLIENT} ]; then
+		IOQ3_CLIENT_ARCHS="${BUILT_PRODUCTS_DIR}/${IOQ3_CLIENT} ${IOQ3_CLIENT_ARCHS}"
+		VALID_ARCHS="${ARCH} ${VALID_ARCHS}"
+	else
+		continue
+	fi
+	if [ -e ${BUILT_PRODUCTS_DIR}/${IOQ3_SERVER} ]; then
+		IOQ3_SERVER_ARCHS="${BUILT_PRODUCTS_DIR}/${IOQ3_SERVER} ${IOQ3_SERVER_ARCHS}"
+	fi
+
+	# renderers
+	if [ -e ${BUILT_PRODUCTS_DIR}/${IOQ3_RENDERER_GL1} ]; then
+		IOQ3_RENDERER_GL1_ARCHS="${BUILT_PRODUCTS_DIR}/${IOQ3_RENDERER_GL1} ${IOQ3_RENDERER_GL1_ARCHS}"
+	fi
+	if [ -e ${BUILT_PRODUCTS_DIR}/${IOQ3_RENDERER_GL2} ]; then
+		IOQ3_RENDERER_GL2_ARCHS="${BUILT_PRODUCTS_DIR}/${IOQ3_RENDERER_GL2} ${IOQ3_RENDERER_GL2_ARCHS}"
+	fi
+
+	# game
+	if [ -e ${BUILT_PRODUCTS_DIR}/${BASEDIR}/${IOQ3_CGAME} ]; then
+		IOQ3_CGAME_ARCHS="${BUILT_PRODUCTS_DIR}/${BASEDIR}/${IOQ3_CGAME} ${IOQ3_CGAME_ARCHS}"
+	fi
+	if [ -e ${BUILT_PRODUCTS_DIR}/${BASEDIR}/${IOQ3_GAME} ]; then
+		IOQ3_GAME_ARCHS="${BUILT_PRODUCTS_DIR}/${BASEDIR}/${IOQ3_GAME} ${IOQ3_GAME_ARCHS}"
+	fi
+	if [ -e ${BUILT_PRODUCTS_DIR}/${BASEDIR}/${IOQ3_UI} ]; then
+		IOQ3_UI_ARCHS="${BUILT_PRODUCTS_DIR}/${BASEDIR}/${IOQ3_UI} ${IOQ3_UI_ARCHS}"
+	fi
+	# missionpack
+	if [ -e ${BUILT_PRODUCTS_DIR}/${BASEDIR}/${IOQ3_MP_CGAME} ]; then
+		IOQ3_MP_CGAME_ARCHS="${BUILT_PRODUCTS_DIR}/${MISSIONPACKDIR}/${IOQ3_CGAME} ${IOQ3_MP_CGAME_ARCHS}"
+	fi
+	if [ -e ${BUILT_PRODUCTS_DIR}/${BASEDIR}/${IOQ3_MP_GAME} ]; then
+		IOQ3_MP_GAME_ARCHS="${BUILT_PRODUCTS_DIR}/${MISSIONPACKDIR}/${IOQ3_GAME} ${IOQ3_MP_GAME_ARCHS}"
+	fi
+	if [ -e ${BUILT_PRODUCTS_DIR}/${BASEDIR}/${IOQ3_MP_UI} ]; then
+		IOQ3_MP_UI_ARCHS="${BUILT_PRODUCTS_DIR}/${MISSIONPACKDIR}/${IOQ3_UI} ${IOQ3_MP_UI_ARCHS}"
+	fi
+
+	#echo "valid arch: ${ARCH}"
+done
+
+# final preparations and checks before attempting to make the application bundle
+cd `dirname $0`
+
+if [ ! -f Makefile ]; then
+	echo "$0 must be run from the ioquake3 build directory"
+	exit 1
+fi
+
+if [ "${IOQ3_CLIENT_ARCHS}" == "" ]; then
+	echo "$0: no ioquake3 binary architectures were found for target '${TARGET_NAME}'"
+	exit 1
+fi
+
+# set the final application bundle output directory
+if [ "${2}" == "" ]; then
+	BUILT_PRODUCTS_DIR="${OBJROOT}/${TARGET_NAME}-darwin-universal"
+	if [ ! -d ${BUILT_PRODUCTS_DIR} ]; then
+		mkdir -p ${BUILT_PRODUCTS_DIR} || exit 1;
+	fi
+else
+	BUILT_PRODUCTS_DIR="${OBJROOT}/${TARGET_NAME}-darwin-${CURRENT_ARCH}"
+fi
+
+BUNDLEBINDIR="${BUILT_PRODUCTS_DIR}/${EXECUTABLE_FOLDER_PATH}"
+
+
+# here we go
+echo "Creating bundle '${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}'"
+echo "with architectures:"
+for ARCH in ${VALID_ARCHS}; do
+	echo " ${ARCH}"
+done
+echo ""
+
+# make the application bundle directories
+if [ ! -d ${BUILT_PRODUCTS_DIR}/${EXECUTABLE_FOLDER_PATH}/$BASEDIR ]; then
+	mkdir -p ${BUILT_PRODUCTS_DIR}/${EXECUTABLE_FOLDER_PATH}/$BASEDIR || exit 1;
+fi
+if [ ! -d ${BUILT_PRODUCTS_DIR}/${EXECUTABLE_FOLDER_PATH}/$MISSIONPACKDIR ]; then
+	mkdir -p ${BUILT_PRODUCTS_DIR}/${EXECUTABLE_FOLDER_PATH}/$MISSIONPACKDIR || exit 1;
+fi
+if [ ! -d ${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH} ]; then
+	mkdir -p ${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH} || exit 1;
+fi
+
+# copy and generate some application bundle resources
+cp code/libs/macosx/*.dylib ${BUILT_PRODUCTS_DIR}/${EXECUTABLE_FOLDER_PATH}
+cp ${ICNSDIR}/${ICNS} ${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/$ICNS || exit 1;
+echo -n ${PKGINFO} > ${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/PkgInfo || exit 1;
+echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
+<plist version=\"1.0\">
+<dict>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleExecutable</key>
+    <string>${EXECUTABLE_NAME}</string>
+    <key>CFBundleIconFile</key>
+    <string>quake3_flat</string>
+    <key>CFBundleIdentifier</key>
+    <string>org.ioquake.${PRODUCT_NAME}</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>${PRODUCT_NAME}</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleShortVersionString</key>
+    <string>${IOQ3_VERSION}</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>CFBundleVersion</key>
+    <string>${IOQ3_VERSION}</string>
+    <key>CGDisableCoalescedUpdates</key>
+    <true/>
+    <key>LSMinimumSystemVersion</key>
+    <string>${MACOSX_DEPLOYMENT_TARGET}</string>
+    <key>NSHumanReadableCopyright</key>
+    <string>QUAKE III ARENA Copyright © 1999-2000 id Software, Inc. All rights reserved.</string>
+    <key>NSPrincipalClass</key>
+    <string>NSApplication</string>
+</dict>
+</plist>
+" > ${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Info.plist
+
+# action takes care of generating universal binaries if lipo is available
+# otherwise, it falls back to using a simple copy, expecting the first item in
+# the second parameter list to be the desired architecture
+function action()
+{
+	COMMAND=""
+
+	if [ -x "${HAS_LIPO}" ]; then
+		COMMAND="${HAS_LIPO} -create -o"
+		$HAS_LIPO -create -o "${1}" ${2} # make sure $2 is treated as a list of files
+	elif [ -x ${HAS_CP} ]; then
+		COMMAND="${HAS_CP}"
+		SRC="${2// */}" # in case there is a list here, use only the first item
+		$HAS_CP "${SRC}" "${1}"
+	else
+		"$0 cannot create an application bundle."
+		exit 1
+	fi
+
+	#echo "${COMMAND}" "${1}" "${2}"
+}
+
+#
+# the meat of universal binary creation
+# destination file names do not have architecture suffix.
+# action will handle merging universal binaries if supported.
+# symlink appropriate architecture names for universal (fat) binary support.
+#
+
+# executables
+action ${BUNDLEBINDIR}/${EXECUTABLE_NAME}				"${IOQ3_CLIENT_ARCHS}"
+action ${BUNDLEBINDIR}/${DEDICATED_NAME}				"${IOQ3_SERVER_ARCHS}"
+
+# renderers
+action ${BUNDLEBINDIR}/${RENDERER_OPENGL1_NAME}		"${IOQ3_RENDERER_GL1_ARCHS}"
+action ${BUNDLEBINDIR}/${RENDERER_OPENGL2_NAME}		"${IOQ3_RENDERER_GL2_ARCHS}"
+symlinkArch "${RENDERER_OPENGL}1" "${RENDERER_OPENGL}1" "_" "${BUNDLEBINDIR}"
+symlinkArch "${RENDERER_OPENGL}2" "${RENDERER_OPENGL}2" "_" "${BUNDLEBINDIR}"
+
+# game
+action ${BUNDLEBINDIR}/${BASEDIR}/${CGAME_NAME}			"${IOQ3_CGAME_ARCHS}"
+action ${BUNDLEBINDIR}/${BASEDIR}/${GAME_NAME}			"${IOQ3_GAME_ARCHS}"
+action ${BUNDLEBINDIR}/${BASEDIR}/${UI_NAME}			"${IOQ3_UI_ARCHS}"
+symlinkArch "${CGAME}"	"${CGAME}"	""	"${BUNDLEBINDIR}/${BASEDIR}"
+symlinkArch "${GAME}"	"${GAME}"	""	"${BUNDLEBINDIR}/${BASEDIR}"
+symlinkArch "${UI}"		"${UI}"		""	"${BUNDLEBINDIR}/${BASEDIR}"
+
+# missionpack
+action ${BUNDLEBINDIR}/${MISSIONPACKDIR}/${CGAME_NAME}	"${IOQ3_MP_CGAME_ARCHS}"
+action ${BUNDLEBINDIR}/${MISSIONPACKDIR}/${GAME_NAME}	"${IOQ3_MP_GAME_ARCHS}"
+action ${BUNDLEBINDIR}/${MISSIONPACKDIR}/${UI_NAME}		"${IOQ3_MP_UI_ARCHS}"
+symlinkArch "${CGAME}"	"${CGAME}"	""	"${BUNDLEBINDIR}/${MISSIONPACKDIR}"
+symlinkArch "${GAME}"	"${GAME}"	""	"${BUNDLEBINDIR}/${MISSIONPACKDIR}"
+symlinkArch "${UI}"		"${UI}"		""	"${BUNDLEBINDIR}/${MISSIONPACKDIR}"
--- a/make-macosx-ub.sh
+++ b/make-macosx-ub.sh
@ -1,54 +1,5 @@
-#!/bin/sh
+#!/bin/bash
 CC=gcc-4.0
-APPBUNDLE=ioquake3.app
-BINARY=ioquake3.ub
-DEDBIN=ioq3ded.ub
-PKGINFO=APPLIOQ3
-ICNS=misc/quake3.icns
-DESTDIR=build/release-darwin-ub
-BASEDIR=baseq3
-MPACKDIR=missionpack
-
-BIN_OBJ="
-	build/release-darwin-x86_64/ioquake3.x86_64
-	build/release-darwin-x86/ioquake3.x86
-	build/release-darwin-ppc/ioquake3.ppc
-"
-BIN_DEDOBJ="
-	build/release-darwin-x86_64/ioq3ded.x86_64
-	build/release-darwin-x86/ioq3ded.x86
-	build/release-darwin-ppc/ioq3ded.ppc
-"
-BASE_OBJ="
-	build/release-darwin-x86_64/$BASEDIR/cgamex86_64.dylib
-	build/release-darwin-x86/$BASEDIR/cgamex86.dylib
-	build/release-darwin-ppc/$BASEDIR/cgameppc.dylib
-	build/release-darwin-x86_64/$BASEDIR/uix86_64.dylib
-	build/release-darwin-x86/$BASEDIR/uix86.dylib
-	build/release-darwin-ppc/$BASEDIR/uippc.dylib
-	build/release-darwin-x86_64/$BASEDIR/qagamex86_64.dylib
-	build/release-darwin-x86/$BASEDIR/qagamex86.dylib
-	build/release-darwin-ppc/$BASEDIR/qagameppc.dylib
-"
-MPACK_OBJ="
-	build/release-darwin-x86_64/$MPACKDIR/cgamex86_64.dylib
-	build/release-darwin-x86/$MPACKDIR/cgamex86.dylib
-	build/release-darwin-ppc/$MPACKDIR/cgameppc.dylib
-	build/release-darwin-x86_64/$MPACKDIR/uix86_64.dylib
-	build/release-darwin-x86/$MPACKDIR/uix86.dylib
-	build/release-darwin-ppc/$MPACKDIR/uippc.dylib
-	build/release-darwin-x86_64/$MPACKDIR/qagamex86_64.dylib
-	build/release-darwin-x86/$MPACKDIR/qagamex86.dylib
-	build/release-darwin-ppc/$MPACKDIR/qagameppc.dylib
-"
-RENDER_OBJ="
-	build/release-darwin-x86_64/renderer_opengl1_x86_64.dylib
-	build/release-darwin-x86/renderer_opengl1_x86.dylib
-	build/release-darwin-ppc/renderer_opengl1_ppc.dylib
-	build/release-darwin-x86_64/renderer_opengl2_x86_64.dylib
-	build/release-darwin-x86/renderer_opengl2_x86.dylib
-	build/release-darwin-ppc/renderer_opengl2_ppc.dylib
-"

 cd `dirname $0`
 if [ ! -f Makefile ]; then
@ -56,12 +7,6 @@ if [ ! -f Makefile ]; then
 	exit 1
 fi

-Q3_VERSION=`grep '^VERSION=' Makefile | sed -e 's/.*=\(.*\)/\1/'`
-
-# We only care if we're >= 10.4, not if we're specifically Tiger.
-# "8" is the Darwin major kernel version.
-TIGERHOST=`uname -r |perl -w -p -e 's/\A(\d+)\..*\Z/$1/; $_ = (($_ >= 8) ? "1" : "0");'`
-
 # we want to use the oldest available SDK for max compatiblity. However 10.4 and older
 # can not build 64bit binaries, making 10.5 the minimum version.   This has been tested 
 # with xcode 3.1 (xcode31_2199_developerdvd.dmg).  It contains the 10.5 SDK and a decent
@ -100,7 +45,7 @@ if [ -z $X86_64_SDK ] || [ -z $X86_SDK ] || [ -z $PPC_SDK ]; then
 ERROR: This script is for building a Universal Binary.  You cannot build
       for a different architecture unless you have the proper Mac OS X SDKs
       installed.  If you just want to to compile for your own system run
-       'make' instead of this script."
+       'make-macosx.sh' instead of this script."
 	exit 1
 fi

@ -118,92 +63,32 @@ WARNING: in order to build a binary with maximum compatibility you must
 sleep 3
 fi

-if [ ! -d $DESTDIR ]; then
-	mkdir -p $DESTDIR
-fi
-
 # For parallel make on multicore boxes...
 NCPU=`sysctl -n hw.ncpu`

 # x86_64 client and server
-if [ -d build/release-release-x86_64 ]; then
-	rm -r build/release-darwin-x86_64
-fi
+#if [ -d build/release-release-x86_64 ]; then
+#	rm -r build/release-darwin-x86_64
+#fi
 (ARCH=x86_64 CC=gcc-4.0 CFLAGS=$X86_64_CFLAGS LDFLAGS=$X86_64_LDFLAGS make -j$NCPU) || exit 1;

 echo;echo

 # x86 client and server
-if [ -d build/release-darwin-x86 ]; then
-	rm -r build/release-darwin-x86
-fi
+#if [ -d build/release-darwin-x86 ]; then
+#	rm -r build/release-darwin-x86
+#fi
 (ARCH=x86 CC=gcc-4.0 CFLAGS=$X86_CFLAGS LDFLAGS=$X86_LDFLAGS make -j$NCPU) || exit 1;

 echo;echo

 # PPC client and server
-if [ -d build/release-darwin-ppc ]; then
-	rm -r build/release-darwin-ppc
-fi
+#if [ -d build/release-darwin-ppc ]; then
+#	rm -r build/release-darwin-ppc
+#fi
 (ARCH=ppc CC=gcc-4.0 CFLAGS=$PPC_CFLAGS LDFLAGS=$PPC_LDFLAGS make -j$NCPU) || exit 1;

-echo;echo
-
-echo "Creating .app bundle $DESTDIR/$APPBUNDLE"
-if [ ! -d $DESTDIR/$APPBUNDLE/Contents/MacOS/$BASEDIR ]; then
-	mkdir -p $DESTDIR/$APPBUNDLE/Contents/MacOS/$BASEDIR || exit 1;
-fi
-if [ ! -d $DESTDIR/$APPBUNDLE/Contents/MacOS/$MPACKDIR ]; then
-	mkdir -p $DESTDIR/$APPBUNDLE/Contents/MacOS/$MPACKDIR || exit 1;
-fi
-if [ ! -d $DESTDIR/$APPBUNDLE/Contents/Resources ]; then
-	mkdir -p $DESTDIR/$APPBUNDLE/Contents/Resources
-fi
-cp $ICNS $DESTDIR/$APPBUNDLE/Contents/Resources/ioquake3.icns || exit 1;
-echo $PKGINFO > $DESTDIR/$APPBUNDLE/Contents/PkgInfo
-echo "
-	<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-	<!DOCTYPE plist
-		PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\"
-		\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-	<plist version=\"1.0\">
-	<dict>
-		<key>CFBundleDevelopmentRegion</key>
-		<string>English</string>
-		<key>CFBundleExecutable</key>
-		<string>$BINARY</string>
-		<key>CFBundleGetInfoString</key>
-		<string>ioquake3 $Q3_VERSION</string>
-		<key>CFBundleIconFile</key>
-		<string>ioquake3.icns</string>
-		<key>CFBundleIdentifier</key>
-		<string>org.ioquake.ioquake3</string>
-		<key>CFBundleInfoDictionaryVersion</key>
-		<string>6.0</string>
-		<key>CFBundleName</key>
-		<string>ioquake3</string>
-		<key>CFBundlePackageType</key>
-		<string>APPL</string>
-		<key>CFBundleShortVersionString</key>
-		<string>$Q3_VERSION</string>
-		<key>CFBundleSignature</key>
-		<string>$PKGINFO</string>
-		<key>CFBundleVersion</key>
-		<string>$Q3_VERSION</string>
-		<key>NSExtensions</key>
-		<dict/>
-		<key>NSPrincipalClass</key>
-		<string>NSApplication</string>
-	</dict>
-	</plist>
-	" > $DESTDIR/$APPBUNDLE/Contents/Info.plist
-
-# Make UB's from previous builds of x86, x86_64 and ppc binaries
-lipo -create -o $DESTDIR/$APPBUNDLE/Contents/MacOS/$BINARY $BIN_OBJ
-lipo -create -o $DESTDIR/$APPBUNDLE/Contents/MacOS/$DEDBIN $BIN_DEDOBJ
-
-cp $RENDER_OBJ $DESTDIR/$APPBUNDLE/Contents/MacOS/
-cp $BASE_OBJ $DESTDIR/$APPBUNDLE/Contents/MacOS/$BASEDIR/
-cp $MPACK_OBJ $DESTDIR/$APPBUNDLE/Contents/MacOS/$MPACKDIR/
-cp code/libs/macosx/*.dylib $DESTDIR/$APPBUNDLE/Contents/MacOS/
+echo

+# use the following shell script to build a universal application bundle
+"./make-macosx-app.sh" release
--- a/make-macosx.sh
+++ b/make-macosx.sh
@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #

 # Let's make the user give us a target build system
@ -30,35 +30,7 @@ if [ -z "$DARWIN_GCC_ARCH" ]; then
 fi

 CC=gcc-4.0
-APPBUNDLE=ioquake3.app
-BINARY=ioquake3.${BUILDARCH}
-DEDBIN=ioq3ded.${BUILDARCH}
-PKGINFO=APPLIOQ3
-ICNS=misc/quake3.icns
 DESTDIR=build/release-darwin-${BUILDARCH}
-BASEDIR=baseq3
-MPACKDIR=missionpack
-
-BIN_OBJ="
-	build/release-darwin-${BUILDARCH}/${BINARY}
-"
-BIN_DEDOBJ="
-	build/release-darwin-${BUILDARCH}/${DEDBIN}
-"
-BASE_OBJ="
-	build/release-darwin-${BUILDARCH}/$BASEDIR/cgame${BUILDARCH}.dylib
-	build/release-darwin-${BUILDARCH}/$BASEDIR/ui${BUILDARCH}.dylib
-	build/release-darwin-${BUILDARCH}/$BASEDIR/qagame${BUILDARCH}.dylib
-"
-MPACK_OBJ="
-	build/release-darwin-${BUILDARCH}/$MPACKDIR/cgame${BUILDARCH}.dylib
-	build/release-darwin-${BUILDARCH}/$MPACKDIR/ui${BUILDARCH}.dylib
-	build/release-darwin-${BUILDARCH}/$MPACKDIR/qagame${BUILDARCH}.dylib
-"
-RENDER_OBJ="
-	build/release-darwin-${BUILDARCH}/renderer_opengl1_${BUILDARCH}.dylib
-	build/release-darwin-${BUILDARCH}/renderer_opengl2_${BUILDARCH}.dylib
-"

 cd `dirname $0`
 if [ ! -f Makefile ]; then
@ -66,12 +38,6 @@ if [ ! -f Makefile ]; then
 	exit 1
 fi

-Q3_VERSION=`grep '^VERSION=' Makefile | sed -e 's/.*=\(.*\)/\1/'`
-
-# We only care if we're >= 10.4, not if we're specifically Tiger.
-# "8" is the Darwin major kernel version.
-TIGERHOST=`uname -r |perl -w -p -e 's/\A(\d+)\..*\Z/$1/; $_ = (($_ >= 8) ? "1" : "0");'`
-
 # we want to use the oldest available SDK for max compatiblity. However 10.4 and older
 # can not build 64bit binaries, making 10.5 the minimum version.   This has been tested 
 # with xcode 3.1 (xcode31_2199_developerdvd.dmg).  It contains the 10.5 SDK and a decent
@ -102,66 +68,10 @@ NCPU=`sysctl -n hw.ncpu`


 # intel client and server
-if [ -d build/release-darwin-${BUILDARCH} ]; then
-	rm -r build/release-darwin-${BUILDARCH}
-fi
+#if [ -d build/release-darwin-${BUILDARCH} ]; then
+#	rm -r build/release-darwin-${BUILDARCH}
+#fi
 (ARCH=${BUILDARCH} CFLAGS=$ARCH_CFLAGS LDFLAGS=$ARCH_LDFLAGS make -j$NCPU) || exit 1;

-echo "Creating .app bundle $DESTDIR/$APPBUNDLE"
-if [ ! -d $DESTDIR/$APPBUNDLE/Contents/MacOS/$BASEDIR ]; then
-	mkdir -p $DESTDIR/$APPBUNDLE/Contents/MacOS/$BASEDIR || exit 1;
-fi
-if [ ! -d $DESTDIR/$APPBUNDLE/Contents/MacOS/$MPACKDIR ]; then
-	mkdir -p $DESTDIR/$APPBUNDLE/Contents/MacOS/$MPACKDIR || exit 1;
-fi
-if [ ! -d $DESTDIR/$APPBUNDLE/Contents/Resources ]; then
-	mkdir -p $DESTDIR/$APPBUNDLE/Contents/Resources
-fi
-cp $ICNS $DESTDIR/$APPBUNDLE/Contents/Resources/ioquake3.icns || exit 1;
-echo $PKGINFO > $DESTDIR/$APPBUNDLE/Contents/PkgInfo
-echo "
-	<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-	<!DOCTYPE plist
-		PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\"
-		\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-	<plist version=\"1.0\">
-	<dict>
-		<key>CFBundleDevelopmentRegion</key>
-		<string>English</string>
-		<key>CFBundleExecutable</key>
-		<string>$BINARY</string>
-		<key>CFBundleGetInfoString</key>
-		<string>ioquake3 $Q3_VERSION</string>
-		<key>CFBundleIconFile</key>
-		<string>ioquake3.icns</string>
-		<key>CFBundleIdentifier</key>
-		<string>org.ioquake.ioquake3</string>
-		<key>CFBundleInfoDictionaryVersion</key>
-		<string>6.0</string>
-		<key>CFBundleName</key>
-		<string>ioquake3</string>
-		<key>CFBundlePackageType</key>
-		<string>APPL</string>
-		<key>CFBundleShortVersionString</key>
-		<string>$Q3_VERSION</string>
-		<key>CFBundleSignature</key>
-		<string>$PKGINFO</string>
-		<key>CFBundleVersion</key>
-		<string>$Q3_VERSION</string>
-		<key>NSExtensions</key>
-		<dict/>
-		<key>NSPrincipalClass</key>
-		<string>NSApplication</string>
-	</dict>
-	</plist>
-	" > $DESTDIR/$APPBUNDLE/Contents/Info.plist
-
-
-cp $BIN_OBJ $DESTDIR/$APPBUNDLE/Contents/MacOS/$BINARY
-cp $BIN_DEDOBJ $DESTDIR/$APPBUNDLE/Contents/MacOS/$DEDBIN
-cp $RENDER_OBJ $DESTDIR/$APPBUNDLE/Contents/MacOS/
-cp $BASE_OBJ $DESTDIR/$APPBUNDLE/Contents/MacOS/$BASEDIR/
-cp $MPACK_OBJ $DESTDIR/$APPBUNDLE/Contents/MacOS/$MPACKDIR/
-cp code/libs/macosx/*.dylib $DESTDIR/$APPBUNDLE/Contents/MacOS/
-cp code/libs/macosx/*.dylib $DESTDIR
-
+# use the following shell script to build an application bundle
+"./make-macosx-app.sh" release ${BUILDARCH}
--- a/misc/osxfe/ioquake3fe/Info.plist
+++ b/misc/osxfe/ioquake3fe/Info.plist
@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
-	<string>ioquake3.icns</string>
+	<string>quake3_flat</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.icculus.quake3</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@ -16,6 +16,8 @@
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
--- a/misc/osxfe/ioquake3fe/ioquake3fe.xcodeproj/project.pbxproj
+++ b/misc/osxfe/ioquake3fe/ioquake3fe.xcodeproj/project.pbxproj
@ -3,16 +3,16 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 45;
+	objectVersion = 46;
 	objects = {

 /* Begin PBXBuildFile section */
+		278714DB1791207600094CA3 /* quake3_flat.icns in Resources */ = {isa = PBXBuildFile; fileRef = 278714DA1791207600094CA3 /* quake3_flat.icns */; };
 		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
 		8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
 		C30C62180F677DD30043A4E2 /* Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = C30C62170F677DD30043A4E2 /* Controller.m */; };
 		C30C631D0F67A37E0043A4E2 /* ErrorWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = C30C631C0F67A37E0043A4E2 /* ErrorWindow.m */; };
-		C30C638F0F67AA7B0043A4E2 /* ioquake3.icns in Resources */ = {isa = PBXBuildFile; fileRef = C30C638E0F67AA7B0043A4E2 /* ioquake3.icns */; };
 		C34EC1F60F68433A00C42E7D /* ErrorWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = C34EC1F50F68433A00C42E7D /* ErrorWindowController.m */; };
 		C37357890F68280200B1A10C /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = C37357850F68280200B1A10C /* MainMenu.xib */; };
 		C373578A0F68280200B1A10C /* ErrorWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = C37357870F68280200B1A10C /* ErrorWindow.xib */; };
@ -22,6 +22,7 @@
 		089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
+		278714DA1791207600094CA3 /* quake3_flat.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = quake3_flat.icns; path = ../../quake3_flat.icns; sourceTree = "<group>"; };
 		29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
@ -32,7 +33,6 @@
 		C30C62170F677DD30043A4E2 /* Controller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Controller.m; sourceTree = "<group>"; };
 		C30C631B0F67A37E0043A4E2 /* ErrorWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ErrorWindow.h; sourceTree = "<group>"; };
 		C30C631C0F67A37E0043A4E2 /* ErrorWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ErrorWindow.m; sourceTree = "<group>"; };
-		C30C638E0F67AA7B0043A4E2 /* ioquake3.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = ioquake3.icns; sourceTree = "<group>"; };
 		C34EC1F40F68433A00C42E7D /* ErrorWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ErrorWindowController.h; sourceTree = "<group>"; };
 		C34EC1F50F68433A00C42E7D /* ErrorWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ErrorWindowController.m; sourceTree = "<group>"; };
 		C37357860F68280200B1A10C /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
@ -116,7 +116,7 @@
 			children = (
 				C37357850F68280200B1A10C /* MainMenu.xib */,
 				C37357870F68280200B1A10C /* ErrorWindow.xib */,
-				C30C638E0F67AA7B0043A4E2 /* ioquake3.icns */,
+				278714DA1791207600094CA3 /* quake3_flat.icns */,
 				8D1107310486CEB800E47090 /* Info.plist */,
 				089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
 			);
@ -158,9 +158,16 @@
 /* Begin PBXProject section */
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0460;
+			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ioquake3fe" */;
-			compatibilityVersion = "Xcode 3.1";
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				en,
+			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* ioquake3fe */;
 			projectDirPath = "";
 			projectRoot = "";
@ -176,9 +183,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
-				C30C638F0F67AA7B0043A4E2 /* ioquake3.icns in Resources */,
 				C37357890F68280200B1A10C /* MainMenu.xib in Resources */,
 				C373578A0F68280200B1A10C /* ErrorWindow.xib in Resources */,
+				278714DB1791207600094CA3 /* quake3_flat.icns in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -230,15 +237,16 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = ioquake3fe_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				PRODUCT_NAME = ioquake3fe;
 			};
 			name = Debug;
@ -247,12 +255,14 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = ioquake3fe_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				PRODUCT_NAME = ioquake3fe;
 			};
 			name = Release;
@ -260,26 +270,24 @@
 		C01FCF4F08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				PREBINDING = NO;
-				SDKROOT = macosx10.4;
+				SDKROOT = "";
 			};
 			name = Debug;
 		};
 		C01FCF5008A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				PREBINDING = NO;
-				SDKROOT = macosx10.4;
+				SDKROOT = "";
 			};
 			name = Release;
 		};
--- a/misc/quake3_flat.icns
+++ b/misc/quake3_flat.icns
--- a/misc/quake3_flat.iconset/icon_128x128.png
+++ b/misc/quake3_flat.iconset/icon_128x128.png
--- a/misc/quake3_flat.iconset/icon_128x128@2x.png
+++ b/misc/quake3_flat.iconset/icon_128x128@2x.png
--- a/misc/quake3_flat.iconset/icon_16x16.png
+++ b/misc/quake3_flat.iconset/icon_16x16.png
--- a/misc/quake3_flat.iconset/icon_16x16@2x.png
+++ b/misc/quake3_flat.iconset/icon_16x16@2x.png
--- a/misc/quake3_flat.iconset/icon_256x256.png
+++ b/misc/quake3_flat.iconset/icon_256x256.png
--- a/misc/quake3_flat.iconset/icon_256x256@2x.png
+++ b/misc/quake3_flat.iconset/icon_256x256@2x.png
--- a/misc/quake3_flat.iconset/icon_32x32.png
+++ b/misc/quake3_flat.iconset/icon_32x32.png
--- a/misc/quake3_flat.iconset/icon_32x32@2x.png
+++ b/misc/quake3_flat.iconset/icon_32x32@2x.png
--- a/misc/quake3_flat.iconset/icon_512x512.png
+++ b/misc/quake3_flat.iconset/icon_512x512.png
--- a/misc/quake3_flat.iconset/icon_512x512@2x.png
+++ b/misc/quake3_flat.iconset/icon_512x512@2x.png
--- a/misc/xcode/botlib.xcodeproj/project.pbxproj
+++ b/misc/xcode/botlib.xcodeproj/project.pbxproj
@ -0,0 +1,425 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		2735309A14D1203000EB7BD6 /* be_aas_bspq3.c in Sources */ = {isa = PBXBuildFile; fileRef = 2735307414D1203000EB7BD6 /* be_aas_bspq3.c */; };
+		2735309B14D1203000EB7BD6 /* be_aas_cluster.c in Sources */ = {isa = PBXBuildFile; fileRef = 2735307514D1203000EB7BD6 /* be_aas_cluster.c */; };
+		2735309D14D1203000EB7BD6 /* be_aas_debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 2735307714D1203000EB7BD6 /* be_aas_debug.c */; };
+		273530A014D1203000EB7BD6 /* be_aas_entity.c in Sources */ = {isa = PBXBuildFile; fileRef = 2735307A14D1203000EB7BD6 /* be_aas_entity.c */; };
+		273530A214D1203000EB7BD6 /* be_aas_file.c in Sources */ = {isa = PBXBuildFile; fileRef = 2735307C14D1203000EB7BD6 /* be_aas_file.c */; };
+		273530A514D1203000EB7BD6 /* be_aas_main.c in Sources */ = {isa = PBXBuildFile; fileRef = 2735307F14D1203000EB7BD6 /* be_aas_main.c */; };
+		273530A714D1203000EB7BD6 /* be_aas_move.c in Sources */ = {isa = PBXBuildFile; fileRef = 2735308114D1203000EB7BD6 /* be_aas_move.c */; };
+		273530A914D1203000EB7BD6 /* be_aas_optimize.c in Sources */ = {isa = PBXBuildFile; fileRef = 2735308314D1203000EB7BD6 /* be_aas_optimize.c */; };
+		273530AB14D1203000EB7BD6 /* be_aas_reach.c in Sources */ = {isa = PBXBuildFile; fileRef = 2735308514D1203000EB7BD6 /* be_aas_reach.c */; };
+		273530AD14D1203000EB7BD6 /* be_aas_route.c in Sources */ = {isa = PBXBuildFile; fileRef = 2735308714D1203000EB7BD6 /* be_aas_route.c */; };
+		273530AF14D1203000EB7BD6 /* be_aas_routealt.c in Sources */ = {isa = PBXBuildFile; fileRef = 2735308914D1203000EB7BD6 /* be_aas_routealt.c */; };
+		273530B114D1203000EB7BD6 /* be_aas_sample.c in Sources */ = {isa = PBXBuildFile; fileRef = 2735308B14D1203000EB7BD6 /* be_aas_sample.c */; };
+		273530B314D1203000EB7BD6 /* be_ai_char.c in Sources */ = {isa = PBXBuildFile; fileRef = 2735308D14D1203000EB7BD6 /* be_ai_char.c */; };
+		273530B414D1203000EB7BD6 /* be_ai_chat.c in Sources */ = {isa = PBXBuildFile; fileRef = 2735308E14D1203000EB7BD6 /* be_ai_chat.c */; };
+		273530B514D1203000EB7BD6 /* be_ai_gen.c in Sources */ = {isa = PBXBuildFile; fileRef = 2735308F14D1203000EB7BD6 /* be_ai_gen.c */; };
+		273530B614D1203000EB7BD6 /* be_ai_goal.c in Sources */ = {isa = PBXBuildFile; fileRef = 2735309014D1203000EB7BD6 /* be_ai_goal.c */; };
+		273530B714D1203000EB7BD6 /* be_ai_move.c in Sources */ = {isa = PBXBuildFile; fileRef = 2735309114D1203000EB7BD6 /* be_ai_move.c */; };
+		273530B814D1203000EB7BD6 /* be_ai_weap.c in Sources */ = {isa = PBXBuildFile; fileRef = 2735309214D1203000EB7BD6 /* be_ai_weap.c */; };
+		273530B914D1203000EB7BD6 /* be_ai_weight.c in Sources */ = {isa = PBXBuildFile; fileRef = 2735309314D1203000EB7BD6 /* be_ai_weight.c */; };
+		273530BB14D1203000EB7BD6 /* be_ea.c in Sources */ = {isa = PBXBuildFile; fileRef = 2735309514D1203000EB7BD6 /* be_ea.c */; };
+		273530BC14D1203000EB7BD6 /* be_interface.c in Sources */ = {isa = PBXBuildFile; fileRef = 2735309614D1203000EB7BD6 /* be_interface.c */; };
+		273530CD14D1204D00EB7BD6 /* l_crc.c in Sources */ = {isa = PBXBuildFile; fileRef = 273530BE14D1204D00EB7BD6 /* l_crc.c */; };
+		273530CF14D1204D00EB7BD6 /* l_libvar.c in Sources */ = {isa = PBXBuildFile; fileRef = 273530C014D1204D00EB7BD6 /* l_libvar.c */; };
+		273530D114D1204D00EB7BD6 /* l_log.c in Sources */ = {isa = PBXBuildFile; fileRef = 273530C214D1204D00EB7BD6 /* l_log.c */; };
+		273530D314D1204D00EB7BD6 /* l_memory.c in Sources */ = {isa = PBXBuildFile; fileRef = 273530C414D1204D00EB7BD6 /* l_memory.c */; };
+		273530D514D1204D00EB7BD6 /* l_precomp.c in Sources */ = {isa = PBXBuildFile; fileRef = 273530C614D1204D00EB7BD6 /* l_precomp.c */; };
+		273530D714D1204D00EB7BD6 /* l_script.c in Sources */ = {isa = PBXBuildFile; fileRef = 273530C814D1204D00EB7BD6 /* l_script.c */; };
+		273530D914D1204D00EB7BD6 /* l_struct.c in Sources */ = {isa = PBXBuildFile; fileRef = 273530CA14D1204D00EB7BD6 /* l_struct.c */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		2735306614D11F8B00EB7BD6 /* botlib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = botlib.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		2735307214D1203000EB7BD6 /* aasfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aasfile.h; sourceTree = "<group>"; };
+		2735307314D1203000EB7BD6 /* be_aas_bsp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = be_aas_bsp.h; sourceTree = "<group>"; };
+		2735307414D1203000EB7BD6 /* be_aas_bspq3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = be_aas_bspq3.c; sourceTree = "<group>"; };
+		2735307514D1203000EB7BD6 /* be_aas_cluster.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = be_aas_cluster.c; sourceTree = "<group>"; };
+		2735307614D1203000EB7BD6 /* be_aas_cluster.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = be_aas_cluster.h; sourceTree = "<group>"; };
+		2735307714D1203000EB7BD6 /* be_aas_debug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = be_aas_debug.c; sourceTree = "<group>"; };
+		2735307814D1203000EB7BD6 /* be_aas_debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = be_aas_debug.h; sourceTree = "<group>"; };
+		2735307914D1203000EB7BD6 /* be_aas_def.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = be_aas_def.h; sourceTree = "<group>"; };
+		2735307A14D1203000EB7BD6 /* be_aas_entity.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = be_aas_entity.c; sourceTree = "<group>"; };
+		2735307B14D1203000EB7BD6 /* be_aas_entity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = be_aas_entity.h; sourceTree = "<group>"; };
+		2735307C14D1203000EB7BD6 /* be_aas_file.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = be_aas_file.c; sourceTree = "<group>"; };
+		2735307D14D1203000EB7BD6 /* be_aas_file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = be_aas_file.h; sourceTree = "<group>"; };
+		2735307E14D1203000EB7BD6 /* be_aas_funcs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = be_aas_funcs.h; sourceTree = "<group>"; };
+		2735307F14D1203000EB7BD6 /* be_aas_main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = be_aas_main.c; sourceTree = "<group>"; };
+		2735308014D1203000EB7BD6 /* be_aas_main.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = be_aas_main.h; sourceTree = "<group>"; };
+		2735308114D1203000EB7BD6 /* be_aas_move.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = be_aas_move.c; sourceTree = "<group>"; };
+		2735308214D1203000EB7BD6 /* be_aas_move.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = be_aas_move.h; sourceTree = "<group>"; };
+		2735308314D1203000EB7BD6 /* be_aas_optimize.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = be_aas_optimize.c; sourceTree = "<group>"; };
+		2735308414D1203000EB7BD6 /* be_aas_optimize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = be_aas_optimize.h; sourceTree = "<group>"; };
+		2735308514D1203000EB7BD6 /* be_aas_reach.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = be_aas_reach.c; sourceTree = "<group>"; };
+		2735308614D1203000EB7BD6 /* be_aas_reach.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = be_aas_reach.h; sourceTree = "<group>"; };
+		2735308714D1203000EB7BD6 /* be_aas_route.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = be_aas_route.c; sourceTree = "<group>"; };
+		2735308814D1203000EB7BD6 /* be_aas_route.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = be_aas_route.h; sourceTree = "<group>"; };
+		2735308914D1203000EB7BD6 /* be_aas_routealt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = be_aas_routealt.c; sourceTree = "<group>"; };
+		2735308A14D1203000EB7BD6 /* be_aas_routealt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = be_aas_routealt.h; sourceTree = "<group>"; };
+		2735308B14D1203000EB7BD6 /* be_aas_sample.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = be_aas_sample.c; sourceTree = "<group>"; };
+		2735308C14D1203000EB7BD6 /* be_aas_sample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = be_aas_sample.h; sourceTree = "<group>"; };
+		2735308D14D1203000EB7BD6 /* be_ai_char.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = be_ai_char.c; sourceTree = "<group>"; };
+		2735308E14D1203000EB7BD6 /* be_ai_chat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = be_ai_chat.c; sourceTree = "<group>"; };
+		2735308F14D1203000EB7BD6 /* be_ai_gen.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = be_ai_gen.c; sourceTree = "<group>"; };
+		2735309014D1203000EB7BD6 /* be_ai_goal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = be_ai_goal.c; sourceTree = "<group>"; };
+		2735309114D1203000EB7BD6 /* be_ai_move.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = be_ai_move.c; sourceTree = "<group>"; };
+		2735309214D1203000EB7BD6 /* be_ai_weap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = be_ai_weap.c; sourceTree = "<group>"; };
+		2735309314D1203000EB7BD6 /* be_ai_weight.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = be_ai_weight.c; sourceTree = "<group>"; };
+		2735309414D1203000EB7BD6 /* be_ai_weight.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = be_ai_weight.h; sourceTree = "<group>"; };
+		2735309514D1203000EB7BD6 /* be_ea.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = be_ea.c; sourceTree = "<group>"; };
+		2735309614D1203000EB7BD6 /* be_interface.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = be_interface.c; sourceTree = "<group>"; };
+		2735309714D1203000EB7BD6 /* be_interface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = be_interface.h; sourceTree = "<group>"; };
+		273530BE14D1204D00EB7BD6 /* l_crc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = l_crc.c; sourceTree = "<group>"; };
+		273530BF14D1204D00EB7BD6 /* l_crc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = l_crc.h; sourceTree = "<group>"; };
+		273530C014D1204D00EB7BD6 /* l_libvar.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = l_libvar.c; sourceTree = "<group>"; };
+		273530C114D1204D00EB7BD6 /* l_libvar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = l_libvar.h; sourceTree = "<group>"; };
+		273530C214D1204D00EB7BD6 /* l_log.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = l_log.c; sourceTree = "<group>"; };
+		273530C314D1204D00EB7BD6 /* l_log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = l_log.h; sourceTree = "<group>"; };
+		273530C414D1204D00EB7BD6 /* l_memory.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = l_memory.c; sourceTree = "<group>"; };
+		273530C514D1204D00EB7BD6 /* l_memory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = l_memory.h; sourceTree = "<group>"; };
+		273530C614D1204D00EB7BD6 /* l_precomp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = l_precomp.c; sourceTree = "<group>"; };
+		273530C714D1204D00EB7BD6 /* l_precomp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = l_precomp.h; sourceTree = "<group>"; };
+		273530C814D1204D00EB7BD6 /* l_script.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = l_script.c; sourceTree = "<group>"; };
+		273530C914D1204D00EB7BD6 /* l_script.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = l_script.h; sourceTree = "<group>"; };
+		273530CA14D1204D00EB7BD6 /* l_struct.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = l_struct.c; sourceTree = "<group>"; };
+		273530CB14D1204D00EB7BD6 /* l_struct.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = l_struct.h; sourceTree = "<group>"; };
+		273530CC14D1204D00EB7BD6 /* l_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = l_utils.h; sourceTree = "<group>"; };
+		273530DE14D120F900EB7BD6 /* bg_public.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bg_public.h; sourceTree = "<group>"; };
+		273530E014D1210600EB7BD6 /* g_public.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = g_public.h; sourceTree = "<group>"; };
+		273530E214D1212200EB7BD6 /* cm_public.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cm_public.h; sourceTree = "<group>"; };
+		273530E414D1213900EB7BD6 /* qcommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qcommon.h; sourceTree = "<group>"; };
+		273530E514D1213900EB7BD6 /* qfiles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qfiles.h; sourceTree = "<group>"; };
+		273530E814D1215D00EB7BD6 /* q_shared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = q_shared.h; sourceTree = "<group>"; };
+		273530E914D1215D00EB7BD6 /* surfaceflags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = surfaceflags.h; sourceTree = "<group>"; };
+		273530ED14D1218C00EB7BD6 /* server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = server.h; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		2735306314D11F8B00EB7BD6 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		2735305B14D11F8B00EB7BD6 = {
+			isa = PBXGroup;
+			children = (
+				273530EF14D1219D00EB7BD6 /* code */,
+				2735306714D11F8B00EB7BD6 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		2735306714D11F8B00EB7BD6 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				2735306614D11F8B00EB7BD6 /* botlib.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		2735307014D11FD300EB7BD6 /* botlib */ = {
+			isa = PBXGroup;
+			children = (
+				2735307214D1203000EB7BD6 /* aasfile.h */,
+				2735307314D1203000EB7BD6 /* be_aas_bsp.h */,
+				2735307414D1203000EB7BD6 /* be_aas_bspq3.c */,
+				2735307514D1203000EB7BD6 /* be_aas_cluster.c */,
+				2735307614D1203000EB7BD6 /* be_aas_cluster.h */,
+				2735307714D1203000EB7BD6 /* be_aas_debug.c */,
+				2735307814D1203000EB7BD6 /* be_aas_debug.h */,
+				2735307914D1203000EB7BD6 /* be_aas_def.h */,
+				2735307A14D1203000EB7BD6 /* be_aas_entity.c */,
+				2735307B14D1203000EB7BD6 /* be_aas_entity.h */,
+				2735307C14D1203000EB7BD6 /* be_aas_file.c */,
+				2735307D14D1203000EB7BD6 /* be_aas_file.h */,
+				2735307E14D1203000EB7BD6 /* be_aas_funcs.h */,
+				2735307F14D1203000EB7BD6 /* be_aas_main.c */,
+				2735308014D1203000EB7BD6 /* be_aas_main.h */,
+				2735308114D1203000EB7BD6 /* be_aas_move.c */,
+				2735308214D1203000EB7BD6 /* be_aas_move.h */,
+				2735308314D1203000EB7BD6 /* be_aas_optimize.c */,
+				2735308414D1203000EB7BD6 /* be_aas_optimize.h */,
+				2735308514D1203000EB7BD6 /* be_aas_reach.c */,
+				2735308614D1203000EB7BD6 /* be_aas_reach.h */,
+				2735308714D1203000EB7BD6 /* be_aas_route.c */,
+				2735308814D1203000EB7BD6 /* be_aas_route.h */,
+				2735308914D1203000EB7BD6 /* be_aas_routealt.c */,
+				2735308A14D1203000EB7BD6 /* be_aas_routealt.h */,
+				2735308B14D1203000EB7BD6 /* be_aas_sample.c */,
+				2735308C14D1203000EB7BD6 /* be_aas_sample.h */,
+				2735308D14D1203000EB7BD6 /* be_ai_char.c */,
+				2735308E14D1203000EB7BD6 /* be_ai_chat.c */,
+				2735308F14D1203000EB7BD6 /* be_ai_gen.c */,
+				2735309014D1203000EB7BD6 /* be_ai_goal.c */,
+				2735309114D1203000EB7BD6 /* be_ai_move.c */,
+				2735309214D1203000EB7BD6 /* be_ai_weap.c */,
+				2735309314D1203000EB7BD6 /* be_ai_weight.c */,
+				2735309414D1203000EB7BD6 /* be_ai_weight.h */,
+				2735309514D1203000EB7BD6 /* be_ea.c */,
+				2735309614D1203000EB7BD6 /* be_interface.c */,
+				2735309714D1203000EB7BD6 /* be_interface.h */,
+				273530BE14D1204D00EB7BD6 /* l_crc.c */,
+				273530BF14D1204D00EB7BD6 /* l_crc.h */,
+				273530C014D1204D00EB7BD6 /* l_libvar.c */,
+				273530C114D1204D00EB7BD6 /* l_libvar.h */,
+				273530C214D1204D00EB7BD6 /* l_log.c */,
+				273530C314D1204D00EB7BD6 /* l_log.h */,
+				273530C414D1204D00EB7BD6 /* l_memory.c */,
+				273530C514D1204D00EB7BD6 /* l_memory.h */,
+				273530C614D1204D00EB7BD6 /* l_precomp.c */,
+				273530C714D1204D00EB7BD6 /* l_precomp.h */,
+				273530C814D1204D00EB7BD6 /* l_script.c */,
+				273530C914D1204D00EB7BD6 /* l_script.h */,
+				273530CA14D1204D00EB7BD6 /* l_struct.c */,
+				273530CB14D1204D00EB7BD6 /* l_struct.h */,
+				273530CC14D1204D00EB7BD6 /* l_utils.h */,
+			);
+			path = botlib;
+			sourceTree = "<group>";
+		};
+		273530DC14D120B100EB7BD6 /* game */ = {
+			isa = PBXGroup;
+			children = (
+				273530DE14D120F900EB7BD6 /* bg_public.h */,
+				273530E014D1210600EB7BD6 /* g_public.h */,
+			);
+			path = game;
+			sourceTree = "<group>";
+		};
+		273530DD14D120D400EB7BD6 /* qcommon */ = {
+			isa = PBXGroup;
+			children = (
+				273530E214D1212200EB7BD6 /* cm_public.h */,
+				273530E814D1215D00EB7BD6 /* q_shared.h */,
+				273530E414D1213900EB7BD6 /* qcommon.h */,
+				273530E514D1213900EB7BD6 /* qfiles.h */,
+				273530E914D1215D00EB7BD6 /* surfaceflags.h */,
+			);
+			path = qcommon;
+			sourceTree = "<group>";
+		};
+		273530EC14D1217200EB7BD6 /* server */ = {
+			isa = PBXGroup;
+			children = (
+				273530ED14D1218C00EB7BD6 /* server.h */,
+			);
+			path = server;
+			sourceTree = "<group>";
+		};
+		273530EF14D1219D00EB7BD6 /* code */ = {
+			isa = PBXGroup;
+			children = (
+				2735307014D11FD300EB7BD6 /* botlib */,
+				273530DC14D120B100EB7BD6 /* game */,
+				273530DD14D120D400EB7BD6 /* qcommon */,
+				273530EC14D1217200EB7BD6 /* server */,
+			);
+			name = code;
+			path = ../../code;
+			sourceTree = SOURCE_ROOT;
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		2735306514D11F8B00EB7BD6 /* botlib */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 2735306A14D11F8B00EB7BD6 /* Build configuration list for PBXNativeTarget "botlib" */;
+			buildPhases = (
+				2735306214D11F8B00EB7BD6 /* Sources */,
+				2735306314D11F8B00EB7BD6 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = botlib;
+			productName = botlib;
+			productReference = 2735306614D11F8B00EB7BD6 /* botlib.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		2735305D14D11F8B00EB7BD6 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				CLASSPREFIX = io;
+				LastUpgradeCheck = 0500;
+				ORGANIZATIONNAME = ioquake;
+			};
+			buildConfigurationList = 2735306014D11F8B00EB7BD6 /* Build configuration list for PBXProject "botlib" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 2735305B14D11F8B00EB7BD6;
+			productRefGroup = 2735306714D11F8B00EB7BD6 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				2735306514D11F8B00EB7BD6 /* botlib */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		2735306214D11F8B00EB7BD6 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2735309A14D1203000EB7BD6 /* be_aas_bspq3.c in Sources */,
+				2735309B14D1203000EB7BD6 /* be_aas_cluster.c in Sources */,
+				2735309D14D1203000EB7BD6 /* be_aas_debug.c in Sources */,
+				273530A014D1203000EB7BD6 /* be_aas_entity.c in Sources */,
+				273530A214D1203000EB7BD6 /* be_aas_file.c in Sources */,
+				273530A514D1203000EB7BD6 /* be_aas_main.c in Sources */,
+				273530A714D1203000EB7BD6 /* be_aas_move.c in Sources */,
+				273530A914D1203000EB7BD6 /* be_aas_optimize.c in Sources */,
+				273530AB14D1203000EB7BD6 /* be_aas_reach.c in Sources */,
+				273530AD14D1203000EB7BD6 /* be_aas_route.c in Sources */,
+				273530AF14D1203000EB7BD6 /* be_aas_routealt.c in Sources */,
+				273530B114D1203000EB7BD6 /* be_aas_sample.c in Sources */,
+				273530B314D1203000EB7BD6 /* be_ai_char.c in Sources */,
+				273530B414D1203000EB7BD6 /* be_ai_chat.c in Sources */,
+				273530B514D1203000EB7BD6 /* be_ai_gen.c in Sources */,
+				273530B614D1203000EB7BD6 /* be_ai_goal.c in Sources */,
+				273530B714D1203000EB7BD6 /* be_ai_move.c in Sources */,
+				273530B814D1203000EB7BD6 /* be_ai_weap.c in Sources */,
+				273530B914D1203000EB7BD6 /* be_ai_weight.c in Sources */,
+				273530BB14D1203000EB7BD6 /* be_ea.c in Sources */,
+				273530BC14D1203000EB7BD6 /* be_interface.c in Sources */,
+				273530CD14D1204D00EB7BD6 /* l_crc.c in Sources */,
+				273530CF14D1204D00EB7BD6 /* l_libvar.c in Sources */,
+				273530D114D1204D00EB7BD6 /* l_log.c in Sources */,
+				273530D314D1204D00EB7BD6 /* l_memory.c in Sources */,
+				273530D514D1204D00EB7BD6 /* l_precomp.c in Sources */,
+				273530D714D1204D00EB7BD6 /* l_script.c in Sources */,
+				273530D914D1204D00EB7BD6 /* l_struct.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		2735306814D11F8B00EB7BD6 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+					BOTLIB,
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		2735306914D11F8B00EB7BD6 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = BOTLIB;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		2735306B14D11F8B00EB7BD6 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				EXECUTABLE_PREFIX = "";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		2735306C14D11F8B00EB7BD6 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				EXECUTABLE_PREFIX = "";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		2735306014D11F8B00EB7BD6 /* Build configuration list for PBXProject "botlib" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				2735306814D11F8B00EB7BD6 /* Debug */,
+				2735306914D11F8B00EB7BD6 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		2735306A14D11F8B00EB7BD6 /* Build configuration list for PBXNativeTarget "botlib" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				2735306B14D11F8B00EB7BD6 /* Debug */,
+				2735306C14D11F8B00EB7BD6 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 2735305D14D11F8B00EB7BD6 /* Project object */;
+}
--- a/misc/xcode/cgame.xcodeproj/project.pbxproj
+++ b/misc/xcode/cgame.xcodeproj/project.pbxproj
@ -0,0 +1,369 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		2711BCFF14D12E99005EB142 /* cg_consolecmds.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCE714D12E99005EB142 /* cg_consolecmds.c */; };
+		2711BD0014D12E99005EB142 /* cg_draw.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCE814D12E99005EB142 /* cg_draw.c */; };
+		2711BD0114D12E99005EB142 /* cg_drawtools.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCE914D12E99005EB142 /* cg_drawtools.c */; };
+		2711BD0214D12E99005EB142 /* cg_effects.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCEA14D12E99005EB142 /* cg_effects.c */; };
+		2711BD0314D12E99005EB142 /* cg_ents.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCEB14D12E99005EB142 /* cg_ents.c */; };
+		2711BD0414D12E99005EB142 /* cg_event.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCEC14D12E99005EB142 /* cg_event.c */; };
+		2711BD0514D12E99005EB142 /* cg_info.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCED14D12E99005EB142 /* cg_info.c */; };
+		2711BD0714D12E99005EB142 /* cg_localents.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCEF14D12E99005EB142 /* cg_localents.c */; };
+		2711BD0814D12E99005EB142 /* cg_main.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCF014D12E99005EB142 /* cg_main.c */; };
+		2711BD0914D12E99005EB142 /* cg_marks.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCF114D12E99005EB142 /* cg_marks.c */; };
+		2711BD0C14D12E99005EB142 /* cg_players.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCF414D12E99005EB142 /* cg_players.c */; };
+		2711BD0D14D12E99005EB142 /* cg_playerstate.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCF514D12E99005EB142 /* cg_playerstate.c */; };
+		2711BD0E14D12E99005EB142 /* cg_predict.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCF614D12E99005EB142 /* cg_predict.c */; };
+		2711BD1014D12E99005EB142 /* cg_scoreboard.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCF814D12E99005EB142 /* cg_scoreboard.c */; };
+		2711BD1114D12E99005EB142 /* cg_servercmds.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCF914D12E99005EB142 /* cg_servercmds.c */; };
+		2711BD1214D12E99005EB142 /* cg_snapshot.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCFA14D12E99005EB142 /* cg_snapshot.c */; };
+		2711BD1314D12E99005EB142 /* cg_syscalls.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCFB14D12E99005EB142 /* cg_syscalls.c */; };
+		2711BD1414D12E99005EB142 /* cg_view.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCFC14D12E99005EB142 /* cg_view.c */; };
+		2711BD1514D12E99005EB142 /* cg_weapons.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCFD14D12E99005EB142 /* cg_weapons.c */; };
+		2711BD2714D12F01005EB142 /* bg_lib.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD1C14D12F01005EB142 /* bg_lib.c */; };
+		2711BD2A14D12F01005EB142 /* bg_misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD1F14D12F01005EB142 /* bg_misc.c */; };
+		2711BD2B14D12F01005EB142 /* bg_pmove.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD2014D12F01005EB142 /* bg_pmove.c */; };
+		2711BD2D14D12F01005EB142 /* bg_slidemove.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD2214D12F01005EB142 /* bg_slidemove.c */; };
+		2711BD2E14D12F01005EB142 /* q_math.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD2314D12F01005EB142 /* q_math.c */; };
+		2711BD2F14D12F01005EB142 /* q_shared.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD2414D12F01005EB142 /* q_shared.c */; };
+		27AACFF7178DFDDE0093DFC0 /* ui_shared.c in Sources */ = {isa = PBXBuildFile; fileRef = 27AACFF6178DFDDE0093DFC0 /* ui_shared.c */; };
+		27AACFFA178DFE9A0093DFC0 /* cg_particles.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCF314D12E99005EB142 /* cg_particles.c */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		2711BCE714D12E99005EB142 /* cg_consolecmds.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cg_consolecmds.c; sourceTree = "<group>"; };
+		2711BCE814D12E99005EB142 /* cg_draw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cg_draw.c; sourceTree = "<group>"; };
+		2711BCE914D12E99005EB142 /* cg_drawtools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cg_drawtools.c; sourceTree = "<group>"; };
+		2711BCEA14D12E99005EB142 /* cg_effects.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cg_effects.c; sourceTree = "<group>"; };
+		2711BCEB14D12E99005EB142 /* cg_ents.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cg_ents.c; sourceTree = "<group>"; };
+		2711BCEC14D12E99005EB142 /* cg_event.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cg_event.c; sourceTree = "<group>"; };
+		2711BCED14D12E99005EB142 /* cg_info.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cg_info.c; sourceTree = "<group>"; };
+		2711BCEE14D12E99005EB142 /* cg_local.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cg_local.h; sourceTree = "<group>"; };
+		2711BCEF14D12E99005EB142 /* cg_localents.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cg_localents.c; sourceTree = "<group>"; };
+		2711BCF014D12E99005EB142 /* cg_main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cg_main.c; sourceTree = "<group>"; };
+		2711BCF114D12E99005EB142 /* cg_marks.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cg_marks.c; sourceTree = "<group>"; };
+		2711BCF214D12E99005EB142 /* cg_newdraw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cg_newdraw.c; sourceTree = "<group>"; };
+		2711BCF314D12E99005EB142 /* cg_particles.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cg_particles.c; sourceTree = "<group>"; };
+		2711BCF414D12E99005EB142 /* cg_players.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cg_players.c; sourceTree = "<group>"; };
+		2711BCF514D12E99005EB142 /* cg_playerstate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cg_playerstate.c; sourceTree = "<group>"; };
+		2711BCF614D12E99005EB142 /* cg_predict.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cg_predict.c; sourceTree = "<group>"; };
+		2711BCF714D12E99005EB142 /* cg_public.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cg_public.h; sourceTree = "<group>"; };
+		2711BCF814D12E99005EB142 /* cg_scoreboard.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cg_scoreboard.c; sourceTree = "<group>"; };
+		2711BCF914D12E99005EB142 /* cg_servercmds.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cg_servercmds.c; sourceTree = "<group>"; };
+		2711BCFA14D12E99005EB142 /* cg_snapshot.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cg_snapshot.c; sourceTree = "<group>"; };
+		2711BCFB14D12E99005EB142 /* cg_syscalls.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cg_syscalls.c; sourceTree = "<group>"; };
+		2711BCFC14D12E99005EB142 /* cg_view.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cg_view.c; sourceTree = "<group>"; };
+		2711BCFD14D12E99005EB142 /* cg_weapons.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cg_weapons.c; sourceTree = "<group>"; };
+		2711BD1A14D12ED8005EB142 /* ui_shared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ui_shared.h; path = ui/ui_shared.h; sourceTree = "<group>"; };
+		2711BD1C14D12F01005EB142 /* bg_lib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bg_lib.c; path = game/bg_lib.c; sourceTree = "<group>"; };
+		2711BD1D14D12F01005EB142 /* bg_lib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bg_lib.h; path = game/bg_lib.h; sourceTree = "<group>"; };
+		2711BD1E14D12F01005EB142 /* bg_local.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bg_local.h; path = game/bg_local.h; sourceTree = "<group>"; };
+		2711BD1F14D12F01005EB142 /* bg_misc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bg_misc.c; path = game/bg_misc.c; sourceTree = "<group>"; };
+		2711BD2014D12F01005EB142 /* bg_pmove.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bg_pmove.c; path = game/bg_pmove.c; sourceTree = "<group>"; };
+		2711BD2114D12F01005EB142 /* bg_public.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bg_public.h; path = game/bg_public.h; sourceTree = "<group>"; };
+		2711BD2214D12F01005EB142 /* bg_slidemove.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bg_slidemove.c; path = game/bg_slidemove.c; sourceTree = "<group>"; };
+		2711BD2314D12F01005EB142 /* q_math.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = q_math.c; sourceTree = "<group>"; };
+		2711BD2414D12F01005EB142 /* q_shared.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = q_shared.c; sourceTree = "<group>"; };
+		2711BD2514D12F01005EB142 /* q_shared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = q_shared.h; sourceTree = "<group>"; };
+		2711BD2614D12F01005EB142 /* surfaceflags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = surfaceflags.h; sourceTree = "<group>"; };
+		2735319514D125FD00EB7BD6 /* cgame.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = cgame.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		27AACFF6178DFDDE0093DFC0 /* ui_shared.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ui_shared.c; path = ui/ui_shared.c; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		2735319214D125FD00EB7BD6 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		2711BD1814D12E9E005EB142 /* game */ = {
+			isa = PBXGroup;
+			children = (
+				2711BD1C14D12F01005EB142 /* bg_lib.c */,
+				2711BD1D14D12F01005EB142 /* bg_lib.h */,
+				2711BD1E14D12F01005EB142 /* bg_local.h */,
+				2711BD1F14D12F01005EB142 /* bg_misc.c */,
+				2711BD2014D12F01005EB142 /* bg_pmove.c */,
+				2711BD2114D12F01005EB142 /* bg_public.h */,
+				2711BD2214D12F01005EB142 /* bg_slidemove.c */,
+			);
+			name = game;
+			sourceTree = "<group>";
+		};
+		2711BD1914D12EB5005EB142 /* ui */ = {
+			isa = PBXGroup;
+			children = (
+				27AACFF6178DFDDE0093DFC0 /* ui_shared.c */,
+				2711BD1A14D12ED8005EB142 /* ui_shared.h */,
+			);
+			name = ui;
+			sourceTree = "<group>";
+		};
+		2735318A14D125FD00EB7BD6 = {
+			isa = PBXGroup;
+			children = (
+				2735319C14D1260300EB7BD6 /* code */,
+				2735319614D125FD00EB7BD6 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		2735319614D125FD00EB7BD6 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				2735319514D125FD00EB7BD6 /* cgame.dylib */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		2735319C14D1260300EB7BD6 /* code */ = {
+			isa = PBXGroup;
+			children = (
+				273531A114D1263700EB7BD6 /* cgame */,
+				2711BD1814D12E9E005EB142 /* game */,
+				27AACFD9178DF39B0093DFC0 /* qcommon */,
+				2711BD1914D12EB5005EB142 /* ui */,
+			);
+			name = code;
+			path = ../../code;
+			sourceTree = SOURCE_ROOT;
+		};
+		273531A114D1263700EB7BD6 /* cgame */ = {
+			isa = PBXGroup;
+			children = (
+				2711BCE714D12E99005EB142 /* cg_consolecmds.c */,
+				2711BCE814D12E99005EB142 /* cg_draw.c */,
+				2711BCE914D12E99005EB142 /* cg_drawtools.c */,
+				2711BCEA14D12E99005EB142 /* cg_effects.c */,
+				2711BCEB14D12E99005EB142 /* cg_ents.c */,
+				2711BCEC14D12E99005EB142 /* cg_event.c */,
+				2711BCED14D12E99005EB142 /* cg_info.c */,
+				2711BCEE14D12E99005EB142 /* cg_local.h */,
+				2711BCEF14D12E99005EB142 /* cg_localents.c */,
+				2711BCF014D12E99005EB142 /* cg_main.c */,
+				2711BCF114D12E99005EB142 /* cg_marks.c */,
+				2711BCF214D12E99005EB142 /* cg_newdraw.c */,
+				2711BCF314D12E99005EB142 /* cg_particles.c */,
+				2711BCF414D12E99005EB142 /* cg_players.c */,
+				2711BCF514D12E99005EB142 /* cg_playerstate.c */,
+				2711BCF614D12E99005EB142 /* cg_predict.c */,
+				2711BCF714D12E99005EB142 /* cg_public.h */,
+				2711BCF814D12E99005EB142 /* cg_scoreboard.c */,
+				2711BCF914D12E99005EB142 /* cg_servercmds.c */,
+				2711BCFA14D12E99005EB142 /* cg_snapshot.c */,
+				2711BCFB14D12E99005EB142 /* cg_syscalls.c */,
+				2711BCFC14D12E99005EB142 /* cg_view.c */,
+				2711BCFD14D12E99005EB142 /* cg_weapons.c */,
+			);
+			path = cgame;
+			sourceTree = "<group>";
+		};
+		27AACFD9178DF39B0093DFC0 /* qcommon */ = {
+			isa = PBXGroup;
+			children = (
+				2711BD2314D12F01005EB142 /* q_math.c */,
+				2711BD2414D12F01005EB142 /* q_shared.c */,
+				2711BD2514D12F01005EB142 /* q_shared.h */,
+				2711BD2614D12F01005EB142 /* surfaceflags.h */,
+			);
+			path = qcommon;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		2735319414D125FD00EB7BD6 /* cgame */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 2735319914D125FD00EB7BD6 /* Build configuration list for PBXNativeTarget "cgame" */;
+			buildPhases = (
+				2735319114D125FD00EB7BD6 /* Sources */,
+				2735319214D125FD00EB7BD6 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = cgame;
+			productName = cgame;
+			productReference = 2735319514D125FD00EB7BD6 /* cgame.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		2735318C14D125FD00EB7BD6 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				CLASSPREFIX = io;
+				LastUpgradeCheck = 0500;
+				ORGANIZATIONNAME = ioquake;
+			};
+			buildConfigurationList = 2735318F14D125FD00EB7BD6 /* Build configuration list for PBXProject "cgame" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 2735318A14D125FD00EB7BD6;
+			productRefGroup = 2735319614D125FD00EB7BD6 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				2735319414D125FD00EB7BD6 /* cgame */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		2735319114D125FD00EB7BD6 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2711BCFF14D12E99005EB142 /* cg_consolecmds.c in Sources */,
+				2711BD0014D12E99005EB142 /* cg_draw.c in Sources */,
+				2711BD0114D12E99005EB142 /* cg_drawtools.c in Sources */,
+				2711BD0214D12E99005EB142 /* cg_effects.c in Sources */,
+				2711BD0314D12E99005EB142 /* cg_ents.c in Sources */,
+				2711BD0414D12E99005EB142 /* cg_event.c in Sources */,
+				2711BD0514D12E99005EB142 /* cg_info.c in Sources */,
+				2711BD0714D12E99005EB142 /* cg_localents.c in Sources */,
+				2711BD0814D12E99005EB142 /* cg_main.c in Sources */,
+				2711BD0914D12E99005EB142 /* cg_marks.c in Sources */,
+				2711BD0C14D12E99005EB142 /* cg_players.c in Sources */,
+				2711BD0D14D12E99005EB142 /* cg_playerstate.c in Sources */,
+				2711BD0E14D12E99005EB142 /* cg_predict.c in Sources */,
+				2711BD1014D12E99005EB142 /* cg_scoreboard.c in Sources */,
+				2711BD1114D12E99005EB142 /* cg_servercmds.c in Sources */,
+				2711BD1214D12E99005EB142 /* cg_snapshot.c in Sources */,
+				2711BD1314D12E99005EB142 /* cg_syscalls.c in Sources */,
+				2711BD1414D12E99005EB142 /* cg_view.c in Sources */,
+				2711BD1514D12E99005EB142 /* cg_weapons.c in Sources */,
+				2711BD2714D12F01005EB142 /* bg_lib.c in Sources */,
+				2711BD2A14D12F01005EB142 /* bg_misc.c in Sources */,
+				2711BD2B14D12F01005EB142 /* bg_pmove.c in Sources */,
+				2711BD2D14D12F01005EB142 /* bg_slidemove.c in Sources */,
+				2711BD2E14D12F01005EB142 /* q_math.c in Sources */,
+				2711BD2F14D12F01005EB142 /* q_shared.c in Sources */,
+				27AACFF7178DFDDE0093DFC0 /* ui_shared.c in Sources */,
+				27AACFFA178DFE9A0093DFC0 /* cg_particles.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		2735319714D125FD00EB7BD6 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		2735319814D125FD00EB7BD6 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		2735319A14D125FD00EB7BD6 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				EXECUTABLE_PREFIX = "";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		2735319B14D125FD00EB7BD6 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				EXECUTABLE_PREFIX = "";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		2735318F14D125FD00EB7BD6 /* Build configuration list for PBXProject "cgame" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				2735319714D125FD00EB7BD6 /* Debug */,
+				2735319814D125FD00EB7BD6 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		2735319914D125FD00EB7BD6 /* Build configuration list for PBXNativeTarget "cgame" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				2735319A14D125FD00EB7BD6 /* Debug */,
+				2735319B14D125FD00EB7BD6 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 2735318C14D125FD00EB7BD6 /* Project object */;
+}
--- a/misc/xcode/game.xcodeproj/project.pbxproj
+++ b/misc/xcode/game.xcodeproj/project.pbxproj
@ -0,0 +1,405 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		2711BD7514D12F4E005EB142 /* ai_chat.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD3414D12F4E005EB142 /* ai_chat.c */; };
+		2711BD7714D12F4E005EB142 /* ai_cmd.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD3614D12F4E005EB142 /* ai_cmd.c */; };
+		2711BD7914D12F4E005EB142 /* ai_dmnet.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD3814D12F4E005EB142 /* ai_dmnet.c */; };
+		2711BD7B14D12F4E005EB142 /* ai_dmq3.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD3A14D12F4E005EB142 /* ai_dmq3.c */; };
+		2711BD7D14D12F4E005EB142 /* ai_main.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD3C14D12F4E005EB142 /* ai_main.c */; };
+		2711BD7F14D12F4E005EB142 /* ai_team.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD3E14D12F4E005EB142 /* ai_team.c */; };
+		2711BD8114D12F4E005EB142 /* ai_vcmd.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD4014D12F4E005EB142 /* ai_vcmd.c */; };
+		2711BD8E14D12F4E005EB142 /* bg_misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD4D14D12F4E005EB142 /* bg_misc.c */; };
+		2711BD8F14D12F4E005EB142 /* bg_pmove.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD4E14D12F4E005EB142 /* bg_pmove.c */; };
+		2711BD9114D12F4E005EB142 /* bg_slidemove.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD5014D12F4E005EB142 /* bg_slidemove.c */; };
+		2711BD9414D12F4E005EB142 /* g_active.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD5314D12F4E005EB142 /* g_active.c */; };
+		2711BD9514D12F4E005EB142 /* g_arenas.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD5414D12F4E005EB142 /* g_arenas.c */; };
+		2711BD9614D12F4E005EB142 /* g_bot.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD5514D12F4E005EB142 /* g_bot.c */; };
+		2711BD9714D12F4E005EB142 /* g_client.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD5614D12F4E005EB142 /* g_client.c */; };
+		2711BD9814D12F4E005EB142 /* g_cmds.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD5714D12F4E005EB142 /* g_cmds.c */; };
+		2711BD9914D12F4E005EB142 /* g_combat.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD5814D12F4E005EB142 /* g_combat.c */; };
+		2711BD9A14D12F4E005EB142 /* g_items.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD5914D12F4E005EB142 /* g_items.c */; };
+		2711BD9C14D12F4E005EB142 /* g_main.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD5B14D12F4E005EB142 /* g_main.c */; };
+		2711BD9D14D12F4E005EB142 /* g_mem.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD5C14D12F4E005EB142 /* g_mem.c */; };
+		2711BD9E14D12F4E005EB142 /* g_misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD5D14D12F4E005EB142 /* g_misc.c */; };
+		2711BD9F14D12F4E005EB142 /* g_missile.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD5E14D12F4E005EB142 /* g_missile.c */; };
+		2711BDA014D12F4E005EB142 /* g_mover.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD5F14D12F4E005EB142 /* g_mover.c */; };
+		2711BDA414D12F4E005EB142 /* g_session.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD6314D12F4E005EB142 /* g_session.c */; };
+		2711BDA514D12F4E005EB142 /* g_spawn.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD6414D12F4E005EB142 /* g_spawn.c */; };
+		2711BDA614D12F4E005EB142 /* g_svcmds.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD6514D12F4E005EB142 /* g_svcmds.c */; };
+		2711BDA814D12F4E005EB142 /* g_syscalls.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD6714D12F4E005EB142 /* g_syscalls.c */; };
+		2711BDA914D12F4E005EB142 /* g_target.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD6814D12F4E005EB142 /* g_target.c */; };
+		2711BDAA14D12F4E005EB142 /* g_team.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD6914D12F4E005EB142 /* g_team.c */; };
+		2711BDAC14D12F4E005EB142 /* g_trigger.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD6B14D12F4E005EB142 /* g_trigger.c */; };
+		2711BDAD14D12F4E005EB142 /* g_utils.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD6C14D12F4E005EB142 /* g_utils.c */; };
+		2711BDAE14D12F4E005EB142 /* g_weapon.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD6D14D12F4E005EB142 /* g_weapon.c */; };
+		2711BDB114D12F4E005EB142 /* q_math.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD7014D12F4E005EB142 /* q_math.c */; };
+		2711BDB214D12F4E005EB142 /* q_shared.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD7114D12F4E005EB142 /* q_shared.c */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		2711BD3414D12F4E005EB142 /* ai_chat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ai_chat.c; sourceTree = "<group>"; };
+		2711BD3514D12F4E005EB142 /* ai_chat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ai_chat.h; sourceTree = "<group>"; };
+		2711BD3614D12F4E005EB142 /* ai_cmd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ai_cmd.c; sourceTree = "<group>"; };
+		2711BD3714D12F4E005EB142 /* ai_cmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ai_cmd.h; sourceTree = "<group>"; };
+		2711BD3814D12F4E005EB142 /* ai_dmnet.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ai_dmnet.c; sourceTree = "<group>"; };
+		2711BD3914D12F4E005EB142 /* ai_dmnet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ai_dmnet.h; sourceTree = "<group>"; };
+		2711BD3A14D12F4E005EB142 /* ai_dmq3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ai_dmq3.c; sourceTree = "<group>"; };
+		2711BD3B14D12F4E005EB142 /* ai_dmq3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ai_dmq3.h; sourceTree = "<group>"; };
+		2711BD3C14D12F4E005EB142 /* ai_main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ai_main.c; sourceTree = "<group>"; };
+		2711BD3D14D12F4E005EB142 /* ai_main.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ai_main.h; sourceTree = "<group>"; };
+		2711BD3E14D12F4E005EB142 /* ai_team.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ai_team.c; sourceTree = "<group>"; };
+		2711BD3F14D12F4E005EB142 /* ai_team.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ai_team.h; sourceTree = "<group>"; };
+		2711BD4014D12F4E005EB142 /* ai_vcmd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ai_vcmd.c; sourceTree = "<group>"; };
+		2711BD4114D12F4E005EB142 /* ai_vcmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ai_vcmd.h; sourceTree = "<group>"; };
+		2711BD4A14D12F4E005EB142 /* bg_lib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bg_lib.c; sourceTree = "<group>"; };
+		2711BD4B14D12F4E005EB142 /* bg_lib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bg_lib.h; sourceTree = "<group>"; };
+		2711BD4C14D12F4E005EB142 /* bg_local.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bg_local.h; sourceTree = "<group>"; };
+		2711BD4D14D12F4E005EB142 /* bg_misc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bg_misc.c; sourceTree = "<group>"; };
+		2711BD4E14D12F4E005EB142 /* bg_pmove.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bg_pmove.c; sourceTree = "<group>"; };
+		2711BD4F14D12F4E005EB142 /* bg_public.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bg_public.h; sourceTree = "<group>"; };
+		2711BD5014D12F4E005EB142 /* bg_slidemove.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bg_slidemove.c; sourceTree = "<group>"; };
+		2711BD5214D12F4E005EB142 /* chars.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chars.h; sourceTree = "<group>"; };
+		2711BD5314D12F4E005EB142 /* g_active.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g_active.c; sourceTree = "<group>"; };
+		2711BD5414D12F4E005EB142 /* g_arenas.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g_arenas.c; sourceTree = "<group>"; };
+		2711BD5514D12F4E005EB142 /* g_bot.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g_bot.c; sourceTree = "<group>"; };
+		2711BD5614D12F4E005EB142 /* g_client.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g_client.c; sourceTree = "<group>"; };
+		2711BD5714D12F4E005EB142 /* g_cmds.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g_cmds.c; sourceTree = "<group>"; };
+		2711BD5814D12F4E005EB142 /* g_combat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g_combat.c; sourceTree = "<group>"; };
+		2711BD5914D12F4E005EB142 /* g_items.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g_items.c; sourceTree = "<group>"; };
+		2711BD5A14D12F4E005EB142 /* g_local.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = g_local.h; sourceTree = "<group>"; };
+		2711BD5B14D12F4E005EB142 /* g_main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g_main.c; sourceTree = "<group>"; };
+		2711BD5C14D12F4E005EB142 /* g_mem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g_mem.c; sourceTree = "<group>"; };
+		2711BD5D14D12F4E005EB142 /* g_misc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g_misc.c; sourceTree = "<group>"; };
+		2711BD5E14D12F4E005EB142 /* g_missile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g_missile.c; sourceTree = "<group>"; };
+		2711BD5F14D12F4E005EB142 /* g_mover.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g_mover.c; sourceTree = "<group>"; };
+		2711BD6014D12F4E005EB142 /* g_public.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = g_public.h; sourceTree = "<group>"; };
+		2711BD6114D12F4E005EB142 /* g_rankings.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g_rankings.c; sourceTree = "<group>"; };
+		2711BD6214D12F4E005EB142 /* g_rankings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = g_rankings.h; sourceTree = "<group>"; };
+		2711BD6314D12F4E005EB142 /* g_session.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g_session.c; sourceTree = "<group>"; };
+		2711BD6414D12F4E005EB142 /* g_spawn.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g_spawn.c; sourceTree = "<group>"; };
+		2711BD6514D12F4E005EB142 /* g_svcmds.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g_svcmds.c; sourceTree = "<group>"; };
+		2711BD6614D12F4E005EB142 /* g_syscalls.asm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm.asm; path = g_syscalls.asm; sourceTree = "<group>"; };
+		2711BD6714D12F4E005EB142 /* g_syscalls.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g_syscalls.c; sourceTree = "<group>"; };
+		2711BD6814D12F4E005EB142 /* g_target.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g_target.c; sourceTree = "<group>"; };
+		2711BD6914D12F4E005EB142 /* g_team.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g_team.c; sourceTree = "<group>"; };
+		2711BD6A14D12F4E005EB142 /* g_team.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = g_team.h; sourceTree = "<group>"; };
+		2711BD6B14D12F4E005EB142 /* g_trigger.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g_trigger.c; sourceTree = "<group>"; };
+		2711BD6C14D12F4E005EB142 /* g_utils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g_utils.c; sourceTree = "<group>"; };
+		2711BD6D14D12F4E005EB142 /* g_weapon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g_weapon.c; sourceTree = "<group>"; };
+		2711BD6E14D12F4E005EB142 /* inv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = inv.h; sourceTree = "<group>"; };
+		2711BD6F14D12F4E005EB142 /* match.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = match.h; sourceTree = "<group>"; };
+		2711BD7014D12F4E005EB142 /* q_math.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = q_math.c; sourceTree = "<group>"; };
+		2711BD7114D12F4E005EB142 /* q_shared.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = q_shared.c; sourceTree = "<group>"; };
+		2711BD7214D12F4E005EB142 /* q_shared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = q_shared.h; sourceTree = "<group>"; };
+		2711BD7314D12F4E005EB142 /* surfaceflags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = surfaceflags.h; sourceTree = "<group>"; };
+		2711BD7414D12F4E005EB142 /* syn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = syn.h; sourceTree = "<group>"; };
+		273531B414D126C300EB7BD6 /* game.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = game.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		273531B114D126C300EB7BD6 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		2711BD3314D12F1A005EB142 /* game */ = {
+			isa = PBXGroup;
+			children = (
+				2711BD3414D12F4E005EB142 /* ai_chat.c */,
+				2711BD3514D12F4E005EB142 /* ai_chat.h */,
+				2711BD3614D12F4E005EB142 /* ai_cmd.c */,
+				2711BD3714D12F4E005EB142 /* ai_cmd.h */,
+				2711BD3814D12F4E005EB142 /* ai_dmnet.c */,
+				2711BD3914D12F4E005EB142 /* ai_dmnet.h */,
+				2711BD3A14D12F4E005EB142 /* ai_dmq3.c */,
+				2711BD3B14D12F4E005EB142 /* ai_dmq3.h */,
+				2711BD3C14D12F4E005EB142 /* ai_main.c */,
+				2711BD3D14D12F4E005EB142 /* ai_main.h */,
+				2711BD3E14D12F4E005EB142 /* ai_team.c */,
+				2711BD3F14D12F4E005EB142 /* ai_team.h */,
+				2711BD4014D12F4E005EB142 /* ai_vcmd.c */,
+				2711BD4114D12F4E005EB142 /* ai_vcmd.h */,
+				2711BD4A14D12F4E005EB142 /* bg_lib.c */,
+				2711BD4B14D12F4E005EB142 /* bg_lib.h */,
+				2711BD4C14D12F4E005EB142 /* bg_local.h */,
+				2711BD4D14D12F4E005EB142 /* bg_misc.c */,
+				2711BD4E14D12F4E005EB142 /* bg_pmove.c */,
+				2711BD4F14D12F4E005EB142 /* bg_public.h */,
+				2711BD5014D12F4E005EB142 /* bg_slidemove.c */,
+				2711BD5214D12F4E005EB142 /* chars.h */,
+				2711BD5314D12F4E005EB142 /* g_active.c */,
+				2711BD5414D12F4E005EB142 /* g_arenas.c */,
+				2711BD5514D12F4E005EB142 /* g_bot.c */,
+				2711BD5614D12F4E005EB142 /* g_client.c */,
+				2711BD5714D12F4E005EB142 /* g_cmds.c */,
+				2711BD5814D12F4E005EB142 /* g_combat.c */,
+				2711BD5914D12F4E005EB142 /* g_items.c */,
+				2711BD5A14D12F4E005EB142 /* g_local.h */,
+				2711BD5B14D12F4E005EB142 /* g_main.c */,
+				2711BD5C14D12F4E005EB142 /* g_mem.c */,
+				2711BD5D14D12F4E005EB142 /* g_misc.c */,
+				2711BD5E14D12F4E005EB142 /* g_missile.c */,
+				2711BD5F14D12F4E005EB142 /* g_mover.c */,
+				2711BD6014D12F4E005EB142 /* g_public.h */,
+				2711BD6114D12F4E005EB142 /* g_rankings.c */,
+				2711BD6214D12F4E005EB142 /* g_rankings.h */,
+				2711BD6314D12F4E005EB142 /* g_session.c */,
+				2711BD6414D12F4E005EB142 /* g_spawn.c */,
+				2711BD6514D12F4E005EB142 /* g_svcmds.c */,
+				2711BD6614D12F4E005EB142 /* g_syscalls.asm */,
+				2711BD6714D12F4E005EB142 /* g_syscalls.c */,
+				2711BD6814D12F4E005EB142 /* g_target.c */,
+				2711BD6914D12F4E005EB142 /* g_team.c */,
+				2711BD6A14D12F4E005EB142 /* g_team.h */,
+				2711BD6B14D12F4E005EB142 /* g_trigger.c */,
+				2711BD6C14D12F4E005EB142 /* g_utils.c */,
+				2711BD6D14D12F4E005EB142 /* g_weapon.c */,
+				2711BD6E14D12F4E005EB142 /* inv.h */,
+				2711BD6F14D12F4E005EB142 /* match.h */,
+				2711BD7414D12F4E005EB142 /* syn.h */,
+			);
+			path = game;
+			sourceTree = "<group>";
+		};
+		273531A914D126C300EB7BD6 = {
+			isa = PBXGroup;
+			children = (
+				273531BB14D126CB00EB7BD6 /* code */,
+				273531B514D126C300EB7BD6 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		273531B514D126C300EB7BD6 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				273531B414D126C300EB7BD6 /* game.dylib */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		273531BB14D126CB00EB7BD6 /* code */ = {
+			isa = PBXGroup;
+			children = (
+				2711BD3314D12F1A005EB142 /* game */,
+				27AACFDB178DF4180093DFC0 /* qcommon */,
+			);
+			name = code;
+			path = ../../code;
+			sourceTree = SOURCE_ROOT;
+		};
+		27AACFDB178DF4180093DFC0 /* qcommon */ = {
+			isa = PBXGroup;
+			children = (
+				2711BD7014D12F4E005EB142 /* q_math.c */,
+				2711BD7114D12F4E005EB142 /* q_shared.c */,
+				2711BD7214D12F4E005EB142 /* q_shared.h */,
+				2711BD7314D12F4E005EB142 /* surfaceflags.h */,
+			);
+			path = qcommon;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		273531B314D126C300EB7BD6 /* game */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 273531B814D126C300EB7BD6 /* Build configuration list for PBXNativeTarget "game" */;
+			buildPhases = (
+				273531B014D126C300EB7BD6 /* Sources */,
+				273531B114D126C300EB7BD6 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = game;
+			productName = game;
+			productReference = 273531B414D126C300EB7BD6 /* game.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		273531AB14D126C300EB7BD6 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				CLASSPREFIX = io;
+				LastUpgradeCheck = 0500;
+				ORGANIZATIONNAME = ioquake;
+			};
+			buildConfigurationList = 273531AE14D126C300EB7BD6 /* Build configuration list for PBXProject "game" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 273531A914D126C300EB7BD6;
+			productRefGroup = 273531B514D126C300EB7BD6 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				273531B314D126C300EB7BD6 /* game */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		273531B014D126C300EB7BD6 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2711BD7514D12F4E005EB142 /* ai_chat.c in Sources */,
+				2711BD7714D12F4E005EB142 /* ai_cmd.c in Sources */,
+				2711BD7914D12F4E005EB142 /* ai_dmnet.c in Sources */,
+				2711BD7B14D12F4E005EB142 /* ai_dmq3.c in Sources */,
+				2711BD7D14D12F4E005EB142 /* ai_main.c in Sources */,
+				2711BD7F14D12F4E005EB142 /* ai_team.c in Sources */,
+				2711BD8114D12F4E005EB142 /* ai_vcmd.c in Sources */,
+				2711BD8E14D12F4E005EB142 /* bg_misc.c in Sources */,
+				2711BD8F14D12F4E005EB142 /* bg_pmove.c in Sources */,
+				2711BD9114D12F4E005EB142 /* bg_slidemove.c in Sources */,
+				2711BD9414D12F4E005EB142 /* g_active.c in Sources */,
+				2711BD9514D12F4E005EB142 /* g_arenas.c in Sources */,
+				2711BD9614D12F4E005EB142 /* g_bot.c in Sources */,
+				2711BD9714D12F4E005EB142 /* g_client.c in Sources */,
+				2711BD9814D12F4E005EB142 /* g_cmds.c in Sources */,
+				2711BD9914D12F4E005EB142 /* g_combat.c in Sources */,
+				2711BD9A14D12F4E005EB142 /* g_items.c in Sources */,
+				2711BD9C14D12F4E005EB142 /* g_main.c in Sources */,
+				2711BD9D14D12F4E005EB142 /* g_mem.c in Sources */,
+				2711BD9E14D12F4E005EB142 /* g_misc.c in Sources */,
+				2711BD9F14D12F4E005EB142 /* g_missile.c in Sources */,
+				2711BDA014D12F4E005EB142 /* g_mover.c in Sources */,
+				2711BDA414D12F4E005EB142 /* g_session.c in Sources */,
+				2711BDA514D12F4E005EB142 /* g_spawn.c in Sources */,
+				2711BDA614D12F4E005EB142 /* g_svcmds.c in Sources */,
+				2711BDA814D12F4E005EB142 /* g_syscalls.c in Sources */,
+				2711BDA914D12F4E005EB142 /* g_target.c in Sources */,
+				2711BDAA14D12F4E005EB142 /* g_team.c in Sources */,
+				2711BDAC14D12F4E005EB142 /* g_trigger.c in Sources */,
+				2711BDAD14D12F4E005EB142 /* g_utils.c in Sources */,
+				2711BDAE14D12F4E005EB142 /* g_weapon.c in Sources */,
+				2711BDB114D12F4E005EB142 /* q_math.c in Sources */,
+				2711BDB214D12F4E005EB142 /* q_shared.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		273531B614D126C300EB7BD6 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		273531B714D126C300EB7BD6 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		273531B914D126C300EB7BD6 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				EXECUTABLE_PREFIX = "";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		273531BA14D126C300EB7BD6 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				EXECUTABLE_PREFIX = "";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		273531AE14D126C300EB7BD6 /* Build configuration list for PBXProject "game" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				273531B614D126C300EB7BD6 /* Debug */,
+				273531B714D126C300EB7BD6 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		273531B814D126C300EB7BD6 /* Build configuration list for PBXNativeTarget "game" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				273531B914D126C300EB7BD6 /* Debug */,
+				273531BA14D126C300EB7BD6 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 273531AB14D126C300EB7BD6 /* Project object */;
+}
--- a/misc/xcode/ioquake3-Info.plist
+++ b/misc/xcode/ioquake3-Info.plist
@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string>quake3_flat</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.ioquake3.${PRODUCT_NAME:rfc1034identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.36</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>3cd8b49-2013-07-17</string>
+	<key>CGDisableCoalescedUpdates</key>
+	<true/>
+	<key>LSMinimumSystemVersion</key>
+	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>QUAKE III ARENA Copyright © 1999-2000 id Software, Inc. All rights reserved.</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>
--- a/misc/xcode/ioquake3-Prefix.pch
+++ b/misc/xcode/ioquake3-Prefix.pch
@ -0,0 +1,7 @@
+//
+// Prefix header for all source files of the 'quake3' target in the 'quake3' project
+//
+
+#ifdef __OBJC__
+	#import <Cocoa/Cocoa.h>
+#endif
--- a/misc/xcode/ioquake3.xcodeproj/project.pbxproj
+++ b/misc/xcode/ioquake3.xcodeproj/project.pbxproj
--- a/misc/xcode/ioquake3.xcworkspace/contents.xcworkspacedata
+++ b/misc/xcode/ioquake3.xcworkspace/contents.xcworkspacedata
@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:cgame.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:game.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:q3_ui.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:ui.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:renderer_opengl1.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:renderer_opengl2.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:botlib.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:jpeg8.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:speex.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "container:ioquake3.xcodeproj">
+   </FileRef>
+</Workspace>
--- a/misc/xcode/ioquake3.xcworkspace/xcshareddata/xcschemes/all
+++ b/misc/xcode/ioquake3.xcworkspace/xcshareddata/xcschemes/all
@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0460"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "2735319414D125FD00EB7BD6"
+               BuildableName = "cgame.dylib"
+               BlueprintName = "cgame"
+               ReferencedContainer = "container:cgame.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "273531B314D126C300EB7BD6"
+               BuildableName = "game.dylib"
+               BlueprintName = "game"
+               ReferencedContainer = "container:game.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "273531C614D1270700EB7BD6"
+               BuildableName = "q3_ui.dylib"
+               BlueprintName = "q3_ui"
+               ReferencedContainer = "container:q3_ui.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "273531D814D1272300EB7BD6"
+               BuildableName = "ui.dylib"
+               BlueprintName = "ui"
+               ReferencedContainer = "container:ui.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
--- a/misc/xcode/ioquake3.xcworkspace/xcshareddata/xcschemes/all
+++ b/misc/xcode/ioquake3.xcworkspace/xcshareddata/xcschemes/all
@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0460"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "2735319414D125FD00EB7BD6"
+               BuildableName = "cgame.dylib"
+               BlueprintName = "cgame"
+               ReferencedContainer = "container:cgame.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "273531B314D126C300EB7BD6"
+               BuildableName = "game.dylib"
+               BlueprintName = "game"
+               ReferencedContainer = "container:game.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "273531C614D1270700EB7BD6"
+               BuildableName = "q3_ui.dylib"
+               BlueprintName = "q3_ui"
+               ReferencedContainer = "container:q3_ui.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "273531D814D1272300EB7BD6"
+               BuildableName = "ui.dylib"
+               BlueprintName = "ui"
+               ReferencedContainer = "container:ui.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "274FAC0C178FAEFC00B17C7A"
+               BuildableName = "renderer_opengl1.dylib"
+               BlueprintName = "renderer_opengl1"
+               ReferencedContainer = "container:renderer_opengl1.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "274FAC1C178FAF0C00B17C7A"
+               BuildableName = "renderer_opengl2.dylib"
+               BlueprintName = "renderer_opengl2"
+               ReferencedContainer = "container:renderer_opengl2.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "2735306514D11F8B00EB7BD6"
+               BuildableName = "botlib.a"
+               BlueprintName = "botlib"
+               ReferencedContainer = "container:botlib.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "2737EBE114D13F2300675E9F"
+               BuildableName = "libjpeg8.a"
+               BlueprintName = "jpeg8"
+               ReferencedContainer = "container:jpeg8.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "2758BA56179059C1007F6582"
+               BuildableName = "libspeex.a"
+               BlueprintName = "speex"
+               ReferencedContainer = "container:speex.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "273531EA14D1275D00EB7BD6"
+               BuildableName = "ioquake3.app"
+               BlueprintName = "ioquake3"
+               ReferencedContainer = "container:ioquake3.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
--- a/misc/xcode/jpeg8.xcodeproj/project.pbxproj
+++ b/misc/xcode/jpeg8.xcodeproj/project.pbxproj
@ -0,0 +1,425 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		274FABC6178FAB9600B17C7A /* jaricom.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAB8F178FAB9600B17C7A /* jaricom.c */; };
+		274FABC7178FAB9600B17C7A /* jcapimin.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAB90178FAB9600B17C7A /* jcapimin.c */; };
+		274FABC8178FAB9600B17C7A /* jcapistd.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAB91178FAB9600B17C7A /* jcapistd.c */; };
+		274FABC9178FAB9600B17C7A /* jcarith.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAB92178FAB9600B17C7A /* jcarith.c */; };
+		274FABCA178FAB9600B17C7A /* jccoefct.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAB93178FAB9600B17C7A /* jccoefct.c */; };
+		274FABCB178FAB9600B17C7A /* jccolor.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAB94178FAB9600B17C7A /* jccolor.c */; };
+		274FABCC178FAB9600B17C7A /* jcdctmgr.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAB95178FAB9600B17C7A /* jcdctmgr.c */; };
+		274FABCD178FAB9600B17C7A /* jchuff.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAB96178FAB9600B17C7A /* jchuff.c */; };
+		274FABCE178FAB9600B17C7A /* jcinit.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAB97178FAB9600B17C7A /* jcinit.c */; };
+		274FABCF178FAB9600B17C7A /* jcmainct.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAB98178FAB9600B17C7A /* jcmainct.c */; };
+		274FABD0178FAB9600B17C7A /* jcmarker.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAB99178FAB9600B17C7A /* jcmarker.c */; };
+		274FABD1178FAB9600B17C7A /* jcmaster.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAB9A178FAB9600B17C7A /* jcmaster.c */; };
+		274FABD2178FAB9600B17C7A /* jcomapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAB9B178FAB9600B17C7A /* jcomapi.c */; };
+		274FABD4178FAB9600B17C7A /* jcparam.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAB9D178FAB9600B17C7A /* jcparam.c */; };
+		274FABD5178FAB9600B17C7A /* jcprepct.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAB9E178FAB9600B17C7A /* jcprepct.c */; };
+		274FABD6178FAB9600B17C7A /* jcsample.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAB9F178FAB9600B17C7A /* jcsample.c */; };
+		274FABD7178FAB9600B17C7A /* jctrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABA0178FAB9600B17C7A /* jctrans.c */; };
+		274FABD8178FAB9600B17C7A /* jdapimin.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABA1178FAB9600B17C7A /* jdapimin.c */; };
+		274FABD9178FAB9600B17C7A /* jdapistd.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABA2178FAB9600B17C7A /* jdapistd.c */; };
+		274FABDA178FAB9600B17C7A /* jdarith.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABA3178FAB9600B17C7A /* jdarith.c */; };
+		274FABDB178FAB9600B17C7A /* jdatadst.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABA4178FAB9600B17C7A /* jdatadst.c */; };
+		274FABDC178FAB9600B17C7A /* jdatasrc.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABA5178FAB9600B17C7A /* jdatasrc.c */; };
+		274FABDD178FAB9600B17C7A /* jdcoefct.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABA6178FAB9600B17C7A /* jdcoefct.c */; };
+		274FABDE178FAB9600B17C7A /* jdcolor.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABA7178FAB9600B17C7A /* jdcolor.c */; };
+		274FABE0178FAB9600B17C7A /* jddctmgr.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABA9178FAB9600B17C7A /* jddctmgr.c */; };
+		274FABE1178FAB9600B17C7A /* jdhuff.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABAA178FAB9600B17C7A /* jdhuff.c */; };
+		274FABE2178FAB9600B17C7A /* jdinput.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABAB178FAB9600B17C7A /* jdinput.c */; };
+		274FABE3178FAB9600B17C7A /* jdmainct.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABAC178FAB9600B17C7A /* jdmainct.c */; };
+		274FABE4178FAB9600B17C7A /* jdmarker.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABAD178FAB9600B17C7A /* jdmarker.c */; };
+		274FABE5178FAB9600B17C7A /* jdmaster.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABAE178FAB9600B17C7A /* jdmaster.c */; };
+		274FABE6178FAB9600B17C7A /* jdmerge.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABAF178FAB9600B17C7A /* jdmerge.c */; };
+		274FABE7178FAB9600B17C7A /* jdpostct.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABB0178FAB9600B17C7A /* jdpostct.c */; };
+		274FABE8178FAB9600B17C7A /* jdsample.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABB1178FAB9600B17C7A /* jdsample.c */; };
+		274FABE9178FAB9600B17C7A /* jdtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABB2178FAB9600B17C7A /* jdtrans.c */; };
+		274FABEA178FAB9600B17C7A /* jerror.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABB3178FAB9600B17C7A /* jerror.c */; };
+		274FABEC178FAB9600B17C7A /* jfdctflt.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABB5178FAB9600B17C7A /* jfdctflt.c */; };
+		274FABED178FAB9600B17C7A /* jfdctfst.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABB6178FAB9600B17C7A /* jfdctfst.c */; };
+		274FABEE178FAB9700B17C7A /* jfdctint.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABB7178FAB9600B17C7A /* jfdctint.c */; };
+		274FABEF178FAB9700B17C7A /* jidctflt.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABB8178FAB9600B17C7A /* jidctflt.c */; };
+		274FABF0178FAB9700B17C7A /* jidctfst.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABB9178FAB9600B17C7A /* jidctfst.c */; };
+		274FABF1178FAB9700B17C7A /* jidctint.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABBA178FAB9600B17C7A /* jidctint.c */; };
+		274FABF3178FAB9700B17C7A /* jmemmgr.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABBC178FAB9600B17C7A /* jmemmgr.c */; };
+		274FABF4178FAB9700B17C7A /* jmemnobs.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABBD178FAB9600B17C7A /* jmemnobs.c */; };
+		274FABF9178FAB9700B17C7A /* jquant1.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABC2178FAB9600B17C7A /* jquant1.c */; };
+		274FABFA178FAB9700B17C7A /* jquant2.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABC3178FAB9600B17C7A /* jquant2.c */; };
+		274FABFB178FAB9700B17C7A /* jutils.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FABC4178FAB9600B17C7A /* jutils.c */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		2737EBE214D13F2300675E9F /* libjpeg8.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libjpeg8.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		274FAB8F178FAB9600B17C7A /* jaricom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jaricom.c; sourceTree = "<group>"; };
+		274FAB90178FAB9600B17C7A /* jcapimin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jcapimin.c; sourceTree = "<group>"; };
+		274FAB91178FAB9600B17C7A /* jcapistd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jcapistd.c; sourceTree = "<group>"; };
+		274FAB92178FAB9600B17C7A /* jcarith.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jcarith.c; sourceTree = "<group>"; };
+		274FAB93178FAB9600B17C7A /* jccoefct.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jccoefct.c; sourceTree = "<group>"; };
+		274FAB94178FAB9600B17C7A /* jccolor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jccolor.c; sourceTree = "<group>"; };
+		274FAB95178FAB9600B17C7A /* jcdctmgr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jcdctmgr.c; sourceTree = "<group>"; };
+		274FAB96178FAB9600B17C7A /* jchuff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jchuff.c; sourceTree = "<group>"; };
+		274FAB97178FAB9600B17C7A /* jcinit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jcinit.c; sourceTree = "<group>"; };
+		274FAB98178FAB9600B17C7A /* jcmainct.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jcmainct.c; sourceTree = "<group>"; };
+		274FAB99178FAB9600B17C7A /* jcmarker.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jcmarker.c; sourceTree = "<group>"; };
+		274FAB9A178FAB9600B17C7A /* jcmaster.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jcmaster.c; sourceTree = "<group>"; };
+		274FAB9B178FAB9600B17C7A /* jcomapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jcomapi.c; sourceTree = "<group>"; };
+		274FAB9C178FAB9600B17C7A /* jconfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jconfig.h; sourceTree = "<group>"; };
+		274FAB9D178FAB9600B17C7A /* jcparam.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jcparam.c; sourceTree = "<group>"; };
+		274FAB9E178FAB9600B17C7A /* jcprepct.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jcprepct.c; sourceTree = "<group>"; };
+		274FAB9F178FAB9600B17C7A /* jcsample.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jcsample.c; sourceTree = "<group>"; };
+		274FABA0178FAB9600B17C7A /* jctrans.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jctrans.c; sourceTree = "<group>"; };
+		274FABA1178FAB9600B17C7A /* jdapimin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jdapimin.c; sourceTree = "<group>"; };
+		274FABA2178FAB9600B17C7A /* jdapistd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jdapistd.c; sourceTree = "<group>"; };
+		274FABA3178FAB9600B17C7A /* jdarith.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jdarith.c; sourceTree = "<group>"; };
+		274FABA4178FAB9600B17C7A /* jdatadst.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jdatadst.c; sourceTree = "<group>"; };
+		274FABA5178FAB9600B17C7A /* jdatasrc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jdatasrc.c; sourceTree = "<group>"; };
+		274FABA6178FAB9600B17C7A /* jdcoefct.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jdcoefct.c; sourceTree = "<group>"; };
+		274FABA7178FAB9600B17C7A /* jdcolor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jdcolor.c; sourceTree = "<group>"; };
+		274FABA8178FAB9600B17C7A /* jdct.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jdct.h; sourceTree = "<group>"; };
+		274FABA9178FAB9600B17C7A /* jddctmgr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jddctmgr.c; sourceTree = "<group>"; };
+		274FABAA178FAB9600B17C7A /* jdhuff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jdhuff.c; sourceTree = "<group>"; };
+		274FABAB178FAB9600B17C7A /* jdinput.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jdinput.c; sourceTree = "<group>"; };
+		274FABAC178FAB9600B17C7A /* jdmainct.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jdmainct.c; sourceTree = "<group>"; };
+		274FABAD178FAB9600B17C7A /* jdmarker.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jdmarker.c; sourceTree = "<group>"; };
+		274FABAE178FAB9600B17C7A /* jdmaster.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jdmaster.c; sourceTree = "<group>"; };
+		274FABAF178FAB9600B17C7A /* jdmerge.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jdmerge.c; sourceTree = "<group>"; };
+		274FABB0178FAB9600B17C7A /* jdpostct.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jdpostct.c; sourceTree = "<group>"; };
+		274FABB1178FAB9600B17C7A /* jdsample.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jdsample.c; sourceTree = "<group>"; };
+		274FABB2178FAB9600B17C7A /* jdtrans.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jdtrans.c; sourceTree = "<group>"; };
+		274FABB3178FAB9600B17C7A /* jerror.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jerror.c; sourceTree = "<group>"; };
+		274FABB4178FAB9600B17C7A /* jerror.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jerror.h; sourceTree = "<group>"; };
+		274FABB5178FAB9600B17C7A /* jfdctflt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jfdctflt.c; sourceTree = "<group>"; };
+		274FABB6178FAB9600B17C7A /* jfdctfst.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jfdctfst.c; sourceTree = "<group>"; };
+		274FABB7178FAB9600B17C7A /* jfdctint.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jfdctint.c; sourceTree = "<group>"; };
+		274FABB8178FAB9600B17C7A /* jidctflt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jidctflt.c; sourceTree = "<group>"; };
+		274FABB9178FAB9600B17C7A /* jidctfst.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jidctfst.c; sourceTree = "<group>"; };
+		274FABBA178FAB9600B17C7A /* jidctint.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jidctint.c; sourceTree = "<group>"; };
+		274FABBB178FAB9600B17C7A /* jinclude.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jinclude.h; sourceTree = "<group>"; };
+		274FABBC178FAB9600B17C7A /* jmemmgr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jmemmgr.c; sourceTree = "<group>"; };
+		274FABBD178FAB9600B17C7A /* jmemnobs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jmemnobs.c; sourceTree = "<group>"; };
+		274FABBE178FAB9600B17C7A /* jmemsys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jmemsys.h; sourceTree = "<group>"; };
+		274FABBF178FAB9600B17C7A /* jmorecfg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jmorecfg.h; sourceTree = "<group>"; };
+		274FABC0178FAB9600B17C7A /* jpegint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jpegint.h; sourceTree = "<group>"; };
+		274FABC1178FAB9600B17C7A /* jpeglib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jpeglib.h; sourceTree = "<group>"; };
+		274FABC2178FAB9600B17C7A /* jquant1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jquant1.c; sourceTree = "<group>"; };
+		274FABC3178FAB9600B17C7A /* jquant2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jquant2.c; sourceTree = "<group>"; };
+		274FABC4178FAB9600B17C7A /* jutils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jutils.c; sourceTree = "<group>"; };
+		274FABC5178FAB9600B17C7A /* jversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jversion.h; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		2737EBDF14D13F2300675E9F /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		2737EBD714D13F2300675E9F = {
+			isa = PBXGroup;
+			children = (
+				2737EBE914D13F3000675E9F /* code */,
+				2737EBE314D13F2300675E9F /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		2737EBE314D13F2300675E9F /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				2737EBE214D13F2300675E9F /* libjpeg8.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		2737EBE914D13F3000675E9F /* code */ = {
+			isa = PBXGroup;
+			children = (
+				2737EBEE14D13F5900675E9F /* jpeg-8c */,
+			);
+			name = code;
+			path = ../../code;
+			sourceTree = SOURCE_ROOT;
+		};
+		2737EBEE14D13F5900675E9F /* jpeg-8c */ = {
+			isa = PBXGroup;
+			children = (
+				274FAB8F178FAB9600B17C7A /* jaricom.c */,
+				274FAB90178FAB9600B17C7A /* jcapimin.c */,
+				274FAB91178FAB9600B17C7A /* jcapistd.c */,
+				274FAB92178FAB9600B17C7A /* jcarith.c */,
+				274FAB93178FAB9600B17C7A /* jccoefct.c */,
+				274FAB94178FAB9600B17C7A /* jccolor.c */,
+				274FAB95178FAB9600B17C7A /* jcdctmgr.c */,
+				274FAB96178FAB9600B17C7A /* jchuff.c */,
+				274FAB97178FAB9600B17C7A /* jcinit.c */,
+				274FAB98178FAB9600B17C7A /* jcmainct.c */,
+				274FAB99178FAB9600B17C7A /* jcmarker.c */,
+				274FAB9A178FAB9600B17C7A /* jcmaster.c */,
+				274FAB9B178FAB9600B17C7A /* jcomapi.c */,
+				274FAB9C178FAB9600B17C7A /* jconfig.h */,
+				274FAB9D178FAB9600B17C7A /* jcparam.c */,
+				274FAB9E178FAB9600B17C7A /* jcprepct.c */,
+				274FAB9F178FAB9600B17C7A /* jcsample.c */,
+				274FABA0178FAB9600B17C7A /* jctrans.c */,
+				274FABA1178FAB9600B17C7A /* jdapimin.c */,
+				274FABA2178FAB9600B17C7A /* jdapistd.c */,
+				274FABA3178FAB9600B17C7A /* jdarith.c */,
+				274FABA4178FAB9600B17C7A /* jdatadst.c */,
+				274FABA5178FAB9600B17C7A /* jdatasrc.c */,
+				274FABA6178FAB9600B17C7A /* jdcoefct.c */,
+				274FABA7178FAB9600B17C7A /* jdcolor.c */,
+				274FABA8178FAB9600B17C7A /* jdct.h */,
+				274FABA9178FAB9600B17C7A /* jddctmgr.c */,
+				274FABAA178FAB9600B17C7A /* jdhuff.c */,
+				274FABAB178FAB9600B17C7A /* jdinput.c */,
+				274FABAC178FAB9600B17C7A /* jdmainct.c */,
+				274FABAD178FAB9600B17C7A /* jdmarker.c */,
+				274FABAE178FAB9600B17C7A /* jdmaster.c */,
+				274FABAF178FAB9600B17C7A /* jdmerge.c */,
+				274FABB0178FAB9600B17C7A /* jdpostct.c */,
+				274FABB1178FAB9600B17C7A /* jdsample.c */,
+				274FABB2178FAB9600B17C7A /* jdtrans.c */,
+				274FABB3178FAB9600B17C7A /* jerror.c */,
+				274FABB4178FAB9600B17C7A /* jerror.h */,
+				274FABB5178FAB9600B17C7A /* jfdctflt.c */,
+				274FABB6178FAB9600B17C7A /* jfdctfst.c */,
+				274FABB7178FAB9600B17C7A /* jfdctint.c */,
+				274FABB8178FAB9600B17C7A /* jidctflt.c */,
+				274FABB9178FAB9600B17C7A /* jidctfst.c */,
+				274FABBA178FAB9600B17C7A /* jidctint.c */,
+				274FABBB178FAB9600B17C7A /* jinclude.h */,
+				274FABBC178FAB9600B17C7A /* jmemmgr.c */,
+				274FABBD178FAB9600B17C7A /* jmemnobs.c */,
+				274FABBE178FAB9600B17C7A /* jmemsys.h */,
+				274FABBF178FAB9600B17C7A /* jmorecfg.h */,
+				274FABC0178FAB9600B17C7A /* jpegint.h */,
+				274FABC1178FAB9600B17C7A /* jpeglib.h */,
+				274FABC2178FAB9600B17C7A /* jquant1.c */,
+				274FABC3178FAB9600B17C7A /* jquant2.c */,
+				274FABC4178FAB9600B17C7A /* jutils.c */,
+				274FABC5178FAB9600B17C7A /* jversion.h */,
+			);
+			path = "jpeg-8c";
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		2737EBE114D13F2300675E9F /* jpeg8 */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 2737EBE614D13F2300675E9F /* Build configuration list for PBXNativeTarget "jpeg8" */;
+			buildPhases = (
+				2737EBDE14D13F2300675E9F /* Sources */,
+				2737EBDF14D13F2300675E9F /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = jpeg8;
+			productName = jpeg6;
+			productReference = 2737EBE214D13F2300675E9F /* libjpeg8.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		2737EBD914D13F2300675E9F /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				CLASSPREFIX = io;
+				LastUpgradeCheck = 0500;
+				ORGANIZATIONNAME = ioquake;
+			};
+			buildConfigurationList = 2737EBDC14D13F2300675E9F /* Build configuration list for PBXProject "jpeg8" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 2737EBD714D13F2300675E9F;
+			productRefGroup = 2737EBE314D13F2300675E9F /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				2737EBE114D13F2300675E9F /* jpeg8 */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		2737EBDE14D13F2300675E9F /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				274FABC6178FAB9600B17C7A /* jaricom.c in Sources */,
+				274FABC7178FAB9600B17C7A /* jcapimin.c in Sources */,
+				274FABC8178FAB9600B17C7A /* jcapistd.c in Sources */,
+				274FABC9178FAB9600B17C7A /* jcarith.c in Sources */,
+				274FABCA178FAB9600B17C7A /* jccoefct.c in Sources */,
+				274FABCB178FAB9600B17C7A /* jccolor.c in Sources */,
+				274FABCC178FAB9600B17C7A /* jcdctmgr.c in Sources */,
+				274FABCD178FAB9600B17C7A /* jchuff.c in Sources */,
+				274FABCE178FAB9600B17C7A /* jcinit.c in Sources */,
+				274FABCF178FAB9600B17C7A /* jcmainct.c in Sources */,
+				274FABD0178FAB9600B17C7A /* jcmarker.c in Sources */,
+				274FABD1178FAB9600B17C7A /* jcmaster.c in Sources */,
+				274FABD2178FAB9600B17C7A /* jcomapi.c in Sources */,
+				274FABD4178FAB9600B17C7A /* jcparam.c in Sources */,
+				274FABD5178FAB9600B17C7A /* jcprepct.c in Sources */,
+				274FABD6178FAB9600B17C7A /* jcsample.c in Sources */,
+				274FABD7178FAB9600B17C7A /* jctrans.c in Sources */,
+				274FABD8178FAB9600B17C7A /* jdapimin.c in Sources */,
+				274FABD9178FAB9600B17C7A /* jdapistd.c in Sources */,
+				274FABDA178FAB9600B17C7A /* jdarith.c in Sources */,
+				274FABDB178FAB9600B17C7A /* jdatadst.c in Sources */,
+				274FABDC178FAB9600B17C7A /* jdatasrc.c in Sources */,
+				274FABDD178FAB9600B17C7A /* jdcoefct.c in Sources */,
+				274FABDE178FAB9600B17C7A /* jdcolor.c in Sources */,
+				274FABE0178FAB9600B17C7A /* jddctmgr.c in Sources */,
+				274FABE1178FAB9600B17C7A /* jdhuff.c in Sources */,
+				274FABE2178FAB9600B17C7A /* jdinput.c in Sources */,
+				274FABE3178FAB9600B17C7A /* jdmainct.c in Sources */,
+				274FABE4178FAB9600B17C7A /* jdmarker.c in Sources */,
+				274FABE5178FAB9600B17C7A /* jdmaster.c in Sources */,
+				274FABE6178FAB9600B17C7A /* jdmerge.c in Sources */,
+				274FABE7178FAB9600B17C7A /* jdpostct.c in Sources */,
+				274FABE8178FAB9600B17C7A /* jdsample.c in Sources */,
+				274FABE9178FAB9600B17C7A /* jdtrans.c in Sources */,
+				274FABEA178FAB9600B17C7A /* jerror.c in Sources */,
+				274FABEC178FAB9600B17C7A /* jfdctflt.c in Sources */,
+				274FABED178FAB9600B17C7A /* jfdctfst.c in Sources */,
+				274FABEE178FAB9700B17C7A /* jfdctint.c in Sources */,
+				274FABEF178FAB9700B17C7A /* jidctflt.c in Sources */,
+				274FABF0178FAB9700B17C7A /* jidctfst.c in Sources */,
+				274FABF1178FAB9700B17C7A /* jidctint.c in Sources */,
+				274FABF3178FAB9700B17C7A /* jmemmgr.c in Sources */,
+				274FABF4178FAB9700B17C7A /* jmemnobs.c in Sources */,
+				274FABF9178FAB9700B17C7A /* jquant1.c in Sources */,
+				274FABFA178FAB9700B17C7A /* jquant2.c in Sources */,
+				274FABFB178FAB9700B17C7A /* jutils.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		2737EBE414D13F2300675E9F /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = $SRCROOT/../macosx;
+				INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		2737EBE514D13F2300675E9F /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = $SRCROOT/../macosx;
+				INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		2737EBE714D13F2300675E9F /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				EXECUTABLE_PREFIX = lib;
+				PRODUCT_NAME = jpeg8;
+			};
+			name = Debug;
+		};
+		2737EBE814D13F2300675E9F /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				EXECUTABLE_PREFIX = lib;
+				PRODUCT_NAME = jpeg8;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		2737EBDC14D13F2300675E9F /* Build configuration list for PBXProject "jpeg8" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				2737EBE414D13F2300675E9F /* Debug */,
+				2737EBE514D13F2300675E9F /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		2737EBE614D13F2300675E9F /* Build configuration list for PBXNativeTarget "jpeg8" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				2737EBE714D13F2300675E9F /* Debug */,
+				2737EBE814D13F2300675E9F /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 2737EBD914D13F2300675E9F /* Project object */;
+}
--- a/misc/xcode/q3_ui.xcodeproj/project.pbxproj
+++ b/misc/xcode/q3_ui.xcodeproj/project.pbxproj
@ -0,0 +1,461 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		2711BDBC14D13007005EB142 /* ui_syscalls.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BDBB14D13007005EB142 /* ui_syscalls.c */; };
+		2772B7BB1790E7C6004CCF57 /* ui_addbots.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B78D1790E7C6004CCF57 /* ui_addbots.c */; };
+		2772B7BC1790E7C6004CCF57 /* ui_atoms.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B78E1790E7C6004CCF57 /* ui_atoms.c */; };
+		2772B7BD1790E7C6004CCF57 /* ui_cdkey.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B78F1790E7C6004CCF57 /* ui_cdkey.c */; };
+		2772B7BE1790E7C6004CCF57 /* ui_cinematics.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7901790E7C6004CCF57 /* ui_cinematics.c */; };
+		2772B7BF1790E7C6004CCF57 /* ui_confirm.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7911790E7C6004CCF57 /* ui_confirm.c */; };
+		2772B7C01790E7C6004CCF57 /* ui_connect.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7921790E7C6004CCF57 /* ui_connect.c */; };
+		2772B7C11790E7C6004CCF57 /* ui_controls2.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7931790E7C6004CCF57 /* ui_controls2.c */; };
+		2772B7C21790E7C6004CCF57 /* ui_credits.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7941790E7C6004CCF57 /* ui_credits.c */; };
+		2772B7C31790E7C6004CCF57 /* ui_demo2.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7951790E7C6004CCF57 /* ui_demo2.c */; };
+		2772B7C41790E7C6004CCF57 /* ui_display.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7961790E7C6004CCF57 /* ui_display.c */; };
+		2772B7C51790E7C6004CCF57 /* ui_gameinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7971790E7C6004CCF57 /* ui_gameinfo.c */; };
+		2772B7C61790E7C6004CCF57 /* ui_ingame.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7981790E7C6004CCF57 /* ui_ingame.c */; };
+		2772B7C71790E7C6004CCF57 /* ui_loadconfig.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7991790E7C6004CCF57 /* ui_loadconfig.c */; };
+		2772B7CA1790E7C6004CCF57 /* ui_main.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B79C1790E7C6004CCF57 /* ui_main.c */; };
+		2772B7CB1790E7C6004CCF57 /* ui_menu.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B79D1790E7C6004CCF57 /* ui_menu.c */; };
+		2772B7CC1790E7C6004CCF57 /* ui_mfield.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B79E1790E7C6004CCF57 /* ui_mfield.c */; };
+		2772B7CD1790E7C6004CCF57 /* ui_mods.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B79F1790E7C6004CCF57 /* ui_mods.c */; };
+		2772B7CE1790E7C6004CCF57 /* ui_network.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7A01790E7C6004CCF57 /* ui_network.c */; };
+		2772B7CF1790E7C6004CCF57 /* ui_options.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7A11790E7C6004CCF57 /* ui_options.c */; };
+		2772B7D01790E7C6004CCF57 /* ui_playermodel.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7A21790E7C6004CCF57 /* ui_playermodel.c */; };
+		2772B7D11790E7C6004CCF57 /* ui_players.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7A31790E7C6004CCF57 /* ui_players.c */; };
+		2772B7D21790E7C6004CCF57 /* ui_playersettings.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7A41790E7C6004CCF57 /* ui_playersettings.c */; };
+		2772B7D31790E7C6004CCF57 /* ui_preferences.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7A51790E7C6004CCF57 /* ui_preferences.c */; };
+		2772B7D41790E7C6004CCF57 /* ui_qmenu.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7A61790E7C6004CCF57 /* ui_qmenu.c */; };
+		2772B7D71790E7C6004CCF57 /* ui_removebots.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7A91790E7C6004CCF57 /* ui_removebots.c */; };
+		2772B7D81790E7C6004CCF57 /* ui_saveconfig.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7AA1790E7C6004CCF57 /* ui_saveconfig.c */; };
+		2772B7D91790E7C6004CCF57 /* ui_serverinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7AB1790E7C6004CCF57 /* ui_serverinfo.c */; };
+		2772B7DA1790E7C6004CCF57 /* ui_servers2.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7AC1790E7C6004CCF57 /* ui_servers2.c */; };
+		2772B7DB1790E7C6004CCF57 /* ui_setup.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7AD1790E7C6004CCF57 /* ui_setup.c */; };
+		2772B7DD1790E7C6004CCF57 /* ui_sound.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7AF1790E7C6004CCF57 /* ui_sound.c */; };
+		2772B7DE1790E7C6004CCF57 /* ui_sparena.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7B01790E7C6004CCF57 /* ui_sparena.c */; };
+		2772B7E01790E7C6004CCF57 /* ui_specifyserver.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7B21790E7C6004CCF57 /* ui_specifyserver.c */; };
+		2772B7E11790E7C6004CCF57 /* ui_splevel.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7B31790E7C6004CCF57 /* ui_splevel.c */; };
+		2772B7E21790E7C6004CCF57 /* ui_sppostgame.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7B41790E7C6004CCF57 /* ui_sppostgame.c */; };
+		2772B7E31790E7C6004CCF57 /* ui_spreset.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7B51790E7C6004CCF57 /* ui_spreset.c */; };
+		2772B7E41790E7C6004CCF57 /* ui_spskill.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7B61790E7C6004CCF57 /* ui_spskill.c */; };
+		2772B7E51790E7C6004CCF57 /* ui_startserver.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7B71790E7C6004CCF57 /* ui_startserver.c */; };
+		2772B7E61790E7C6004CCF57 /* ui_team.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7B81790E7C6004CCF57 /* ui_team.c */; };
+		2772B7E71790E7C6004CCF57 /* ui_teamorders.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7B91790E7C6004CCF57 /* ui_teamorders.c */; };
+		2772B7E81790E7C6004CCF57 /* ui_video.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7BA1790E7C6004CCF57 /* ui_video.c */; };
+		2772B7EC1790E800004CCF57 /* bg_lib.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7E91790E800004CCF57 /* bg_lib.c */; };
+		2772B7EE1790E800004CCF57 /* bg_misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7EB1790E800004CCF57 /* bg_misc.c */; };
+		2772B7F31790E835004CCF57 /* q_math.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7F01790E835004CCF57 /* q_math.c */; };
+		2772B7F41790E835004CCF57 /* q_shared.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7F11790E835004CCF57 /* q_shared.c */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		2711BDBB14D13007005EB142 /* ui_syscalls.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_syscalls.c; sourceTree = "<group>"; };
+		273531C714D1270700EB7BD6 /* q3_ui.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = q3_ui.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		2772B78D1790E7C6004CCF57 /* ui_addbots.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_addbots.c; sourceTree = "<group>"; };
+		2772B78E1790E7C6004CCF57 /* ui_atoms.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_atoms.c; sourceTree = "<group>"; };
+		2772B78F1790E7C6004CCF57 /* ui_cdkey.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_cdkey.c; sourceTree = "<group>"; };
+		2772B7901790E7C6004CCF57 /* ui_cinematics.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_cinematics.c; sourceTree = "<group>"; };
+		2772B7911790E7C6004CCF57 /* ui_confirm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_confirm.c; sourceTree = "<group>"; };
+		2772B7921790E7C6004CCF57 /* ui_connect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_connect.c; sourceTree = "<group>"; };
+		2772B7931790E7C6004CCF57 /* ui_controls2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_controls2.c; sourceTree = "<group>"; };
+		2772B7941790E7C6004CCF57 /* ui_credits.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_credits.c; sourceTree = "<group>"; };
+		2772B7951790E7C6004CCF57 /* ui_demo2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_demo2.c; sourceTree = "<group>"; };
+		2772B7961790E7C6004CCF57 /* ui_display.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_display.c; sourceTree = "<group>"; };
+		2772B7971790E7C6004CCF57 /* ui_gameinfo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_gameinfo.c; sourceTree = "<group>"; };
+		2772B7981790E7C6004CCF57 /* ui_ingame.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_ingame.c; sourceTree = "<group>"; };
+		2772B7991790E7C6004CCF57 /* ui_loadconfig.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_loadconfig.c; sourceTree = "<group>"; };
+		2772B79A1790E7C6004CCF57 /* ui_local.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ui_local.h; sourceTree = "<group>"; };
+		2772B79B1790E7C6004CCF57 /* ui_login.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_login.c; sourceTree = "<group>"; };
+		2772B79C1790E7C6004CCF57 /* ui_main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_main.c; sourceTree = "<group>"; };
+		2772B79D1790E7C6004CCF57 /* ui_menu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_menu.c; sourceTree = "<group>"; };
+		2772B79E1790E7C6004CCF57 /* ui_mfield.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_mfield.c; sourceTree = "<group>"; };
+		2772B79F1790E7C6004CCF57 /* ui_mods.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_mods.c; sourceTree = "<group>"; };
+		2772B7A01790E7C6004CCF57 /* ui_network.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_network.c; sourceTree = "<group>"; };
+		2772B7A11790E7C6004CCF57 /* ui_options.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_options.c; sourceTree = "<group>"; };
+		2772B7A21790E7C6004CCF57 /* ui_playermodel.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_playermodel.c; sourceTree = "<group>"; };
+		2772B7A31790E7C6004CCF57 /* ui_players.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_players.c; sourceTree = "<group>"; };
+		2772B7A41790E7C6004CCF57 /* ui_playersettings.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_playersettings.c; sourceTree = "<group>"; };
+		2772B7A51790E7C6004CCF57 /* ui_preferences.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_preferences.c; sourceTree = "<group>"; };
+		2772B7A61790E7C6004CCF57 /* ui_qmenu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_qmenu.c; sourceTree = "<group>"; };
+		2772B7A71790E7C6004CCF57 /* ui_rankings.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_rankings.c; sourceTree = "<group>"; };
+		2772B7A81790E7C6004CCF57 /* ui_rankstatus.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_rankstatus.c; sourceTree = "<group>"; };
+		2772B7A91790E7C6004CCF57 /* ui_removebots.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_removebots.c; sourceTree = "<group>"; };
+		2772B7AA1790E7C6004CCF57 /* ui_saveconfig.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_saveconfig.c; sourceTree = "<group>"; };
+		2772B7AB1790E7C6004CCF57 /* ui_serverinfo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_serverinfo.c; sourceTree = "<group>"; };
+		2772B7AC1790E7C6004CCF57 /* ui_servers2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_servers2.c; sourceTree = "<group>"; };
+		2772B7AD1790E7C6004CCF57 /* ui_setup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_setup.c; sourceTree = "<group>"; };
+		2772B7AE1790E7C6004CCF57 /* ui_signup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_signup.c; sourceTree = "<group>"; };
+		2772B7AF1790E7C6004CCF57 /* ui_sound.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_sound.c; sourceTree = "<group>"; };
+		2772B7B01790E7C6004CCF57 /* ui_sparena.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_sparena.c; sourceTree = "<group>"; };
+		2772B7B11790E7C6004CCF57 /* ui_specifyleague.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_specifyleague.c; sourceTree = "<group>"; };
+		2772B7B21790E7C6004CCF57 /* ui_specifyserver.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_specifyserver.c; sourceTree = "<group>"; };
+		2772B7B31790E7C6004CCF57 /* ui_splevel.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_splevel.c; sourceTree = "<group>"; };
+		2772B7B41790E7C6004CCF57 /* ui_sppostgame.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_sppostgame.c; sourceTree = "<group>"; };
+		2772B7B51790E7C6004CCF57 /* ui_spreset.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_spreset.c; sourceTree = "<group>"; };
+		2772B7B61790E7C6004CCF57 /* ui_spskill.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_spskill.c; sourceTree = "<group>"; };
+		2772B7B71790E7C6004CCF57 /* ui_startserver.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_startserver.c; sourceTree = "<group>"; };
+		2772B7B81790E7C6004CCF57 /* ui_team.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_team.c; sourceTree = "<group>"; };
+		2772B7B91790E7C6004CCF57 /* ui_teamorders.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_teamorders.c; sourceTree = "<group>"; };
+		2772B7BA1790E7C6004CCF57 /* ui_video.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_video.c; sourceTree = "<group>"; };
+		2772B7E91790E800004CCF57 /* bg_lib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bg_lib.c; sourceTree = "<group>"; };
+		2772B7EA1790E800004CCF57 /* bg_lib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bg_lib.h; sourceTree = "<group>"; };
+		2772B7EB1790E800004CCF57 /* bg_misc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bg_misc.c; sourceTree = "<group>"; };
+		2772B7F01790E835004CCF57 /* q_math.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = q_math.c; sourceTree = "<group>"; };
+		2772B7F11790E835004CCF57 /* q_shared.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = q_shared.c; sourceTree = "<group>"; };
+		2772B7F21790E835004CCF57 /* q_shared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = q_shared.h; sourceTree = "<group>"; };
+		2772B7F71790E865004CCF57 /* keycodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keycodes.h; sourceTree = "<group>"; };
+		2772B7F91790E904004CCF57 /* bg_public.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bg_public.h; sourceTree = "<group>"; };
+		2772B7FC1790E9B6004CCF57 /* tr_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tr_types.h; sourceTree = "<group>"; };
+		2772B7FE1790E9C5004CCF57 /* ui_public.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ui_public.h; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		273531C414D1270700EB7BD6 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		2711BDB614D12FCF005EB142 /* code */ = {
+			isa = PBXGroup;
+			children = (
+				2772B7F61790E851004CCF57 /* client */,
+				2711BDB914D12FE9005EB142 /* game */,
+				2711BDB814D12FE3005EB142 /* q3_ui */,
+				2772B7EF1790E819004CCF57 /* qcommon */,
+				2772B7FB1790E994004CCF57 /* renderercommon */,
+				2711BDB714D12FDD005EB142 /* ui */,
+			);
+			name = code;
+			path = ../../code;
+			sourceTree = SOURCE_ROOT;
+		};
+		2711BDB714D12FDD005EB142 /* ui */ = {
+			isa = PBXGroup;
+			children = (
+				2772B7FE1790E9C5004CCF57 /* ui_public.h */,
+				2711BDBB14D13007005EB142 /* ui_syscalls.c */,
+			);
+			path = ui;
+			sourceTree = "<group>";
+		};
+		2711BDB814D12FE3005EB142 /* q3_ui */ = {
+			isa = PBXGroup;
+			children = (
+				2772B78D1790E7C6004CCF57 /* ui_addbots.c */,
+				2772B78E1790E7C6004CCF57 /* ui_atoms.c */,
+				2772B78F1790E7C6004CCF57 /* ui_cdkey.c */,
+				2772B7901790E7C6004CCF57 /* ui_cinematics.c */,
+				2772B7911790E7C6004CCF57 /* ui_confirm.c */,
+				2772B7921790E7C6004CCF57 /* ui_connect.c */,
+				2772B7931790E7C6004CCF57 /* ui_controls2.c */,
+				2772B7941790E7C6004CCF57 /* ui_credits.c */,
+				2772B7951790E7C6004CCF57 /* ui_demo2.c */,
+				2772B7961790E7C6004CCF57 /* ui_display.c */,
+				2772B7971790E7C6004CCF57 /* ui_gameinfo.c */,
+				2772B7981790E7C6004CCF57 /* ui_ingame.c */,
+				2772B7991790E7C6004CCF57 /* ui_loadconfig.c */,
+				2772B79A1790E7C6004CCF57 /* ui_local.h */,
+				2772B79B1790E7C6004CCF57 /* ui_login.c */,
+				2772B79C1790E7C6004CCF57 /* ui_main.c */,
+				2772B79D1790E7C6004CCF57 /* ui_menu.c */,
+				2772B79E1790E7C6004CCF57 /* ui_mfield.c */,
+				2772B79F1790E7C6004CCF57 /* ui_mods.c */,
+				2772B7A01790E7C6004CCF57 /* ui_network.c */,
+				2772B7A11790E7C6004CCF57 /* ui_options.c */,
+				2772B7A21790E7C6004CCF57 /* ui_playermodel.c */,
+				2772B7A31790E7C6004CCF57 /* ui_players.c */,
+				2772B7A41790E7C6004CCF57 /* ui_playersettings.c */,
+				2772B7A51790E7C6004CCF57 /* ui_preferences.c */,
+				2772B7A61790E7C6004CCF57 /* ui_qmenu.c */,
+				2772B7A71790E7C6004CCF57 /* ui_rankings.c */,
+				2772B7A81790E7C6004CCF57 /* ui_rankstatus.c */,
+				2772B7A91790E7C6004CCF57 /* ui_removebots.c */,
+				2772B7AA1790E7C6004CCF57 /* ui_saveconfig.c */,
+				2772B7AB1790E7C6004CCF57 /* ui_serverinfo.c */,
+				2772B7AC1790E7C6004CCF57 /* ui_servers2.c */,
+				2772B7AD1790E7C6004CCF57 /* ui_setup.c */,
+				2772B7AE1790E7C6004CCF57 /* ui_signup.c */,
+				2772B7AF1790E7C6004CCF57 /* ui_sound.c */,
+				2772B7B01790E7C6004CCF57 /* ui_sparena.c */,
+				2772B7B11790E7C6004CCF57 /* ui_specifyleague.c */,
+				2772B7B21790E7C6004CCF57 /* ui_specifyserver.c */,
+				2772B7B31790E7C6004CCF57 /* ui_splevel.c */,
+				2772B7B41790E7C6004CCF57 /* ui_sppostgame.c */,
+				2772B7B51790E7C6004CCF57 /* ui_spreset.c */,
+				2772B7B61790E7C6004CCF57 /* ui_spskill.c */,
+				2772B7B71790E7C6004CCF57 /* ui_startserver.c */,
+				2772B7B81790E7C6004CCF57 /* ui_team.c */,
+				2772B7B91790E7C6004CCF57 /* ui_teamorders.c */,
+				2772B7BA1790E7C6004CCF57 /* ui_video.c */,
+			);
+			path = q3_ui;
+			sourceTree = "<group>";
+		};
+		2711BDB914D12FE9005EB142 /* game */ = {
+			isa = PBXGroup;
+			children = (
+				2772B7E91790E800004CCF57 /* bg_lib.c */,
+				2772B7EA1790E800004CCF57 /* bg_lib.h */,
+				2772B7EB1790E800004CCF57 /* bg_misc.c */,
+				2772B7F91790E904004CCF57 /* bg_public.h */,
+			);
+			path = game;
+			sourceTree = "<group>";
+		};
+		273531BC14D1270700EB7BD6 = {
+			isa = PBXGroup;
+			children = (
+				2711BDB614D12FCF005EB142 /* code */,
+				273531C814D1270700EB7BD6 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		273531C814D1270700EB7BD6 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				273531C714D1270700EB7BD6 /* q3_ui.dylib */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		2772B7EF1790E819004CCF57 /* qcommon */ = {
+			isa = PBXGroup;
+			children = (
+				2772B7F01790E835004CCF57 /* q_math.c */,
+				2772B7F11790E835004CCF57 /* q_shared.c */,
+				2772B7F21790E835004CCF57 /* q_shared.h */,
+			);
+			path = qcommon;
+			sourceTree = "<group>";
+		};
+		2772B7F61790E851004CCF57 /* client */ = {
+			isa = PBXGroup;
+			children = (
+				2772B7F71790E865004CCF57 /* keycodes.h */,
+			);
+			path = client;
+			sourceTree = "<group>";
+		};
+		2772B7FB1790E994004CCF57 /* renderercommon */ = {
+			isa = PBXGroup;
+			children = (
+				2772B7FC1790E9B6004CCF57 /* tr_types.h */,
+			);
+			path = renderercommon;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		273531C614D1270700EB7BD6 /* q3_ui */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 273531CB14D1270700EB7BD6 /* Build configuration list for PBXNativeTarget "q3_ui" */;
+			buildPhases = (
+				273531C314D1270700EB7BD6 /* Sources */,
+				273531C414D1270700EB7BD6 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = q3_ui;
+			productName = q3_ui;
+			productReference = 273531C714D1270700EB7BD6 /* q3_ui.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		273531BE14D1270700EB7BD6 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0500;
+			};
+			buildConfigurationList = 273531C114D1270700EB7BD6 /* Build configuration list for PBXProject "q3_ui" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 273531BC14D1270700EB7BD6;
+			productRefGroup = 273531C814D1270700EB7BD6 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				273531C614D1270700EB7BD6 /* q3_ui */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		273531C314D1270700EB7BD6 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2711BDBC14D13007005EB142 /* ui_syscalls.c in Sources */,
+				2772B7BB1790E7C6004CCF57 /* ui_addbots.c in Sources */,
+				2772B7BC1790E7C6004CCF57 /* ui_atoms.c in Sources */,
+				2772B7BD1790E7C6004CCF57 /* ui_cdkey.c in Sources */,
+				2772B7BE1790E7C6004CCF57 /* ui_cinematics.c in Sources */,
+				2772B7BF1790E7C6004CCF57 /* ui_confirm.c in Sources */,
+				2772B7C01790E7C6004CCF57 /* ui_connect.c in Sources */,
+				2772B7C11790E7C6004CCF57 /* ui_controls2.c in Sources */,
+				2772B7C21790E7C6004CCF57 /* ui_credits.c in Sources */,
+				2772B7C31790E7C6004CCF57 /* ui_demo2.c in Sources */,
+				2772B7C41790E7C6004CCF57 /* ui_display.c in Sources */,
+				2772B7C51790E7C6004CCF57 /* ui_gameinfo.c in Sources */,
+				2772B7C61790E7C6004CCF57 /* ui_ingame.c in Sources */,
+				2772B7C71790E7C6004CCF57 /* ui_loadconfig.c in Sources */,
+				2772B7CA1790E7C6004CCF57 /* ui_main.c in Sources */,
+				2772B7CB1790E7C6004CCF57 /* ui_menu.c in Sources */,
+				2772B7CC1790E7C6004CCF57 /* ui_mfield.c in Sources */,
+				2772B7CD1790E7C6004CCF57 /* ui_mods.c in Sources */,
+				2772B7CE1790E7C6004CCF57 /* ui_network.c in Sources */,
+				2772B7CF1790E7C6004CCF57 /* ui_options.c in Sources */,
+				2772B7D01790E7C6004CCF57 /* ui_playermodel.c in Sources */,
+				2772B7D11790E7C6004CCF57 /* ui_players.c in Sources */,
+				2772B7D21790E7C6004CCF57 /* ui_playersettings.c in Sources */,
+				2772B7D31790E7C6004CCF57 /* ui_preferences.c in Sources */,
+				2772B7D41790E7C6004CCF57 /* ui_qmenu.c in Sources */,
+				2772B7D71790E7C6004CCF57 /* ui_removebots.c in Sources */,
+				2772B7D81790E7C6004CCF57 /* ui_saveconfig.c in Sources */,
+				2772B7D91790E7C6004CCF57 /* ui_serverinfo.c in Sources */,
+				2772B7DA1790E7C6004CCF57 /* ui_servers2.c in Sources */,
+				2772B7DB1790E7C6004CCF57 /* ui_setup.c in Sources */,
+				2772B7DD1790E7C6004CCF57 /* ui_sound.c in Sources */,
+				2772B7DE1790E7C6004CCF57 /* ui_sparena.c in Sources */,
+				2772B7E01790E7C6004CCF57 /* ui_specifyserver.c in Sources */,
+				2772B7E11790E7C6004CCF57 /* ui_splevel.c in Sources */,
+				2772B7E21790E7C6004CCF57 /* ui_sppostgame.c in Sources */,
+				2772B7E31790E7C6004CCF57 /* ui_spreset.c in Sources */,
+				2772B7E41790E7C6004CCF57 /* ui_spskill.c in Sources */,
+				2772B7E51790E7C6004CCF57 /* ui_startserver.c in Sources */,
+				2772B7E61790E7C6004CCF57 /* ui_team.c in Sources */,
+				2772B7E71790E7C6004CCF57 /* ui_teamorders.c in Sources */,
+				2772B7E81790E7C6004CCF57 /* ui_video.c in Sources */,
+				2772B7EC1790E800004CCF57 /* bg_lib.c in Sources */,
+				2772B7EE1790E800004CCF57 /* bg_misc.c in Sources */,
+				2772B7F31790E835004CCF57 /* q_math.c in Sources */,
+				2772B7F41790E835004CCF57 /* q_shared.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		273531C914D1270700EB7BD6 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		273531CA14D1270700EB7BD6 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		273531CC14D1270700EB7BD6 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				EXECUTABLE_PREFIX = "";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		273531CD14D1270700EB7BD6 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				EXECUTABLE_PREFIX = "";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		273531C114D1270700EB7BD6 /* Build configuration list for PBXProject "q3_ui" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				273531C914D1270700EB7BD6 /* Debug */,
+				273531CA14D1270700EB7BD6 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		273531CB14D1270700EB7BD6 /* Build configuration list for PBXNativeTarget "q3_ui" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				273531CC14D1270700EB7BD6 /* Debug */,
+				273531CD14D1270700EB7BD6 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 273531BE14D1270700EB7BD6 /* Project object */;
+}
--- a/misc/xcode/renderer_opengl1.xcodeproj/project.pbxproj
+++ b/misc/xcode/renderer_opengl1.xcodeproj/project.pbxproj
@ -0,0 +1,435 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		274FAC3E178FAF6900B17C7A /* tr_animation.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC26178FAF6900B17C7A /* tr_animation.c */; };
+		274FAC3F178FAF6900B17C7A /* tr_backend.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC27178FAF6900B17C7A /* tr_backend.c */; };
+		274FAC40178FAF6900B17C7A /* tr_bsp.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC28178FAF6900B17C7A /* tr_bsp.c */; };
+		274FAC41178FAF6900B17C7A /* tr_cmds.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC29178FAF6900B17C7A /* tr_cmds.c */; };
+		274FAC42178FAF6900B17C7A /* tr_curve.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC2A178FAF6900B17C7A /* tr_curve.c */; };
+		274FAC43178FAF6900B17C7A /* tr_flares.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC2B178FAF6900B17C7A /* tr_flares.c */; };
+		274FAC44178FAF6900B17C7A /* tr_image.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC2C178FAF6900B17C7A /* tr_image.c */; };
+		274FAC45178FAF6900B17C7A /* tr_init.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC2D178FAF6900B17C7A /* tr_init.c */; };
+		274FAC46178FAF6900B17C7A /* tr_light.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC2E178FAF6900B17C7A /* tr_light.c */; };
+		274FAC48178FAF6900B17C7A /* tr_main.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC30178FAF6900B17C7A /* tr_main.c */; };
+		274FAC49178FAF6900B17C7A /* tr_marks.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC31178FAF6900B17C7A /* tr_marks.c */; };
+		274FAC4A178FAF6900B17C7A /* tr_mesh.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC32178FAF6900B17C7A /* tr_mesh.c */; };
+		274FAC4B178FAF6900B17C7A /* tr_model_iqm.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC33178FAF6900B17C7A /* tr_model_iqm.c */; };
+		274FAC4C178FAF6900B17C7A /* tr_model.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC34178FAF6900B17C7A /* tr_model.c */; };
+		274FAC4D178FAF6900B17C7A /* tr_scene.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC35178FAF6900B17C7A /* tr_scene.c */; };
+		274FAC4E178FAF6900B17C7A /* tr_shade_calc.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC36178FAF6900B17C7A /* tr_shade_calc.c */; };
+		274FAC4F178FAF6900B17C7A /* tr_shade.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC37178FAF6900B17C7A /* tr_shade.c */; };
+		274FAC50178FAF6900B17C7A /* tr_shader.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC38178FAF6900B17C7A /* tr_shader.c */; };
+		274FAC51178FAF6900B17C7A /* tr_shadows.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC39178FAF6900B17C7A /* tr_shadows.c */; };
+		274FAC52178FAF6900B17C7A /* tr_sky.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC3A178FAF6900B17C7A /* tr_sky.c */; };
+		274FAC53178FAF6900B17C7A /* tr_subs.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC3B178FAF6900B17C7A /* tr_subs.c */; };
+		274FAC54178FAF6900B17C7A /* tr_surface.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC3C178FAF6900B17C7A /* tr_surface.c */; };
+		274FAC55178FAF6900B17C7A /* tr_world.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC3D178FAF6900B17C7A /* tr_world.c */; };
+		274FAC59178FAF8E00B17C7A /* sdl_gamma.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC57178FAF8E00B17C7A /* sdl_gamma.c */; };
+		274FAC5A178FAF8E00B17C7A /* sdl_glimp.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC58178FAF8E00B17C7A /* sdl_glimp.c */; };
+		274FAC62178FB14500B17C7A /* puff.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC5C178FB14500B17C7A /* puff.c */; };
+		274FAC64178FB14500B17C7A /* q_math.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC5E178FB14500B17C7A /* q_math.c */; };
+		274FAC65178FB14500B17C7A /* q_shared.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC5F178FB14500B17C7A /* q_shared.c */; };
+		274FAC6B178FB17E00B17C7A /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 274FAC6A178FB17E00B17C7A /* OpenGL.framework */; };
+		274FAC6D178FB19200B17C7A /* libSDL-1.2.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 274FAC6C178FB19200B17C7A /* libSDL-1.2.0.dylib */; };
+		274FAC7E178FB1C800B17C7A /* tr_font.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC72178FB1C800B17C7A /* tr_font.c */; };
+		274FAC7F178FB1C800B17C7A /* tr_image_bmp.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC73178FB1C800B17C7A /* tr_image_bmp.c */; };
+		274FAC80178FB1C800B17C7A /* tr_image_jpg.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC74178FB1C800B17C7A /* tr_image_jpg.c */; };
+		274FAC81178FB1C800B17C7A /* tr_image_pcx.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC75178FB1C800B17C7A /* tr_image_pcx.c */; };
+		274FAC82178FB1C800B17C7A /* tr_image_png.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC76178FB1C800B17C7A /* tr_image_png.c */; };
+		274FAC83178FB1C800B17C7A /* tr_image_tga.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC77178FB1C800B17C7A /* tr_image_tga.c */; };
+		274FAC84178FB1C800B17C7A /* tr_noise.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC78178FB1C800B17C7A /* tr_noise.c */; };
+		274FAC88178FB1D600B17C7A /* libjpeg8.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 274FAC87178FB1D600B17C7A /* libjpeg8.a */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		274FAC0D178FAEFC00B17C7A /* renderer_opengl1.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = renderer_opengl1.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		274FAC26178FAF6900B17C7A /* tr_animation.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_animation.c; sourceTree = "<group>"; };
+		274FAC27178FAF6900B17C7A /* tr_backend.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_backend.c; sourceTree = "<group>"; };
+		274FAC28178FAF6900B17C7A /* tr_bsp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_bsp.c; sourceTree = "<group>"; };
+		274FAC29178FAF6900B17C7A /* tr_cmds.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_cmds.c; sourceTree = "<group>"; };
+		274FAC2A178FAF6900B17C7A /* tr_curve.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_curve.c; sourceTree = "<group>"; };
+		274FAC2B178FAF6900B17C7A /* tr_flares.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_flares.c; sourceTree = "<group>"; };
+		274FAC2C178FAF6900B17C7A /* tr_image.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_image.c; sourceTree = "<group>"; };
+		274FAC2D178FAF6900B17C7A /* tr_init.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_init.c; sourceTree = "<group>"; };
+		274FAC2E178FAF6900B17C7A /* tr_light.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_light.c; sourceTree = "<group>"; };
+		274FAC2F178FAF6900B17C7A /* tr_local.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tr_local.h; sourceTree = "<group>"; };
+		274FAC30178FAF6900B17C7A /* tr_main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_main.c; sourceTree = "<group>"; };
+		274FAC31178FAF6900B17C7A /* tr_marks.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_marks.c; sourceTree = "<group>"; };
+		274FAC32178FAF6900B17C7A /* tr_mesh.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_mesh.c; sourceTree = "<group>"; };
+		274FAC33178FAF6900B17C7A /* tr_model_iqm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_model_iqm.c; sourceTree = "<group>"; };
+		274FAC34178FAF6900B17C7A /* tr_model.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_model.c; sourceTree = "<group>"; };
+		274FAC35178FAF6900B17C7A /* tr_scene.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_scene.c; sourceTree = "<group>"; };
+		274FAC36178FAF6900B17C7A /* tr_shade_calc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_shade_calc.c; sourceTree = "<group>"; };
+		274FAC37178FAF6900B17C7A /* tr_shade.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_shade.c; sourceTree = "<group>"; };
+		274FAC38178FAF6900B17C7A /* tr_shader.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_shader.c; sourceTree = "<group>"; };
+		274FAC39178FAF6900B17C7A /* tr_shadows.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_shadows.c; sourceTree = "<group>"; };
+		274FAC3A178FAF6900B17C7A /* tr_sky.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_sky.c; sourceTree = "<group>"; };
+		274FAC3B178FAF6900B17C7A /* tr_subs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_subs.c; sourceTree = "<group>"; };
+		274FAC3C178FAF6900B17C7A /* tr_surface.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_surface.c; sourceTree = "<group>"; };
+		274FAC3D178FAF6900B17C7A /* tr_world.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_world.c; sourceTree = "<group>"; };
+		274FAC57178FAF8E00B17C7A /* sdl_gamma.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sdl_gamma.c; sourceTree = "<group>"; };
+		274FAC58178FAF8E00B17C7A /* sdl_glimp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sdl_glimp.c; sourceTree = "<group>"; };
+		274FAC5C178FB14500B17C7A /* puff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = puff.c; sourceTree = "<group>"; };
+		274FAC5D178FB14500B17C7A /* puff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = puff.h; sourceTree = "<group>"; };
+		274FAC5E178FB14500B17C7A /* q_math.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = q_math.c; sourceTree = "<group>"; };
+		274FAC5F178FB14500B17C7A /* q_shared.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = q_shared.c; sourceTree = "<group>"; };
+		274FAC60178FB14500B17C7A /* q_shared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = q_shared.h; sourceTree = "<group>"; };
+		274FAC61178FB14500B17C7A /* qcommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qcommon.h; sourceTree = "<group>"; };
+		274FAC6A178FB17E00B17C7A /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
+		274FAC6C178FB19200B17C7A /* libSDL-1.2.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libSDL-1.2.0.dylib"; path = "../../code/libs/macosx/libSDL-1.2.0.dylib"; sourceTree = SOURCE_ROOT; };
+		274FAC6F178FB1C800B17C7A /* iqm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iqm.h; sourceTree = "<group>"; };
+		274FAC70178FB1C800B17C7A /* qgl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qgl.h; sourceTree = "<group>"; };
+		274FAC71178FB1C800B17C7A /* tr_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tr_common.h; sourceTree = "<group>"; };
+		274FAC72178FB1C800B17C7A /* tr_font.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_font.c; sourceTree = "<group>"; };
+		274FAC73178FB1C800B17C7A /* tr_image_bmp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_image_bmp.c; sourceTree = "<group>"; };
+		274FAC74178FB1C800B17C7A /* tr_image_jpg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_image_jpg.c; sourceTree = "<group>"; };
+		274FAC75178FB1C800B17C7A /* tr_image_pcx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_image_pcx.c; sourceTree = "<group>"; };
+		274FAC76178FB1C800B17C7A /* tr_image_png.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_image_png.c; sourceTree = "<group>"; };
+		274FAC77178FB1C800B17C7A /* tr_image_tga.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_image_tga.c; sourceTree = "<group>"; };
+		274FAC78178FB1C800B17C7A /* tr_noise.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_noise.c; sourceTree = "<group>"; };
+		274FAC79178FB1C800B17C7A /* tr_public.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tr_public.h; sourceTree = "<group>"; };
+		274FAC7A178FB1C800B17C7A /* tr_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tr_types.h; sourceTree = "<group>"; };
+		274FAC87178FB1D600B17C7A /* libjpeg8.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libjpeg8.a; sourceTree = BUILT_PRODUCTS_DIR; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		274FAC0A178FAEFC00B17C7A /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				274FAC88178FB1D600B17C7A /* libjpeg8.a in Frameworks */,
+				274FAC6B178FB17E00B17C7A /* OpenGL.framework in Frameworks */,
+				274FAC6D178FB19200B17C7A /* libSDL-1.2.0.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		274FAC04178FAEFC00B17C7A = {
+			isa = PBXGroup;
+			children = (
+				274FAC24178FAF3900B17C7A /* code */,
+				274FAC68178FB15500B17C7A /* Frameworks */,
+				274FAC69178FB15C00B17C7A /* Libraries */,
+				274FAC0E178FAEFC00B17C7A /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		274FAC0E178FAEFC00B17C7A /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				274FAC0D178FAEFC00B17C7A /* renderer_opengl1.dylib */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		274FAC24178FAF3900B17C7A /* code */ = {
+			isa = PBXGroup;
+			children = (
+				274FAC5B178FB11D00B17C7A /* qcommon */,
+				274FAC6E178FB1AE00B17C7A /* renderercommon */,
+				274FAC25178FAF4900B17C7A /* renderergl1 */,
+				274FAC56178FAF7900B17C7A /* sdl */,
+			);
+			name = code;
+			path = ../../code;
+			sourceTree = SOURCE_ROOT;
+		};
+		274FAC25178FAF4900B17C7A /* renderergl1 */ = {
+			isa = PBXGroup;
+			children = (
+				274FAC26178FAF6900B17C7A /* tr_animation.c */,
+				274FAC27178FAF6900B17C7A /* tr_backend.c */,
+				274FAC28178FAF6900B17C7A /* tr_bsp.c */,
+				274FAC29178FAF6900B17C7A /* tr_cmds.c */,
+				274FAC2A178FAF6900B17C7A /* tr_curve.c */,
+				274FAC2B178FAF6900B17C7A /* tr_flares.c */,
+				274FAC2C178FAF6900B17C7A /* tr_image.c */,
+				274FAC2D178FAF6900B17C7A /* tr_init.c */,
+				274FAC2E178FAF6900B17C7A /* tr_light.c */,
+				274FAC2F178FAF6900B17C7A /* tr_local.h */,
+				274FAC30178FAF6900B17C7A /* tr_main.c */,
+				274FAC31178FAF6900B17C7A /* tr_marks.c */,
+				274FAC32178FAF6900B17C7A /* tr_mesh.c */,
+				274FAC33178FAF6900B17C7A /* tr_model_iqm.c */,
+				274FAC34178FAF6900B17C7A /* tr_model.c */,
+				274FAC35178FAF6900B17C7A /* tr_scene.c */,
+				274FAC36178FAF6900B17C7A /* tr_shade_calc.c */,
+				274FAC37178FAF6900B17C7A /* tr_shade.c */,
+				274FAC38178FAF6900B17C7A /* tr_shader.c */,
+				274FAC39178FAF6900B17C7A /* tr_shadows.c */,
+				274FAC3A178FAF6900B17C7A /* tr_sky.c */,
+				274FAC3B178FAF6900B17C7A /* tr_subs.c */,
+				274FAC3C178FAF6900B17C7A /* tr_surface.c */,
+				274FAC3D178FAF6900B17C7A /* tr_world.c */,
+			);
+			path = renderergl1;
+			sourceTree = "<group>";
+		};
+		274FAC56178FAF7900B17C7A /* sdl */ = {
+			isa = PBXGroup;
+			children = (
+				274FAC57178FAF8E00B17C7A /* sdl_gamma.c */,
+				274FAC58178FAF8E00B17C7A /* sdl_glimp.c */,
+			);
+			path = sdl;
+			sourceTree = "<group>";
+		};
+		274FAC5B178FB11D00B17C7A /* qcommon */ = {
+			isa = PBXGroup;
+			children = (
+				274FAC5C178FB14500B17C7A /* puff.c */,
+				274FAC5D178FB14500B17C7A /* puff.h */,
+				274FAC5E178FB14500B17C7A /* q_math.c */,
+				274FAC5F178FB14500B17C7A /* q_shared.c */,
+				274FAC60178FB14500B17C7A /* q_shared.h */,
+				274FAC61178FB14500B17C7A /* qcommon.h */,
+			);
+			path = qcommon;
+			sourceTree = "<group>";
+		};
+		274FAC68178FB15500B17C7A /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				274FAC6A178FB17E00B17C7A /* OpenGL.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		274FAC69178FB15C00B17C7A /* Libraries */ = {
+			isa = PBXGroup;
+			children = (
+				274FAC87178FB1D600B17C7A /* libjpeg8.a */,
+				274FAC6C178FB19200B17C7A /* libSDL-1.2.0.dylib */,
+			);
+			name = Libraries;
+			sourceTree = "<group>";
+		};
+		274FAC6E178FB1AE00B17C7A /* renderercommon */ = {
+			isa = PBXGroup;
+			children = (
+				274FAC6F178FB1C800B17C7A /* iqm.h */,
+				274FAC70178FB1C800B17C7A /* qgl.h */,
+				274FAC71178FB1C800B17C7A /* tr_common.h */,
+				274FAC72178FB1C800B17C7A /* tr_font.c */,
+				274FAC73178FB1C800B17C7A /* tr_image_bmp.c */,
+				274FAC74178FB1C800B17C7A /* tr_image_jpg.c */,
+				274FAC75178FB1C800B17C7A /* tr_image_pcx.c */,
+				274FAC76178FB1C800B17C7A /* tr_image_png.c */,
+				274FAC77178FB1C800B17C7A /* tr_image_tga.c */,
+				274FAC78178FB1C800B17C7A /* tr_noise.c */,
+				274FAC79178FB1C800B17C7A /* tr_public.h */,
+				274FAC7A178FB1C800B17C7A /* tr_types.h */,
+			);
+			path = renderercommon;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		274FAC0C178FAEFC00B17C7A /* renderer_opengl1 */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 274FAC11178FAEFC00B17C7A /* Build configuration list for PBXNativeTarget "renderer_opengl1" */;
+			buildPhases = (
+				274FAC09178FAEFC00B17C7A /* Sources */,
+				274FAC0A178FAEFC00B17C7A /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = renderer_opengl1;
+			productName = renderer_opengl1;
+			productReference = 274FAC0D178FAEFC00B17C7A /* renderer_opengl1.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		274FAC05178FAEFC00B17C7A /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				CLASSPREFIX = io;
+				LastUpgradeCheck = 0460;
+				ORGANIZATIONNAME = ioquake;
+			};
+			buildConfigurationList = 274FAC08178FAEFC00B17C7A /* Build configuration list for PBXProject "renderer_opengl1" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 274FAC04178FAEFC00B17C7A;
+			productRefGroup = 274FAC0E178FAEFC00B17C7A /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				274FAC0C178FAEFC00B17C7A /* renderer_opengl1 */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		274FAC09178FAEFC00B17C7A /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				274FAC3E178FAF6900B17C7A /* tr_animation.c in Sources */,
+				274FAC3F178FAF6900B17C7A /* tr_backend.c in Sources */,
+				274FAC40178FAF6900B17C7A /* tr_bsp.c in Sources */,
+				274FAC41178FAF6900B17C7A /* tr_cmds.c in Sources */,
+				274FAC42178FAF6900B17C7A /* tr_curve.c in Sources */,
+				274FAC43178FAF6900B17C7A /* tr_flares.c in Sources */,
+				274FAC44178FAF6900B17C7A /* tr_image.c in Sources */,
+				274FAC45178FAF6900B17C7A /* tr_init.c in Sources */,
+				274FAC46178FAF6900B17C7A /* tr_light.c in Sources */,
+				274FAC48178FAF6900B17C7A /* tr_main.c in Sources */,
+				274FAC49178FAF6900B17C7A /* tr_marks.c in Sources */,
+				274FAC4A178FAF6900B17C7A /* tr_mesh.c in Sources */,
+				274FAC4B178FAF6900B17C7A /* tr_model_iqm.c in Sources */,
+				274FAC4C178FAF6900B17C7A /* tr_model.c in Sources */,
+				274FAC4D178FAF6900B17C7A /* tr_scene.c in Sources */,
+				274FAC4E178FAF6900B17C7A /* tr_shade_calc.c in Sources */,
+				274FAC4F178FAF6900B17C7A /* tr_shade.c in Sources */,
+				274FAC50178FAF6900B17C7A /* tr_shader.c in Sources */,
+				274FAC51178FAF6900B17C7A /* tr_shadows.c in Sources */,
+				274FAC52178FAF6900B17C7A /* tr_sky.c in Sources */,
+				274FAC53178FAF6900B17C7A /* tr_subs.c in Sources */,
+				274FAC54178FAF6900B17C7A /* tr_surface.c in Sources */,
+				274FAC55178FAF6900B17C7A /* tr_world.c in Sources */,
+				274FAC59178FAF8E00B17C7A /* sdl_gamma.c in Sources */,
+				274FAC5A178FAF8E00B17C7A /* sdl_glimp.c in Sources */,
+				274FAC62178FB14500B17C7A /* puff.c in Sources */,
+				274FAC64178FB14500B17C7A /* q_math.c in Sources */,
+				274FAC65178FB14500B17C7A /* q_shared.c in Sources */,
+				274FAC7E178FB1C800B17C7A /* tr_font.c in Sources */,
+				274FAC7F178FB1C800B17C7A /* tr_image_bmp.c in Sources */,
+				274FAC80178FB1C800B17C7A /* tr_image_jpg.c in Sources */,
+				274FAC81178FB1C800B17C7A /* tr_image_pcx.c in Sources */,
+				274FAC82178FB1C800B17C7A /* tr_image_png.c in Sources */,
+				274FAC83178FB1C800B17C7A /* tr_image_tga.c in Sources */,
+				274FAC84178FB1C800B17C7A /* tr_noise.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		274FAC0F178FAEFC00B17C7A /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"USE_LOCAL_HEADERS=1",
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		274FAC10178FAEFC00B17C7A /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = "USE_LOCAL_HEADERS=1";
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		274FAC12178FAEFC00B17C7A /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					"\"$(SRCROOT)/../../code/jpeg-8c\"",
+					"\"$(SRCROOT)/../../code/SDL12/include\"",
+				);
+				LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../code/libs/macosx\"";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		274FAC13178FAEFC00B17C7A /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					"\"$(SRCROOT)/../../code/jpeg-8c\"",
+					"\"$(SRCROOT)/../../code/SDL12/include\"",
+				);
+				LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../code/libs/macosx\"";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		274FAC08178FAEFC00B17C7A /* Build configuration list for PBXProject "renderer_opengl1" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				274FAC0F178FAEFC00B17C7A /* Debug */,
+				274FAC10178FAEFC00B17C7A /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		274FAC11178FAEFC00B17C7A /* Build configuration list for PBXNativeTarget "renderer_opengl1" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				274FAC12178FAEFC00B17C7A /* Debug */,
+				274FAC13178FAEFC00B17C7A /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 274FAC05178FAEFC00B17C7A /* Project object */;
+}
--- a/misc/xcode/renderer_opengl2.xcodeproj/project.pbxproj
+++ b/misc/xcode/renderer_opengl2.xcodeproj/project.pbxproj
@ -0,0 +1,684 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		2758B918178FBB4B007F6582 /* sdl_gamma.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B916178FBB4B007F6582 /* sdl_gamma.c */; };
+		2758B919178FBB4B007F6582 /* sdl_glimp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B917178FBB4B007F6582 /* sdl_glimp.c */; };
+		2758B981178FBB77007F6582 /* tr_animation.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B95F178FBB77007F6582 /* tr_animation.c */; };
+		2758B982178FBB77007F6582 /* tr_backend.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B960178FBB77007F6582 /* tr_backend.c */; };
+		2758B983178FBB77007F6582 /* tr_bsp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B961178FBB77007F6582 /* tr_bsp.c */; };
+		2758B984178FBB77007F6582 /* tr_cmds.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B962178FBB77007F6582 /* tr_cmds.c */; };
+		2758B985178FBB77007F6582 /* tr_curve.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B963178FBB77007F6582 /* tr_curve.c */; };
+		2758B986178FBB77007F6582 /* tr_extensions.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B964178FBB77007F6582 /* tr_extensions.c */; };
+		2758B987178FBB77007F6582 /* tr_extramath.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B965178FBB77007F6582 /* tr_extramath.c */; };
+		2758B98A178FBB77007F6582 /* tr_fbo.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B968178FBB77007F6582 /* tr_fbo.c */; };
+		2758B98C178FBB77007F6582 /* tr_flares.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B96A178FBB77007F6582 /* tr_flares.c */; };
+		2758B98D178FBB77007F6582 /* tr_glsl.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B96B178FBB77007F6582 /* tr_glsl.c */; };
+		2758B98E178FBB77007F6582 /* tr_image.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B96C178FBB77007F6582 /* tr_image.c */; };
+		2758B98F178FBB77007F6582 /* tr_init.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B96D178FBB77007F6582 /* tr_init.c */; };
+		2758B990178FBB77007F6582 /* tr_light.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B96E178FBB77007F6582 /* tr_light.c */; };
+		2758B992178FBB77007F6582 /* tr_main.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B970178FBB77007F6582 /* tr_main.c */; };
+		2758B993178FBB77007F6582 /* tr_marks.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B971178FBB77007F6582 /* tr_marks.c */; };
+		2758B994178FBB77007F6582 /* tr_mesh.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B972178FBB77007F6582 /* tr_mesh.c */; };
+		2758B995178FBB77007F6582 /* tr_model_iqm.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B973178FBB77007F6582 /* tr_model_iqm.c */; };
+		2758B996178FBB77007F6582 /* tr_model.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B974178FBB77007F6582 /* tr_model.c */; };
+		2758B997178FBB77007F6582 /* tr_postprocess.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B975178FBB77007F6582 /* tr_postprocess.c */; };
+		2758B999178FBB77007F6582 /* tr_scene.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B977178FBB77007F6582 /* tr_scene.c */; };
+		2758B99A178FBB77007F6582 /* tr_shade_calc.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B978178FBB77007F6582 /* tr_shade_calc.c */; };
+		2758B99B178FBB77007F6582 /* tr_shade.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B979178FBB77007F6582 /* tr_shade.c */; };
+		2758B99C178FBB77007F6582 /* tr_shader.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B97A178FBB77007F6582 /* tr_shader.c */; };
+		2758B99D178FBB77007F6582 /* tr_shadows.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B97B178FBB77007F6582 /* tr_shadows.c */; };
+		2758B99E178FBB77007F6582 /* tr_sky.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B97C178FBB77007F6582 /* tr_sky.c */; };
+		2758B99F178FBB77007F6582 /* tr_subs.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B97D178FBB77007F6582 /* tr_subs.c */; };
+		2758B9A0178FBB77007F6582 /* tr_surface.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B97E178FBB77007F6582 /* tr_surface.c */; };
+		2758B9A1178FBB77007F6582 /* tr_vbo.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B97F178FBB77007F6582 /* tr_vbo.c */; };
+		2758B9A2178FBB77007F6582 /* tr_world.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B980178FBB77007F6582 /* tr_world.c */; };
+		2758B9B3178FBB8E007F6582 /* tr_font.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B9A7178FBB8E007F6582 /* tr_font.c */; };
+		2758B9B4178FBB8E007F6582 /* tr_image_bmp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B9A8178FBB8E007F6582 /* tr_image_bmp.c */; };
+		2758B9B5178FBB8E007F6582 /* tr_image_jpg.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B9A9178FBB8E007F6582 /* tr_image_jpg.c */; };
+		2758B9B6178FBB8E007F6582 /* tr_image_pcx.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B9AA178FBB8E007F6582 /* tr_image_pcx.c */; };
+		2758B9B7178FBB8E007F6582 /* tr_image_png.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B9AB178FBB8E007F6582 /* tr_image_png.c */; };
+		2758B9B8178FBB8E007F6582 /* tr_image_tga.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B9AC178FBB8E007F6582 /* tr_image_tga.c */; };
+		2758B9B9178FBB8E007F6582 /* tr_noise.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B9AD178FBB8E007F6582 /* tr_noise.c */; };
+		2758B9C3178FBBAC007F6582 /* puff.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B9BD178FBBAC007F6582 /* puff.c */; };
+		2758B9C5178FBBAC007F6582 /* q_math.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B9BF178FBBAC007F6582 /* q_math.c */; };
+		2758B9C6178FBBAC007F6582 /* q_shared.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B9C0178FBBAC007F6582 /* q_shared.c */; };
+		2758B9CC178FBC8B007F6582 /* libjpeg8.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2758B9CB178FBC8B007F6582 /* libjpeg8.a */; };
+		2758B9CE178FBCBC007F6582 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2758B9CD178FBCBC007F6582 /* OpenGL.framework */; };
+		2758B9D0178FBCDC007F6582 /* libSDL-1.2.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2758B9CF178FBCDC007F6582 /* libSDL-1.2.0.dylib */; };
+		2758BA2C178FCFC0007F6582 /* bokeh_fp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B9F3178FCFC0007F6582 /* bokeh_fp.c */; };
+		2758BA2D178FCFC0007F6582 /* bokeh_vp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B9F5178FCFC0007F6582 /* bokeh_vp.c */; };
+		2758BA2E178FCFC0007F6582 /* calclevels4x_fp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B9F7178FCFC0007F6582 /* calclevels4x_fp.c */; };
+		2758BA2F178FCFC0007F6582 /* calclevels4x_vp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B9F9178FCFC0007F6582 /* calclevels4x_vp.c */; };
+		2758BA30178FCFC0007F6582 /* depthblur_fp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B9FB178FCFC0007F6582 /* depthblur_fp.c */; };
+		2758BA31178FCFC0007F6582 /* depthblur_vp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B9FD178FCFC0007F6582 /* depthblur_vp.c */; };
+		2758BA32178FCFC0007F6582 /* dlight_fp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B9FF178FCFC0007F6582 /* dlight_fp.c */; };
+		2758BA33178FCFC0007F6582 /* dlight_vp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA01178FCFC0007F6582 /* dlight_vp.c */; };
+		2758BA34178FCFC0007F6582 /* down4x_fp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA03178FCFC0007F6582 /* down4x_fp.c */; };
+		2758BA35178FCFC0007F6582 /* down4x_vp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA05178FCFC0007F6582 /* down4x_vp.c */; };
+		2758BA36178FCFC0007F6582 /* fogpass_fp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA07178FCFC0007F6582 /* fogpass_fp.c */; };
+		2758BA37178FCFC0007F6582 /* fogpass_vp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA09178FCFC0007F6582 /* fogpass_vp.c */; };
+		2758BA38178FCFC0007F6582 /* generic_fp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA0C178FCFC0007F6582 /* generic_fp.c */; };
+		2758BA39178FCFC0007F6582 /* generic_vp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA0E178FCFC0007F6582 /* generic_vp.c */; };
+		2758BA3A178FCFC0007F6582 /* lightall_fp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA10178FCFC0007F6582 /* lightall_fp.c */; };
+		2758BA3B178FCFC1007F6582 /* lightall_vp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA12178FCFC0007F6582 /* lightall_vp.c */; };
+		2758BA3C178FCFC1007F6582 /* pshadow_fp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA14178FCFC0007F6582 /* pshadow_fp.c */; };
+		2758BA3D178FCFC1007F6582 /* pshadow_vp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA16178FCFC0007F6582 /* pshadow_vp.c */; };
+		2758BA3E178FCFC1007F6582 /* shadowfill_fp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA18178FCFC0007F6582 /* shadowfill_fp.c */; };
+		2758BA3F178FCFC1007F6582 /* shadowfill_vp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA1A178FCFC0007F6582 /* shadowfill_vp.c */; };
+		2758BA40178FCFC1007F6582 /* shadowmask_fp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA1C178FCFC0007F6582 /* shadowmask_fp.c */; };
+		2758BA41178FCFC1007F6582 /* shadowmask_vp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA1E178FCFC0007F6582 /* shadowmask_vp.c */; };
+		2758BA42178FCFC1007F6582 /* ssao_fp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA20178FCFC0007F6582 /* ssao_fp.c */; };
+		2758BA43178FCFC1007F6582 /* ssao_vp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA22178FCFC0007F6582 /* ssao_vp.c */; };
+		2758BA44178FCFC1007F6582 /* texturecolor_fp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA24178FCFC0007F6582 /* texturecolor_fp.c */; };
+		2758BA45178FCFC1007F6582 /* texturecolor_vp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA26178FCFC0007F6582 /* texturecolor_vp.c */; };
+		2758BA46178FCFC1007F6582 /* tonemap_fp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA28178FCFC0007F6582 /* tonemap_fp.c */; };
+		2758BA47178FCFC1007F6582 /* tonemap_vp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA2A178FCFC0007F6582 /* tonemap_vp.c */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		274FAC1D178FAF0C00B17C7A /* renderer_opengl2.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = renderer_opengl2.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		2758B916178FBB4B007F6582 /* sdl_gamma.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sdl_gamma.c; sourceTree = "<group>"; };
+		2758B917178FBB4B007F6582 /* sdl_glimp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sdl_glimp.c; sourceTree = "<group>"; };
+		2758B95F178FBB77007F6582 /* tr_animation.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_animation.c; sourceTree = "<group>"; };
+		2758B960178FBB77007F6582 /* tr_backend.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_backend.c; sourceTree = "<group>"; };
+		2758B961178FBB77007F6582 /* tr_bsp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_bsp.c; sourceTree = "<group>"; };
+		2758B962178FBB77007F6582 /* tr_cmds.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_cmds.c; sourceTree = "<group>"; };
+		2758B963178FBB77007F6582 /* tr_curve.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_curve.c; sourceTree = "<group>"; };
+		2758B964178FBB77007F6582 /* tr_extensions.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_extensions.c; sourceTree = "<group>"; };
+		2758B965178FBB77007F6582 /* tr_extramath.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_extramath.c; sourceTree = "<group>"; };
+		2758B966178FBB77007F6582 /* tr_extramath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tr_extramath.h; sourceTree = "<group>"; };
+		2758B967178FBB77007F6582 /* tr_extratypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tr_extratypes.h; sourceTree = "<group>"; };
+		2758B968178FBB77007F6582 /* tr_fbo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_fbo.c; sourceTree = "<group>"; };
+		2758B969178FBB77007F6582 /* tr_fbo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tr_fbo.h; sourceTree = "<group>"; };
+		2758B96A178FBB77007F6582 /* tr_flares.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_flares.c; sourceTree = "<group>"; };
+		2758B96B178FBB77007F6582 /* tr_glsl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_glsl.c; sourceTree = "<group>"; };
+		2758B96C178FBB77007F6582 /* tr_image.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_image.c; sourceTree = "<group>"; };
+		2758B96D178FBB77007F6582 /* tr_init.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_init.c; sourceTree = "<group>"; };
+		2758B96E178FBB77007F6582 /* tr_light.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_light.c; sourceTree = "<group>"; };
+		2758B96F178FBB77007F6582 /* tr_local.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tr_local.h; sourceTree = "<group>"; };
+		2758B970178FBB77007F6582 /* tr_main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_main.c; sourceTree = "<group>"; };
+		2758B971178FBB77007F6582 /* tr_marks.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_marks.c; sourceTree = "<group>"; };
+		2758B972178FBB77007F6582 /* tr_mesh.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_mesh.c; sourceTree = "<group>"; };
+		2758B973178FBB77007F6582 /* tr_model_iqm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_model_iqm.c; sourceTree = "<group>"; };
+		2758B974178FBB77007F6582 /* tr_model.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_model.c; sourceTree = "<group>"; };
+		2758B975178FBB77007F6582 /* tr_postprocess.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_postprocess.c; sourceTree = "<group>"; };
+		2758B976178FBB77007F6582 /* tr_postprocess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tr_postprocess.h; sourceTree = "<group>"; };
+		2758B977178FBB77007F6582 /* tr_scene.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_scene.c; sourceTree = "<group>"; };
+		2758B978178FBB77007F6582 /* tr_shade_calc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_shade_calc.c; sourceTree = "<group>"; };
+		2758B979178FBB77007F6582 /* tr_shade.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_shade.c; sourceTree = "<group>"; };
+		2758B97A178FBB77007F6582 /* tr_shader.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_shader.c; sourceTree = "<group>"; };
+		2758B97B178FBB77007F6582 /* tr_shadows.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_shadows.c; sourceTree = "<group>"; };
+		2758B97C178FBB77007F6582 /* tr_sky.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_sky.c; sourceTree = "<group>"; };
+		2758B97D178FBB77007F6582 /* tr_subs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_subs.c; sourceTree = "<group>"; };
+		2758B97E178FBB77007F6582 /* tr_surface.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_surface.c; sourceTree = "<group>"; };
+		2758B97F178FBB77007F6582 /* tr_vbo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_vbo.c; sourceTree = "<group>"; };
+		2758B980178FBB77007F6582 /* tr_world.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_world.c; sourceTree = "<group>"; };
+		2758B9A4178FBB8E007F6582 /* iqm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iqm.h; sourceTree = "<group>"; };
+		2758B9A5178FBB8E007F6582 /* qgl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qgl.h; sourceTree = "<group>"; };
+		2758B9A6178FBB8E007F6582 /* tr_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tr_common.h; sourceTree = "<group>"; };
+		2758B9A7178FBB8E007F6582 /* tr_font.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_font.c; sourceTree = "<group>"; };
+		2758B9A8178FBB8E007F6582 /* tr_image_bmp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_image_bmp.c; sourceTree = "<group>"; };
+		2758B9A9178FBB8E007F6582 /* tr_image_jpg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_image_jpg.c; sourceTree = "<group>"; };
+		2758B9AA178FBB8E007F6582 /* tr_image_pcx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_image_pcx.c; sourceTree = "<group>"; };
+		2758B9AB178FBB8E007F6582 /* tr_image_png.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_image_png.c; sourceTree = "<group>"; };
+		2758B9AC178FBB8E007F6582 /* tr_image_tga.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_image_tga.c; sourceTree = "<group>"; };
+		2758B9AD178FBB8E007F6582 /* tr_noise.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_noise.c; sourceTree = "<group>"; };
+		2758B9AE178FBB8E007F6582 /* tr_public.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tr_public.h; sourceTree = "<group>"; };
+		2758B9AF178FBB8E007F6582 /* tr_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tr_types.h; sourceTree = "<group>"; };
+		2758B9BD178FBBAC007F6582 /* puff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = puff.c; sourceTree = "<group>"; };
+		2758B9BE178FBBAC007F6582 /* puff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = puff.h; sourceTree = "<group>"; };
+		2758B9BF178FBBAC007F6582 /* q_math.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = q_math.c; sourceTree = "<group>"; };
+		2758B9C0178FBBAC007F6582 /* q_shared.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = q_shared.c; sourceTree = "<group>"; };
+		2758B9C1178FBBAC007F6582 /* q_shared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = q_shared.h; sourceTree = "<group>"; };
+		2758B9C2178FBBAC007F6582 /* qcommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qcommon.h; sourceTree = "<group>"; };
+		2758B9CB178FBC8B007F6582 /* libjpeg8.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libjpeg8.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		2758B9CD178FBCBC007F6582 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
+		2758B9CF178FBCDC007F6582 /* libSDL-1.2.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libSDL-1.2.0.dylib"; path = "../../code/libs/macosx/libSDL-1.2.0.dylib"; sourceTree = SOURCE_ROOT; };
+		2758B9F3178FCFC0007F6582 /* bokeh_fp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bokeh_fp.c; sourceTree = "<group>"; };
+		2758B9F4178FCFC0007F6582 /* bokeh_fp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = bokeh_fp.glsl; sourceTree = "<group>"; };
+		2758B9F5178FCFC0007F6582 /* bokeh_vp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bokeh_vp.c; sourceTree = "<group>"; };
+		2758B9F6178FCFC0007F6582 /* bokeh_vp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = bokeh_vp.glsl; sourceTree = "<group>"; };
+		2758B9F7178FCFC0007F6582 /* calclevels4x_fp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = calclevels4x_fp.c; sourceTree = "<group>"; };
+		2758B9F8178FCFC0007F6582 /* calclevels4x_fp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = calclevels4x_fp.glsl; sourceTree = "<group>"; };
+		2758B9F9178FCFC0007F6582 /* calclevels4x_vp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = calclevels4x_vp.c; sourceTree = "<group>"; };
+		2758B9FA178FCFC0007F6582 /* calclevels4x_vp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = calclevels4x_vp.glsl; sourceTree = "<group>"; };
+		2758B9FB178FCFC0007F6582 /* depthblur_fp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = depthblur_fp.c; sourceTree = "<group>"; };
+		2758B9FC178FCFC0007F6582 /* depthblur_fp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = depthblur_fp.glsl; sourceTree = "<group>"; };
+		2758B9FD178FCFC0007F6582 /* depthblur_vp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = depthblur_vp.c; sourceTree = "<group>"; };
+		2758B9FE178FCFC0007F6582 /* depthblur_vp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = depthblur_vp.glsl; sourceTree = "<group>"; };
+		2758B9FF178FCFC0007F6582 /* dlight_fp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dlight_fp.c; sourceTree = "<group>"; };
+		2758BA00178FCFC0007F6582 /* dlight_fp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dlight_fp.glsl; sourceTree = "<group>"; };
+		2758BA01178FCFC0007F6582 /* dlight_vp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dlight_vp.c; sourceTree = "<group>"; };
+		2758BA02178FCFC0007F6582 /* dlight_vp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dlight_vp.glsl; sourceTree = "<group>"; };
+		2758BA03178FCFC0007F6582 /* down4x_fp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = down4x_fp.c; sourceTree = "<group>"; };
+		2758BA04178FCFC0007F6582 /* down4x_fp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = down4x_fp.glsl; sourceTree = "<group>"; };
+		2758BA05178FCFC0007F6582 /* down4x_vp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = down4x_vp.c; sourceTree = "<group>"; };
+		2758BA06178FCFC0007F6582 /* down4x_vp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = down4x_vp.glsl; sourceTree = "<group>"; };
+		2758BA07178FCFC0007F6582 /* fogpass_fp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fogpass_fp.c; sourceTree = "<group>"; };
+		2758BA08178FCFC0007F6582 /* fogpass_fp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = fogpass_fp.glsl; sourceTree = "<group>"; };
+		2758BA09178FCFC0007F6582 /* fogpass_vp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fogpass_vp.c; sourceTree = "<group>"; };
+		2758BA0A178FCFC0007F6582 /* fogpass_vp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = fogpass_vp.glsl; sourceTree = "<group>"; };
+		2758BA0B178FCFC0007F6582 /* gen.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = gen.sh; sourceTree = "<group>"; };
+		2758BA0C178FCFC0007F6582 /* generic_fp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = generic_fp.c; sourceTree = "<group>"; };
+		2758BA0D178FCFC0007F6582 /* generic_fp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = generic_fp.glsl; sourceTree = "<group>"; };
+		2758BA0E178FCFC0007F6582 /* generic_vp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = generic_vp.c; sourceTree = "<group>"; };
+		2758BA0F178FCFC0007F6582 /* generic_vp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = generic_vp.glsl; sourceTree = "<group>"; };
+		2758BA10178FCFC0007F6582 /* lightall_fp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lightall_fp.c; sourceTree = "<group>"; };
+		2758BA11178FCFC0007F6582 /* lightall_fp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = lightall_fp.glsl; sourceTree = "<group>"; };
+		2758BA12178FCFC0007F6582 /* lightall_vp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lightall_vp.c; sourceTree = "<group>"; };
+		2758BA13178FCFC0007F6582 /* lightall_vp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = lightall_vp.glsl; sourceTree = "<group>"; };
+		2758BA14178FCFC0007F6582 /* pshadow_fp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pshadow_fp.c; sourceTree = "<group>"; };
+		2758BA15178FCFC0007F6582 /* pshadow_fp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = pshadow_fp.glsl; sourceTree = "<group>"; };
+		2758BA16178FCFC0007F6582 /* pshadow_vp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pshadow_vp.c; sourceTree = "<group>"; };
+		2758BA17178FCFC0007F6582 /* pshadow_vp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = pshadow_vp.glsl; sourceTree = "<group>"; };
+		2758BA18178FCFC0007F6582 /* shadowfill_fp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = shadowfill_fp.c; sourceTree = "<group>"; };
+		2758BA19178FCFC0007F6582 /* shadowfill_fp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = shadowfill_fp.glsl; sourceTree = "<group>"; };
+		2758BA1A178FCFC0007F6582 /* shadowfill_vp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = shadowfill_vp.c; sourceTree = "<group>"; };
+		2758BA1B178FCFC0007F6582 /* shadowfill_vp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = shadowfill_vp.glsl; sourceTree = "<group>"; };
+		2758BA1C178FCFC0007F6582 /* shadowmask_fp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = shadowmask_fp.c; sourceTree = "<group>"; };
+		2758BA1D178FCFC0007F6582 /* shadowmask_fp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = shadowmask_fp.glsl; sourceTree = "<group>"; };
+		2758BA1E178FCFC0007F6582 /* shadowmask_vp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = shadowmask_vp.c; sourceTree = "<group>"; };
+		2758BA1F178FCFC0007F6582 /* shadowmask_vp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = shadowmask_vp.glsl; sourceTree = "<group>"; };
+		2758BA20178FCFC0007F6582 /* ssao_fp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ssao_fp.c; sourceTree = "<group>"; };
+		2758BA21178FCFC0007F6582 /* ssao_fp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ssao_fp.glsl; sourceTree = "<group>"; };
+		2758BA22178FCFC0007F6582 /* ssao_vp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ssao_vp.c; sourceTree = "<group>"; };
+		2758BA23178FCFC0007F6582 /* ssao_vp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ssao_vp.glsl; sourceTree = "<group>"; };
+		2758BA24178FCFC0007F6582 /* texturecolor_fp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = texturecolor_fp.c; sourceTree = "<group>"; };
+		2758BA25178FCFC0007F6582 /* texturecolor_fp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = texturecolor_fp.glsl; sourceTree = "<group>"; };
+		2758BA26178FCFC0007F6582 /* texturecolor_vp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = texturecolor_vp.c; sourceTree = "<group>"; };
+		2758BA27178FCFC0007F6582 /* texturecolor_vp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = texturecolor_vp.glsl; sourceTree = "<group>"; };
+		2758BA28178FCFC0007F6582 /* tonemap_fp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tonemap_fp.c; sourceTree = "<group>"; };
+		2758BA29178FCFC0007F6582 /* tonemap_fp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tonemap_fp.glsl; sourceTree = "<group>"; };
+		2758BA2A178FCFC0007F6582 /* tonemap_vp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tonemap_vp.c; sourceTree = "<group>"; };
+		2758BA2B178FCFC0007F6582 /* tonemap_vp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tonemap_vp.glsl; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		274FAC1A178FAF0C00B17C7A /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2758B9CC178FBC8B007F6582 /* libjpeg8.a in Frameworks */,
+				2758B9CE178FBCBC007F6582 /* OpenGL.framework in Frameworks */,
+				2758B9D0178FBCDC007F6582 /* libSDL-1.2.0.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		274FAC14178FAF0C00B17C7A = {
+			isa = PBXGroup;
+			children = (
+				2758B914178FBAFB007F6582 /* code */,
+				2758B9C9178FBC6F007F6582 /* Frameworks */,
+				2758B9CA178FBC7B007F6582 /* Libraries */,
+				274FAC1E178FAF0C00B17C7A /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		274FAC1E178FAF0C00B17C7A /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				274FAC1D178FAF0C00B17C7A /* renderer_opengl2.dylib */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		2758B914178FBAFB007F6582 /* code */ = {
+			isa = PBXGroup;
+			children = (
+				2758B9BC178FBB96007F6582 /* qcommon */,
+				2758B9A3178FBB7B007F6582 /* renderercommon */,
+				2758B91A178FBB51007F6582 /* renderergl2 */,
+				2758B915178FBB33007F6582 /* sdl */,
+			);
+			name = code;
+			path = ../../code;
+			sourceTree = SOURCE_ROOT;
+		};
+		2758B915178FBB33007F6582 /* sdl */ = {
+			isa = PBXGroup;
+			children = (
+				2758B916178FBB4B007F6582 /* sdl_gamma.c */,
+				2758B917178FBB4B007F6582 /* sdl_glimp.c */,
+			);
+			path = sdl;
+			sourceTree = "<group>";
+		};
+		2758B91A178FBB51007F6582 /* renderergl2 */ = {
+			isa = PBXGroup;
+			children = (
+				2758B9D1178FBD4E007F6582 /* glsl */,
+				2758B95F178FBB77007F6582 /* tr_animation.c */,
+				2758B960178FBB77007F6582 /* tr_backend.c */,
+				2758B961178FBB77007F6582 /* tr_bsp.c */,
+				2758B962178FBB77007F6582 /* tr_cmds.c */,
+				2758B963178FBB77007F6582 /* tr_curve.c */,
+				2758B964178FBB77007F6582 /* tr_extensions.c */,
+				2758B965178FBB77007F6582 /* tr_extramath.c */,
+				2758B966178FBB77007F6582 /* tr_extramath.h */,
+				2758B967178FBB77007F6582 /* tr_extratypes.h */,
+				2758B968178FBB77007F6582 /* tr_fbo.c */,
+				2758B969178FBB77007F6582 /* tr_fbo.h */,
+				2758B96A178FBB77007F6582 /* tr_flares.c */,
+				2758B96B178FBB77007F6582 /* tr_glsl.c */,
+				2758B96C178FBB77007F6582 /* tr_image.c */,
+				2758B96D178FBB77007F6582 /* tr_init.c */,
+				2758B96E178FBB77007F6582 /* tr_light.c */,
+				2758B96F178FBB77007F6582 /* tr_local.h */,
+				2758B970178FBB77007F6582 /* tr_main.c */,
+				2758B971178FBB77007F6582 /* tr_marks.c */,
+				2758B972178FBB77007F6582 /* tr_mesh.c */,
+				2758B973178FBB77007F6582 /* tr_model_iqm.c */,
+				2758B974178FBB77007F6582 /* tr_model.c */,
+				2758B975178FBB77007F6582 /* tr_postprocess.c */,
+				2758B976178FBB77007F6582 /* tr_postprocess.h */,
+				2758B977178FBB77007F6582 /* tr_scene.c */,
+				2758B978178FBB77007F6582 /* tr_shade_calc.c */,
+				2758B979178FBB77007F6582 /* tr_shade.c */,
+				2758B97A178FBB77007F6582 /* tr_shader.c */,
+				2758B97B178FBB77007F6582 /* tr_shadows.c */,
+				2758B97C178FBB77007F6582 /* tr_sky.c */,
+				2758B97D178FBB77007F6582 /* tr_subs.c */,
+				2758B97E178FBB77007F6582 /* tr_surface.c */,
+				2758B97F178FBB77007F6582 /* tr_vbo.c */,
+				2758B980178FBB77007F6582 /* tr_world.c */,
+			);
+			path = renderergl2;
+			sourceTree = "<group>";
+		};
+		2758B9A3178FBB7B007F6582 /* renderercommon */ = {
+			isa = PBXGroup;
+			children = (
+				2758B9A4178FBB8E007F6582 /* iqm.h */,
+				2758B9A5178FBB8E007F6582 /* qgl.h */,
+				2758B9A6178FBB8E007F6582 /* tr_common.h */,
+				2758B9A7178FBB8E007F6582 /* tr_font.c */,
+				2758B9A8178FBB8E007F6582 /* tr_image_bmp.c */,
+				2758B9A9178FBB8E007F6582 /* tr_image_jpg.c */,
+				2758B9AA178FBB8E007F6582 /* tr_image_pcx.c */,
+				2758B9AB178FBB8E007F6582 /* tr_image_png.c */,
+				2758B9AC178FBB8E007F6582 /* tr_image_tga.c */,
+				2758B9AD178FBB8E007F6582 /* tr_noise.c */,
+				2758B9AE178FBB8E007F6582 /* tr_public.h */,
+				2758B9AF178FBB8E007F6582 /* tr_types.h */,
+			);
+			path = renderercommon;
+			sourceTree = "<group>";
+		};
+		2758B9BC178FBB96007F6582 /* qcommon */ = {
+			isa = PBXGroup;
+			children = (
+				2758B9BD178FBBAC007F6582 /* puff.c */,
+				2758B9BE178FBBAC007F6582 /* puff.h */,
+				2758B9BF178FBBAC007F6582 /* q_math.c */,
+				2758B9C0178FBBAC007F6582 /* q_shared.c */,
+				2758B9C1178FBBAC007F6582 /* q_shared.h */,
+				2758B9C2178FBBAC007F6582 /* qcommon.h */,
+			);
+			path = qcommon;
+			sourceTree = "<group>";
+		};
+		2758B9C9178FBC6F007F6582 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				2758B9CD178FBCBC007F6582 /* OpenGL.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		2758B9CA178FBC7B007F6582 /* Libraries */ = {
+			isa = PBXGroup;
+			children = (
+				2758B9CF178FBCDC007F6582 /* libSDL-1.2.0.dylib */,
+				2758B9CB178FBC8B007F6582 /* libjpeg8.a */,
+			);
+			name = Libraries;
+			sourceTree = "<group>";
+		};
+		2758B9D1178FBD4E007F6582 /* glsl */ = {
+			isa = PBXGroup;
+			children = (
+				2758B9F3178FCFC0007F6582 /* bokeh_fp.c */,
+				2758B9F4178FCFC0007F6582 /* bokeh_fp.glsl */,
+				2758B9F5178FCFC0007F6582 /* bokeh_vp.c */,
+				2758B9F6178FCFC0007F6582 /* bokeh_vp.glsl */,
+				2758B9F7178FCFC0007F6582 /* calclevels4x_fp.c */,
+				2758B9F8178FCFC0007F6582 /* calclevels4x_fp.glsl */,
+				2758B9F9178FCFC0007F6582 /* calclevels4x_vp.c */,
+				2758B9FA178FCFC0007F6582 /* calclevels4x_vp.glsl */,
+				2758B9FB178FCFC0007F6582 /* depthblur_fp.c */,
+				2758B9FC178FCFC0007F6582 /* depthblur_fp.glsl */,
+				2758B9FD178FCFC0007F6582 /* depthblur_vp.c */,
+				2758B9FE178FCFC0007F6582 /* depthblur_vp.glsl */,
+				2758B9FF178FCFC0007F6582 /* dlight_fp.c */,
+				2758BA00178FCFC0007F6582 /* dlight_fp.glsl */,
+				2758BA01178FCFC0007F6582 /* dlight_vp.c */,
+				2758BA02178FCFC0007F6582 /* dlight_vp.glsl */,
+				2758BA03178FCFC0007F6582 /* down4x_fp.c */,
+				2758BA04178FCFC0007F6582 /* down4x_fp.glsl */,
+				2758BA05178FCFC0007F6582 /* down4x_vp.c */,
+				2758BA06178FCFC0007F6582 /* down4x_vp.glsl */,
+				2758BA07178FCFC0007F6582 /* fogpass_fp.c */,
+				2758BA08178FCFC0007F6582 /* fogpass_fp.glsl */,
+				2758BA09178FCFC0007F6582 /* fogpass_vp.c */,
+				2758BA0A178FCFC0007F6582 /* fogpass_vp.glsl */,
+				2758BA0B178FCFC0007F6582 /* gen.sh */,
+				2758BA0C178FCFC0007F6582 /* generic_fp.c */,
+				2758BA0D178FCFC0007F6582 /* generic_fp.glsl */,
+				2758BA0E178FCFC0007F6582 /* generic_vp.c */,
+				2758BA0F178FCFC0007F6582 /* generic_vp.glsl */,
+				2758BA10178FCFC0007F6582 /* lightall_fp.c */,
+				2758BA11178FCFC0007F6582 /* lightall_fp.glsl */,
+				2758BA12178FCFC0007F6582 /* lightall_vp.c */,
+				2758BA13178FCFC0007F6582 /* lightall_vp.glsl */,
+				2758BA14178FCFC0007F6582 /* pshadow_fp.c */,
+				2758BA15178FCFC0007F6582 /* pshadow_fp.glsl */,
+				2758BA16178FCFC0007F6582 /* pshadow_vp.c */,
+				2758BA17178FCFC0007F6582 /* pshadow_vp.glsl */,
+				2758BA18178FCFC0007F6582 /* shadowfill_fp.c */,
+				2758BA19178FCFC0007F6582 /* shadowfill_fp.glsl */,
+				2758BA1A178FCFC0007F6582 /* shadowfill_vp.c */,
+				2758BA1B178FCFC0007F6582 /* shadowfill_vp.glsl */,
+				2758BA1C178FCFC0007F6582 /* shadowmask_fp.c */,
+				2758BA1D178FCFC0007F6582 /* shadowmask_fp.glsl */,
+				2758BA1E178FCFC0007F6582 /* shadowmask_vp.c */,
+				2758BA1F178FCFC0007F6582 /* shadowmask_vp.glsl */,
+				2758BA20178FCFC0007F6582 /* ssao_fp.c */,
+				2758BA21178FCFC0007F6582 /* ssao_fp.glsl */,
+				2758BA22178FCFC0007F6582 /* ssao_vp.c */,
+				2758BA23178FCFC0007F6582 /* ssao_vp.glsl */,
+				2758BA24178FCFC0007F6582 /* texturecolor_fp.c */,
+				2758BA25178FCFC0007F6582 /* texturecolor_fp.glsl */,
+				2758BA26178FCFC0007F6582 /* texturecolor_vp.c */,
+				2758BA27178FCFC0007F6582 /* texturecolor_vp.glsl */,
+				2758BA28178FCFC0007F6582 /* tonemap_fp.c */,
+				2758BA29178FCFC0007F6582 /* tonemap_fp.glsl */,
+				2758BA2A178FCFC0007F6582 /* tonemap_vp.c */,
+				2758BA2B178FCFC0007F6582 /* tonemap_vp.glsl */,
+			);
+			path = glsl;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		274FAC1C178FAF0C00B17C7A /* renderer_opengl2 */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 274FAC21178FAF0C00B17C7A /* Build configuration list for PBXNativeTarget "renderer_opengl2" */;
+			buildPhases = (
+				2758B9F2178FCB65007F6582 /* Run Script - Generate C From GLSL Files */,
+				274FAC19178FAF0C00B17C7A /* Sources */,
+				274FAC1A178FAF0C00B17C7A /* Frameworks */,
+				2758BA48178FD003007F6582 /* Run Script - Delete GLSL-Generated C Files */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = renderer_opengl2;
+			productName = renderer_opengl2;
+			productReference = 274FAC1D178FAF0C00B17C7A /* renderer_opengl2.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		274FAC15178FAF0C00B17C7A /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				CLASSPREFIX = io;
+				LastUpgradeCheck = 0460;
+				ORGANIZATIONNAME = ioquake;
+			};
+			buildConfigurationList = 274FAC18178FAF0C00B17C7A /* Build configuration list for PBXProject "renderer_opengl2" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 274FAC14178FAF0C00B17C7A;
+			productRefGroup = 274FAC1E178FAF0C00B17C7A /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				274FAC1C178FAF0C00B17C7A /* renderer_opengl2 */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		2758B9F2178FCB65007F6582 /* Run Script - Generate C From GLSL Files */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Run Script - Generate C From GLSL Files";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "GLSLPATH=\"${SRCROOT}/../../code/renderergl2/glsl\"\n\nfunction glslToDotC()\n{\n    INFILE=\"${1}\"\n    INEXT=\"${1##*.}\"\n    INSTRIP=\"${1##*/}\"\n    INBASE=\"${INSTRIP%.glsl}\"\n    OUTFILE=\"${1%.glsl}.c\"\n\n    if [ ! ${INFILE} ] || [ ! -e ${INFILE} ]; then\n        echo \"**** ERROR: no input file\"\n        exit -1\n    fi\n\n    if [ ${INEXT} != \"glsl\" ]; then\n        echo \"**** ERROR: input file must have .glsl extension\"\n        exit -2\n    fi\n\n    echo \"const char *fallbackShader_${INBASE} =\" > ${OUTFILE}\n    cat ${INFILE} | sed 's/^/\\\"/;s/$/\\\\n\\\"/' >> ${OUTFILE}\n    echo \";\" >> ${OUTFILE}\n}\n\npushd \"${GLSLPATH}\"\n\nfind *.glsl | while read GLSLFILE; do glslToDotC \"${GLSLFILE}\"; done\n\npopd\n";
+		};
+		2758BA48178FD003007F6582 /* Run Script - Delete GLSL-Generated C Files */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Run Script - Delete GLSL-Generated C Files";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "GLSLPATH=\"${SRCROOT}/../../code/renderergl2/glsl\"\n\npushd \"${GLSLPATH}\"\n\nfind *.c -delete\n\npopd\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		274FAC19178FAF0C00B17C7A /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2758B918178FBB4B007F6582 /* sdl_gamma.c in Sources */,
+				2758B919178FBB4B007F6582 /* sdl_glimp.c in Sources */,
+				2758B981178FBB77007F6582 /* tr_animation.c in Sources */,
+				2758B982178FBB77007F6582 /* tr_backend.c in Sources */,
+				2758B983178FBB77007F6582 /* tr_bsp.c in Sources */,
+				2758B984178FBB77007F6582 /* tr_cmds.c in Sources */,
+				2758B985178FBB77007F6582 /* tr_curve.c in Sources */,
+				2758B986178FBB77007F6582 /* tr_extensions.c in Sources */,
+				2758B987178FBB77007F6582 /* tr_extramath.c in Sources */,
+				2758B98A178FBB77007F6582 /* tr_fbo.c in Sources */,
+				2758B98C178FBB77007F6582 /* tr_flares.c in Sources */,
+				2758B98D178FBB77007F6582 /* tr_glsl.c in Sources */,
+				2758B98E178FBB77007F6582 /* tr_image.c in Sources */,
+				2758B98F178FBB77007F6582 /* tr_init.c in Sources */,
+				2758B990178FBB77007F6582 /* tr_light.c in Sources */,
+				2758B992178FBB77007F6582 /* tr_main.c in Sources */,
+				2758B993178FBB77007F6582 /* tr_marks.c in Sources */,
+				2758B994178FBB77007F6582 /* tr_mesh.c in Sources */,
+				2758B995178FBB77007F6582 /* tr_model_iqm.c in Sources */,
+				2758B996178FBB77007F6582 /* tr_model.c in Sources */,
+				2758B997178FBB77007F6582 /* tr_postprocess.c in Sources */,
+				2758B999178FBB77007F6582 /* tr_scene.c in Sources */,
+				2758B99A178FBB77007F6582 /* tr_shade_calc.c in Sources */,
+				2758B99B178FBB77007F6582 /* tr_shade.c in Sources */,
+				2758B99C178FBB77007F6582 /* tr_shader.c in Sources */,
+				2758B99D178FBB77007F6582 /* tr_shadows.c in Sources */,
+				2758B99E178FBB77007F6582 /* tr_sky.c in Sources */,
+				2758B99F178FBB77007F6582 /* tr_subs.c in Sources */,
+				2758B9A0178FBB77007F6582 /* tr_surface.c in Sources */,
+				2758B9A1178FBB77007F6582 /* tr_vbo.c in Sources */,
+				2758B9A2178FBB77007F6582 /* tr_world.c in Sources */,
+				2758B9B3178FBB8E007F6582 /* tr_font.c in Sources */,
+				2758B9B4178FBB8E007F6582 /* tr_image_bmp.c in Sources */,
+				2758B9B5178FBB8E007F6582 /* tr_image_jpg.c in Sources */,
+				2758B9B6178FBB8E007F6582 /* tr_image_pcx.c in Sources */,
+				2758B9B7178FBB8E007F6582 /* tr_image_png.c in Sources */,
+				2758B9B8178FBB8E007F6582 /* tr_image_tga.c in Sources */,
+				2758B9B9178FBB8E007F6582 /* tr_noise.c in Sources */,
+				2758B9C3178FBBAC007F6582 /* puff.c in Sources */,
+				2758B9C5178FBBAC007F6582 /* q_math.c in Sources */,
+				2758B9C6178FBBAC007F6582 /* q_shared.c in Sources */,
+				2758BA2C178FCFC0007F6582 /* bokeh_fp.c in Sources */,
+				2758BA2D178FCFC0007F6582 /* bokeh_vp.c in Sources */,
+				2758BA2E178FCFC0007F6582 /* calclevels4x_fp.c in Sources */,
+				2758BA2F178FCFC0007F6582 /* calclevels4x_vp.c in Sources */,
+				2758BA30178FCFC0007F6582 /* depthblur_fp.c in Sources */,
+				2758BA31178FCFC0007F6582 /* depthblur_vp.c in Sources */,
+				2758BA32178FCFC0007F6582 /* dlight_fp.c in Sources */,
+				2758BA33178FCFC0007F6582 /* dlight_vp.c in Sources */,
+				2758BA34178FCFC0007F6582 /* down4x_fp.c in Sources */,
+				2758BA35178FCFC0007F6582 /* down4x_vp.c in Sources */,
+				2758BA36178FCFC0007F6582 /* fogpass_fp.c in Sources */,
+				2758BA37178FCFC0007F6582 /* fogpass_vp.c in Sources */,
+				2758BA38178FCFC0007F6582 /* generic_fp.c in Sources */,
+				2758BA39178FCFC0007F6582 /* generic_vp.c in Sources */,
+				2758BA3A178FCFC0007F6582 /* lightall_fp.c in Sources */,
+				2758BA3B178FCFC1007F6582 /* lightall_vp.c in Sources */,
+				2758BA3C178FCFC1007F6582 /* pshadow_fp.c in Sources */,
+				2758BA3D178FCFC1007F6582 /* pshadow_vp.c in Sources */,
+				2758BA3E178FCFC1007F6582 /* shadowfill_fp.c in Sources */,
+				2758BA3F178FCFC1007F6582 /* shadowfill_vp.c in Sources */,
+				2758BA40178FCFC1007F6582 /* shadowmask_fp.c in Sources */,
+				2758BA41178FCFC1007F6582 /* shadowmask_vp.c in Sources */,
+				2758BA42178FCFC1007F6582 /* ssao_fp.c in Sources */,
+				2758BA43178FCFC1007F6582 /* ssao_vp.c in Sources */,
+				2758BA44178FCFC1007F6582 /* texturecolor_fp.c in Sources */,
+				2758BA45178FCFC1007F6582 /* texturecolor_vp.c in Sources */,
+				2758BA46178FCFC1007F6582 /* tonemap_fp.c in Sources */,
+				2758BA47178FCFC1007F6582 /* tonemap_vp.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		274FAC1F178FAF0C00B17C7A /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"USE_LOCAL_HEADERS=1",
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		274FAC20178FAF0C00B17C7A /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = "USE_LOCAL_HEADERS=1";
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		274FAC22178FAF0C00B17C7A /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					"\"$(SRCROOT)/../../code/jpeg-8c\"",
+					"\"$(SRCROOT)/../../code/SDL12/include\"",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"\"$(SRCROOT)/../../code/libs/macosx\"",
+					"\"$(SRCROOT)/../../../../../../Library/Developer/Xcode/DerivedData/ioquake3-dqrqeayrbnbwitdwenoviousqwyc/Build/Products/Debug\"",
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		274FAC23178FAF0C00B17C7A /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					"\"$(SRCROOT)/../../code/jpeg-8c\"",
+					"\"$(SRCROOT)/../../code/SDL12/include\"",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"\"$(SRCROOT)/../../code/libs/macosx\"",
+					"\"$(SRCROOT)/../../../../../../Library/Developer/Xcode/DerivedData/ioquake3-dqrqeayrbnbwitdwenoviousqwyc/Build/Products/Debug\"",
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		274FAC18178FAF0C00B17C7A /* Build configuration list for PBXProject "renderer_opengl2" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				274FAC1F178FAF0C00B17C7A /* Debug */,
+				274FAC20178FAF0C00B17C7A /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		274FAC21178FAF0C00B17C7A /* Build configuration list for PBXNativeTarget "renderer_opengl2" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				274FAC22178FAF0C00B17C7A /* Debug */,
+				274FAC23178FAF0C00B17C7A /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 274FAC15178FAF0C00B17C7A /* Project object */;
+}
--- a/misc/xcode/speex.xcodeproj/project.pbxproj
+++ b/misc/xcode/speex.xcodeproj/project.pbxproj
@ -0,0 +1,519 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		2758BAD717905A41007F6582 /* bits.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA7C17905A41007F6582 /* bits.c */; };
+		2758BAD817905A41007F6582 /* buffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA7D17905A41007F6582 /* buffer.c */; };
+		2758BADC17905A41007F6582 /* cb_search.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA8117905A41007F6582 /* cb_search.c */; };
+		2758BAE017905A41007F6582 /* exc_5_64_table.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA8517905A41007F6582 /* exc_5_64_table.c */; };
+		2758BAE117905A41007F6582 /* exc_5_256_table.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA8617905A41007F6582 /* exc_5_256_table.c */; };
+		2758BAE217905A41007F6582 /* exc_8_128_table.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA8717905A41007F6582 /* exc_8_128_table.c */; };
+		2758BAE317905A41007F6582 /* exc_10_16_table.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA8817905A41007F6582 /* exc_10_16_table.c */; };
+		2758BAE417905A41007F6582 /* exc_10_32_table.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA8917905A41007F6582 /* exc_10_32_table.c */; };
+		2758BAE517905A41007F6582 /* exc_20_32_table.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA8A17905A41007F6582 /* exc_20_32_table.c */; };
+		2758BAE617905A41007F6582 /* fftwrap.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA8B17905A41007F6582 /* fftwrap.c */; };
+		2758BAE817905A41007F6582 /* filterbank.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA8D17905A41007F6582 /* filterbank.c */; };
+		2758BAED17905A41007F6582 /* filters.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA9217905A41007F6582 /* filters.c */; };
+		2758BAF417905A41007F6582 /* gain_table_lbr.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA9917905A41007F6582 /* gain_table_lbr.c */; };
+		2758BAF517905A41007F6582 /* gain_table.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA9A17905A41007F6582 /* gain_table.c */; };
+		2758BAF617905A41007F6582 /* hexc_10_32_table.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA9B17905A41007F6582 /* hexc_10_32_table.c */; };
+		2758BAF717905A41007F6582 /* hexc_table.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA9C17905A41007F6582 /* hexc_table.c */; };
+		2758BAF817905A41007F6582 /* high_lsp_tables.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA9D17905A41007F6582 /* high_lsp_tables.c */; };
+		2758BAF917905A41007F6582 /* jitter.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA9E17905A41007F6582 /* jitter.c */; };
+		2758BAFA17905A41007F6582 /* kiss_fft.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA9F17905A41007F6582 /* kiss_fft.c */; };
+		2758BAFC17905A41007F6582 /* kiss_fftr.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAA117905A41007F6582 /* kiss_fftr.c */; };
+		2758BAFF17905A41007F6582 /* lpc.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAA417905A41007F6582 /* lpc.c */; };
+		2758BB0217905A41007F6582 /* lsp_tables_nb.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAA717905A41007F6582 /* lsp_tables_nb.c */; };
+		2758BB0317905A41007F6582 /* lsp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAA817905A41007F6582 /* lsp.c */; };
+		2758BB0817905A41007F6582 /* ltp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAAD17905A41007F6582 /* ltp.c */; };
+		2758BB0B17905A41007F6582 /* mdf.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAB017905A41007F6582 /* mdf.c */; };
+		2758BB0D17905A41007F6582 /* modes_wb.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAB217905A41007F6582 /* modes_wb.c */; };
+		2758BB0E17905A41007F6582 /* modes.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAB317905A41007F6582 /* modes.c */; };
+		2758BB1017905A41007F6582 /* nb_celp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAB517905A41007F6582 /* nb_celp.c */; };
+		2758BB1317905A41007F6582 /* preprocess.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAB817905A41007F6582 /* preprocess.c */; };
+		2758BB1617905A41007F6582 /* quant_lsp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BABB17905A41007F6582 /* quant_lsp.c */; };
+		2758BB1817905A41007F6582 /* resample.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BABD17905A41007F6582 /* resample.c */; };
+		2758BB1917905A41007F6582 /* sb_celp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BABE17905A41007F6582 /* sb_celp.c */; };
+		2758BB1B17905A41007F6582 /* smallft.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAC017905A41007F6582 /* smallft.c */; };
+		2758BB1D17905A41007F6582 /* speex_callbacks.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAC217905A41007F6582 /* speex_callbacks.c */; };
+		2758BB1E17905A41007F6582 /* speex_header.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAC317905A41007F6582 /* speex_header.c */; };
+		2758BB1F17905A41007F6582 /* speex.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAC417905A41007F6582 /* speex.c */; };
+		2758BB2117905A41007F6582 /* stereo.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAC617905A41007F6582 /* stereo.c */; };
+		2758BB2717905A41007F6582 /* vbr.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BACC17905A41007F6582 /* vbr.c */; };
+		2758BB2D17905A41007F6582 /* vq.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAD217905A41007F6582 /* vq.c */; };
+		2758BB2F17905A41007F6582 /* window.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAD417905A41007F6582 /* window.c */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		2758BA57179059C1007F6582 /* libspeex.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libspeex.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		2758BA6217905A2B007F6582 /* speex_bits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_bits.h; sourceTree = "<group>"; };
+		2758BA6317905A2B007F6582 /* speex_buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_buffer.h; sourceTree = "<group>"; };
+		2758BA6417905A2B007F6582 /* speex_callbacks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_callbacks.h; sourceTree = "<group>"; };
+		2758BA6517905A2B007F6582 /* speex_config_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_config_types.h; sourceTree = "<group>"; };
+		2758BA6617905A2B007F6582 /* speex_echo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_echo.h; sourceTree = "<group>"; };
+		2758BA6717905A2B007F6582 /* speex_header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_header.h; sourceTree = "<group>"; };
+		2758BA6817905A2B007F6582 /* speex_jitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_jitter.h; sourceTree = "<group>"; };
+		2758BA6917905A2B007F6582 /* speex_preprocess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_preprocess.h; sourceTree = "<group>"; };
+		2758BA6A17905A2B007F6582 /* speex_resampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_resampler.h; sourceTree = "<group>"; };
+		2758BA6B17905A2B007F6582 /* speex_stereo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_stereo.h; sourceTree = "<group>"; };
+		2758BA6C17905A2B007F6582 /* speex_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_types.h; sourceTree = "<group>"; };
+		2758BA6D17905A2B007F6582 /* speex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex.h; sourceTree = "<group>"; };
+		2758BA7A17905A41007F6582 /* _kiss_fft_guts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _kiss_fft_guts.h; sourceTree = "<group>"; };
+		2758BA7B17905A41007F6582 /* arch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = arch.h; sourceTree = "<group>"; };
+		2758BA7C17905A41007F6582 /* bits.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bits.c; sourceTree = "<group>"; };
+		2758BA7D17905A41007F6582 /* buffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = buffer.c; sourceTree = "<group>"; };
+		2758BA7E17905A41007F6582 /* cb_search_arm4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cb_search_arm4.h; sourceTree = "<group>"; };
+		2758BA7F17905A41007F6582 /* cb_search_bfin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cb_search_bfin.h; sourceTree = "<group>"; };
+		2758BA8017905A41007F6582 /* cb_search_sse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cb_search_sse.h; sourceTree = "<group>"; };
+		2758BA8117905A41007F6582 /* cb_search.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cb_search.c; sourceTree = "<group>"; };
+		2758BA8217905A41007F6582 /* cb_search.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cb_search.h; sourceTree = "<group>"; };
+		2758BA8317905A41007F6582 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
+		2758BA8417905A41007F6582 /* echo_diagnostic.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = echo_diagnostic.m; sourceTree = "<group>"; };
+		2758BA8517905A41007F6582 /* exc_5_64_table.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = exc_5_64_table.c; sourceTree = "<group>"; };
+		2758BA8617905A41007F6582 /* exc_5_256_table.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = exc_5_256_table.c; sourceTree = "<group>"; };
+		2758BA8717905A41007F6582 /* exc_8_128_table.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = exc_8_128_table.c; sourceTree = "<group>"; };
+		2758BA8817905A41007F6582 /* exc_10_16_table.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = exc_10_16_table.c; sourceTree = "<group>"; };
+		2758BA8917905A41007F6582 /* exc_10_32_table.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = exc_10_32_table.c; sourceTree = "<group>"; };
+		2758BA8A17905A41007F6582 /* exc_20_32_table.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = exc_20_32_table.c; sourceTree = "<group>"; };
+		2758BA8B17905A41007F6582 /* fftwrap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fftwrap.c; sourceTree = "<group>"; };
+		2758BA8C17905A41007F6582 /* fftwrap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fftwrap.h; sourceTree = "<group>"; };
+		2758BA8D17905A41007F6582 /* filterbank.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = filterbank.c; sourceTree = "<group>"; };
+		2758BA8E17905A41007F6582 /* filterbank.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = filterbank.h; sourceTree = "<group>"; };
+		2758BA8F17905A41007F6582 /* filters_arm4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = filters_arm4.h; sourceTree = "<group>"; };
+		2758BA9017905A41007F6582 /* filters_bfin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = filters_bfin.h; sourceTree = "<group>"; };
+		2758BA9117905A41007F6582 /* filters_sse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = filters_sse.h; sourceTree = "<group>"; };
+		2758BA9217905A41007F6582 /* filters.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = filters.c; sourceTree = "<group>"; };
+		2758BA9317905A41007F6582 /* filters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = filters.h; sourceTree = "<group>"; };
+		2758BA9417905A41007F6582 /* fixed_arm4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fixed_arm4.h; sourceTree = "<group>"; };
+		2758BA9517905A41007F6582 /* fixed_arm5e.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fixed_arm5e.h; sourceTree = "<group>"; };
+		2758BA9617905A41007F6582 /* fixed_bfin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fixed_bfin.h; sourceTree = "<group>"; };
+		2758BA9717905A41007F6582 /* fixed_debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fixed_debug.h; sourceTree = "<group>"; };
+		2758BA9817905A41007F6582 /* fixed_generic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fixed_generic.h; sourceTree = "<group>"; };
+		2758BA9917905A41007F6582 /* gain_table_lbr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gain_table_lbr.c; sourceTree = "<group>"; };
+		2758BA9A17905A41007F6582 /* gain_table.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gain_table.c; sourceTree = "<group>"; };
+		2758BA9B17905A41007F6582 /* hexc_10_32_table.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hexc_10_32_table.c; sourceTree = "<group>"; };
+		2758BA9C17905A41007F6582 /* hexc_table.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hexc_table.c; sourceTree = "<group>"; };
+		2758BA9D17905A41007F6582 /* high_lsp_tables.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = high_lsp_tables.c; sourceTree = "<group>"; };
+		2758BA9E17905A41007F6582 /* jitter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jitter.c; sourceTree = "<group>"; };
+		2758BA9F17905A41007F6582 /* kiss_fft.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = kiss_fft.c; sourceTree = "<group>"; };
+		2758BAA017905A41007F6582 /* kiss_fft.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kiss_fft.h; sourceTree = "<group>"; };
+		2758BAA117905A41007F6582 /* kiss_fftr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = kiss_fftr.c; sourceTree = "<group>"; };
+		2758BAA217905A41007F6582 /* kiss_fftr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kiss_fftr.h; sourceTree = "<group>"; };
+		2758BAA317905A41007F6582 /* lpc_bfin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lpc_bfin.h; sourceTree = "<group>"; };
+		2758BAA417905A41007F6582 /* lpc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lpc.c; sourceTree = "<group>"; };
+		2758BAA517905A41007F6582 /* lpc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lpc.h; sourceTree = "<group>"; };
+		2758BAA617905A41007F6582 /* lsp_bfin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lsp_bfin.h; sourceTree = "<group>"; };
+		2758BAA717905A41007F6582 /* lsp_tables_nb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lsp_tables_nb.c; sourceTree = "<group>"; };
+		2758BAA817905A41007F6582 /* lsp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lsp.c; sourceTree = "<group>"; };
+		2758BAA917905A41007F6582 /* lsp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lsp.h; sourceTree = "<group>"; };
+		2758BAAA17905A41007F6582 /* ltp_arm4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ltp_arm4.h; sourceTree = "<group>"; };
+		2758BAAB17905A41007F6582 /* ltp_bfin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ltp_bfin.h; sourceTree = "<group>"; };
+		2758BAAC17905A41007F6582 /* ltp_sse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ltp_sse.h; sourceTree = "<group>"; };
+		2758BAAD17905A41007F6582 /* ltp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ltp.c; sourceTree = "<group>"; };
+		2758BAAE17905A41007F6582 /* ltp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ltp.h; sourceTree = "<group>"; };
+		2758BAAF17905A41007F6582 /* math_approx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = math_approx.h; sourceTree = "<group>"; };
+		2758BAB017905A41007F6582 /* mdf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mdf.c; sourceTree = "<group>"; };
+		2758BAB117905A41007F6582 /* misc_bfin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = misc_bfin.h; sourceTree = "<group>"; };
+		2758BAB217905A41007F6582 /* modes_wb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = modes_wb.c; sourceTree = "<group>"; };
+		2758BAB317905A41007F6582 /* modes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = modes.c; sourceTree = "<group>"; };
+		2758BAB417905A41007F6582 /* modes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = modes.h; sourceTree = "<group>"; };
+		2758BAB517905A41007F6582 /* nb_celp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nb_celp.c; sourceTree = "<group>"; };
+		2758BAB617905A41007F6582 /* nb_celp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nb_celp.h; sourceTree = "<group>"; };
+		2758BAB717905A41007F6582 /* os_support.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = os_support.h; sourceTree = "<group>"; };
+		2758BAB817905A41007F6582 /* preprocess.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = preprocess.c; sourceTree = "<group>"; };
+		2758BAB917905A41007F6582 /* pseudofloat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pseudofloat.h; sourceTree = "<group>"; };
+		2758BABA17905A41007F6582 /* quant_lsp_bfin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = quant_lsp_bfin.h; sourceTree = "<group>"; };
+		2758BABB17905A41007F6582 /* quant_lsp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = quant_lsp.c; sourceTree = "<group>"; };
+		2758BABC17905A41007F6582 /* quant_lsp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = quant_lsp.h; sourceTree = "<group>"; };
+		2758BABD17905A41007F6582 /* resample.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = resample.c; sourceTree = "<group>"; };
+		2758BABE17905A41007F6582 /* sb_celp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sb_celp.c; sourceTree = "<group>"; };
+		2758BABF17905A41007F6582 /* sb_celp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sb_celp.h; sourceTree = "<group>"; };
+		2758BAC017905A41007F6582 /* smallft.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = smallft.c; sourceTree = "<group>"; };
+		2758BAC117905A41007F6582 /* smallft.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = smallft.h; sourceTree = "<group>"; };
+		2758BAC217905A41007F6582 /* speex_callbacks.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = speex_callbacks.c; sourceTree = "<group>"; };
+		2758BAC317905A41007F6582 /* speex_header.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = speex_header.c; sourceTree = "<group>"; };
+		2758BAC417905A41007F6582 /* speex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = speex.c; sourceTree = "<group>"; };
+		2758BAC517905A41007F6582 /* stack_alloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stack_alloc.h; sourceTree = "<group>"; };
+		2758BAC617905A41007F6582 /* stereo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stereo.c; sourceTree = "<group>"; };
+		2758BAC717905A41007F6582 /* testdenoise.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testdenoise.c; sourceTree = "<group>"; };
+		2758BAC817905A41007F6582 /* testecho.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testecho.c; sourceTree = "<group>"; };
+		2758BAC917905A41007F6582 /* testenc_uwb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testenc_uwb.c; sourceTree = "<group>"; };
+		2758BACA17905A41007F6582 /* testenc_wb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testenc_wb.c; sourceTree = "<group>"; };
+		2758BACB17905A41007F6582 /* testenc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testenc.c; sourceTree = "<group>"; };
+		2758BACC17905A41007F6582 /* vbr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vbr.c; sourceTree = "<group>"; };
+		2758BACD17905A41007F6582 /* vbr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vbr.h; sourceTree = "<group>"; };
+		2758BACE17905A41007F6582 /* vorbis_psy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vorbis_psy.h; sourceTree = "<group>"; };
+		2758BACF17905A41007F6582 /* vq_arm4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vq_arm4.h; sourceTree = "<group>"; };
+		2758BAD017905A41007F6582 /* vq_bfin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vq_bfin.h; sourceTree = "<group>"; };
+		2758BAD117905A41007F6582 /* vq_sse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vq_sse.h; sourceTree = "<group>"; };
+		2758BAD217905A41007F6582 /* vq.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vq.c; sourceTree = "<group>"; };
+		2758BAD317905A41007F6582 /* vq.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vq.h; sourceTree = "<group>"; };
+		2758BAD417905A41007F6582 /* window.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = window.c; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		2758BA54179059C1007F6582 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		2758BA4E179059C1007F6582 = {
+			isa = PBXGroup;
+			children = (
+				2758BA5E179059E4007F6582 /* code */,
+				2758BA58179059C1007F6582 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		2758BA58179059C1007F6582 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				2758BA57179059C1007F6582 /* libspeex.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		2758BA5E179059E4007F6582 /* code */ = {
+			isa = PBXGroup;
+			children = (
+				2758BA5F179059F0007F6582 /* libspeex */,
+			);
+			name = code;
+			path = ../../code;
+			sourceTree = "<group>";
+		};
+		2758BA5F179059F0007F6582 /* libspeex */ = {
+			isa = PBXGroup;
+			children = (
+				2758BA6017905A02007F6582 /* include */,
+				2758BA7A17905A41007F6582 /* _kiss_fft_guts.h */,
+				2758BA7B17905A41007F6582 /* arch.h */,
+				2758BA7C17905A41007F6582 /* bits.c */,
+				2758BA7D17905A41007F6582 /* buffer.c */,
+				2758BA7E17905A41007F6582 /* cb_search_arm4.h */,
+				2758BA7F17905A41007F6582 /* cb_search_bfin.h */,
+				2758BA8017905A41007F6582 /* cb_search_sse.h */,
+				2758BA8117905A41007F6582 /* cb_search.c */,
+				2758BA8217905A41007F6582 /* cb_search.h */,
+				2758BA8317905A41007F6582 /* config.h */,
+				2758BA8417905A41007F6582 /* echo_diagnostic.m */,
+				2758BA8517905A41007F6582 /* exc_5_64_table.c */,
+				2758BA8617905A41007F6582 /* exc_5_256_table.c */,
+				2758BA8717905A41007F6582 /* exc_8_128_table.c */,
+				2758BA8817905A41007F6582 /* exc_10_16_table.c */,
+				2758BA8917905A41007F6582 /* exc_10_32_table.c */,
+				2758BA8A17905A41007F6582 /* exc_20_32_table.c */,
+				2758BA8B17905A41007F6582 /* fftwrap.c */,
+				2758BA8C17905A41007F6582 /* fftwrap.h */,
+				2758BA8D17905A41007F6582 /* filterbank.c */,
+				2758BA8E17905A41007F6582 /* filterbank.h */,
+				2758BA8F17905A41007F6582 /* filters_arm4.h */,
+				2758BA9017905A41007F6582 /* filters_bfin.h */,
+				2758BA9117905A41007F6582 /* filters_sse.h */,
+				2758BA9217905A41007F6582 /* filters.c */,
+				2758BA9317905A41007F6582 /* filters.h */,
+				2758BA9417905A41007F6582 /* fixed_arm4.h */,
+				2758BA9517905A41007F6582 /* fixed_arm5e.h */,
+				2758BA9617905A41007F6582 /* fixed_bfin.h */,
+				2758BA9717905A41007F6582 /* fixed_debug.h */,
+				2758BA9817905A41007F6582 /* fixed_generic.h */,
+				2758BA9917905A41007F6582 /* gain_table_lbr.c */,
+				2758BA9A17905A41007F6582 /* gain_table.c */,
+				2758BA9B17905A41007F6582 /* hexc_10_32_table.c */,
+				2758BA9C17905A41007F6582 /* hexc_table.c */,
+				2758BA9D17905A41007F6582 /* high_lsp_tables.c */,
+				2758BA9E17905A41007F6582 /* jitter.c */,
+				2758BA9F17905A41007F6582 /* kiss_fft.c */,
+				2758BAA017905A41007F6582 /* kiss_fft.h */,
+				2758BAA117905A41007F6582 /* kiss_fftr.c */,
+				2758BAA217905A41007F6582 /* kiss_fftr.h */,
+				2758BAA317905A41007F6582 /* lpc_bfin.h */,
+				2758BAA417905A41007F6582 /* lpc.c */,
+				2758BAA517905A41007F6582 /* lpc.h */,
+				2758BAA617905A41007F6582 /* lsp_bfin.h */,
+				2758BAA717905A41007F6582 /* lsp_tables_nb.c */,
+				2758BAA817905A41007F6582 /* lsp.c */,
+				2758BAA917905A41007F6582 /* lsp.h */,
+				2758BAAA17905A41007F6582 /* ltp_arm4.h */,
+				2758BAAB17905A41007F6582 /* ltp_bfin.h */,
+				2758BAAC17905A41007F6582 /* ltp_sse.h */,
+				2758BAAD17905A41007F6582 /* ltp.c */,
+				2758BAAE17905A41007F6582 /* ltp.h */,
+				2758BAAF17905A41007F6582 /* math_approx.h */,
+				2758BAB017905A41007F6582 /* mdf.c */,
+				2758BAB117905A41007F6582 /* misc_bfin.h */,
+				2758BAB217905A41007F6582 /* modes_wb.c */,
+				2758BAB317905A41007F6582 /* modes.c */,
+				2758BAB417905A41007F6582 /* modes.h */,
+				2758BAB517905A41007F6582 /* nb_celp.c */,
+				2758BAB617905A41007F6582 /* nb_celp.h */,
+				2758BAB717905A41007F6582 /* os_support.h */,
+				2758BAB817905A41007F6582 /* preprocess.c */,
+				2758BAB917905A41007F6582 /* pseudofloat.h */,
+				2758BABA17905A41007F6582 /* quant_lsp_bfin.h */,
+				2758BABB17905A41007F6582 /* quant_lsp.c */,
+				2758BABC17905A41007F6582 /* quant_lsp.h */,
+				2758BABD17905A41007F6582 /* resample.c */,
+				2758BABE17905A41007F6582 /* sb_celp.c */,
+				2758BABF17905A41007F6582 /* sb_celp.h */,
+				2758BAC017905A41007F6582 /* smallft.c */,
+				2758BAC117905A41007F6582 /* smallft.h */,
+				2758BAC217905A41007F6582 /* speex_callbacks.c */,
+				2758BAC317905A41007F6582 /* speex_header.c */,
+				2758BAC417905A41007F6582 /* speex.c */,
+				2758BAC517905A41007F6582 /* stack_alloc.h */,
+				2758BAC617905A41007F6582 /* stereo.c */,
+				2758BAC717905A41007F6582 /* testdenoise.c */,
+				2758BAC817905A41007F6582 /* testecho.c */,
+				2758BAC917905A41007F6582 /* testenc_uwb.c */,
+				2758BACA17905A41007F6582 /* testenc_wb.c */,
+				2758BACB17905A41007F6582 /* testenc.c */,
+				2758BACC17905A41007F6582 /* vbr.c */,
+				2758BACD17905A41007F6582 /* vbr.h */,
+				2758BACE17905A41007F6582 /* vorbis_psy.h */,
+				2758BACF17905A41007F6582 /* vq_arm4.h */,
+				2758BAD017905A41007F6582 /* vq_bfin.h */,
+				2758BAD117905A41007F6582 /* vq_sse.h */,
+				2758BAD217905A41007F6582 /* vq.c */,
+				2758BAD317905A41007F6582 /* vq.h */,
+				2758BAD417905A41007F6582 /* window.c */,
+			);
+			path = libspeex;
+			sourceTree = "<group>";
+		};
+		2758BA6017905A02007F6582 /* include */ = {
+			isa = PBXGroup;
+			children = (
+				2758BA6117905A19007F6582 /* speex */,
+			);
+			path = include;
+			sourceTree = "<group>";
+		};
+		2758BA6117905A19007F6582 /* speex */ = {
+			isa = PBXGroup;
+			children = (
+				2758BA6217905A2B007F6582 /* speex_bits.h */,
+				2758BA6317905A2B007F6582 /* speex_buffer.h */,
+				2758BA6417905A2B007F6582 /* speex_callbacks.h */,
+				2758BA6517905A2B007F6582 /* speex_config_types.h */,
+				2758BA6617905A2B007F6582 /* speex_echo.h */,
+				2758BA6717905A2B007F6582 /* speex_header.h */,
+				2758BA6817905A2B007F6582 /* speex_jitter.h */,
+				2758BA6917905A2B007F6582 /* speex_preprocess.h */,
+				2758BA6A17905A2B007F6582 /* speex_resampler.h */,
+				2758BA6B17905A2B007F6582 /* speex_stereo.h */,
+				2758BA6C17905A2B007F6582 /* speex_types.h */,
+				2758BA6D17905A2B007F6582 /* speex.h */,
+			);
+			path = speex;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		2758BA56179059C1007F6582 /* speex */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 2758BA5B179059C1007F6582 /* Build configuration list for PBXNativeTarget "speex" */;
+			buildPhases = (
+				2758BA53179059C1007F6582 /* Sources */,
+				2758BA54179059C1007F6582 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = speex;
+			productName = speex;
+			productReference = 2758BA57179059C1007F6582 /* libspeex.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		2758BA4F179059C1007F6582 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				CLASSPREFIX = io;
+				LastUpgradeCheck = 0460;
+				ORGANIZATIONNAME = ioquake;
+			};
+			buildConfigurationList = 2758BA52179059C1007F6582 /* Build configuration list for PBXProject "speex" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 2758BA4E179059C1007F6582;
+			productRefGroup = 2758BA58179059C1007F6582 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				2758BA56179059C1007F6582 /* speex */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		2758BA53179059C1007F6582 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2758BAD717905A41007F6582 /* bits.c in Sources */,
+				2758BAD817905A41007F6582 /* buffer.c in Sources */,
+				2758BADC17905A41007F6582 /* cb_search.c in Sources */,
+				2758BAE017905A41007F6582 /* exc_5_64_table.c in Sources */,
+				2758BAE117905A41007F6582 /* exc_5_256_table.c in Sources */,
+				2758BAE217905A41007F6582 /* exc_8_128_table.c in Sources */,
+				2758BAE317905A41007F6582 /* exc_10_16_table.c in Sources */,
+				2758BAE417905A41007F6582 /* exc_10_32_table.c in Sources */,
+				2758BAE517905A41007F6582 /* exc_20_32_table.c in Sources */,
+				2758BAE617905A41007F6582 /* fftwrap.c in Sources */,
+				2758BAE817905A41007F6582 /* filterbank.c in Sources */,
+				2758BAED17905A41007F6582 /* filters.c in Sources */,
+				2758BAF417905A41007F6582 /* gain_table_lbr.c in Sources */,
+				2758BAF517905A41007F6582 /* gain_table.c in Sources */,
+				2758BAF617905A41007F6582 /* hexc_10_32_table.c in Sources */,
+				2758BAF717905A41007F6582 /* hexc_table.c in Sources */,
+				2758BAF817905A41007F6582 /* high_lsp_tables.c in Sources */,
+				2758BAF917905A41007F6582 /* jitter.c in Sources */,
+				2758BAFA17905A41007F6582 /* kiss_fft.c in Sources */,
+				2758BAFC17905A41007F6582 /* kiss_fftr.c in Sources */,
+				2758BAFF17905A41007F6582 /* lpc.c in Sources */,
+				2758BB0217905A41007F6582 /* lsp_tables_nb.c in Sources */,
+				2758BB0317905A41007F6582 /* lsp.c in Sources */,
+				2758BB0817905A41007F6582 /* ltp.c in Sources */,
+				2758BB0B17905A41007F6582 /* mdf.c in Sources */,
+				2758BB0D17905A41007F6582 /* modes_wb.c in Sources */,
+				2758BB0E17905A41007F6582 /* modes.c in Sources */,
+				2758BB1017905A41007F6582 /* nb_celp.c in Sources */,
+				2758BB1317905A41007F6582 /* preprocess.c in Sources */,
+				2758BB1617905A41007F6582 /* quant_lsp.c in Sources */,
+				2758BB1817905A41007F6582 /* resample.c in Sources */,
+				2758BB1917905A41007F6582 /* sb_celp.c in Sources */,
+				2758BB1B17905A41007F6582 /* smallft.c in Sources */,
+				2758BB1D17905A41007F6582 /* speex_callbacks.c in Sources */,
+				2758BB1E17905A41007F6582 /* speex_header.c in Sources */,
+				2758BB1F17905A41007F6582 /* speex.c in Sources */,
+				2758BB2117905A41007F6582 /* stereo.c in Sources */,
+				2758BB2717905A41007F6582 /* vbr.c in Sources */,
+				2758BB2D17905A41007F6582 /* vq.c in Sources */,
+				2758BB2F17905A41007F6582 /* window.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		2758BA59179059C1007F6582 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					HAVE_CONFIG_H,
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		2758BA5A179059C1007F6582 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		2758BA5C179059C1007F6582 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				EXECUTABLE_PREFIX = lib;
+				HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../code/libspeex/include\"";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		2758BA5D179059C1007F6582 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				EXECUTABLE_PREFIX = lib;
+				HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../code/libspeex/include\"";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		2758BA52179059C1007F6582 /* Build configuration list for PBXProject "speex" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				2758BA59179059C1007F6582 /* Debug */,
+				2758BA5A179059C1007F6582 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		2758BA5B179059C1007F6582 /* Build configuration list for PBXNativeTarget "speex" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				2758BA5C179059C1007F6582 /* Debug */,
+				2758BA5D179059C1007F6582 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 2758BA4F179059C1007F6582 /* Project object */;
+}
--- a/misc/xcode/ui.xcodeproj/project.pbxproj
+++ b/misc/xcode/ui.xcodeproj/project.pbxproj
@ -0,0 +1,299 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		2772B81A1790EDA0004CCF57 /* ui_atoms.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B8121790EDA0004CCF57 /* ui_atoms.c */; };
+		2772B81B1790EDA0004CCF57 /* ui_gameinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B8131790EDA0004CCF57 /* ui_gameinfo.c */; };
+		2772B81D1790EDA0004CCF57 /* ui_main.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B8151790EDA0004CCF57 /* ui_main.c */; };
+		2772B81E1790EDA0004CCF57 /* ui_players.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B8161790EDA0004CCF57 /* ui_players.c */; };
+		2772B8201790EDA0004CCF57 /* ui_shared.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B8181790EDA0004CCF57 /* ui_shared.c */; };
+		2772B82C1790EE01004CCF57 /* bg_lib.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B8281790EE01004CCF57 /* bg_lib.c */; };
+		2772B82E1790EE01004CCF57 /* bg_misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B82A1790EE01004CCF57 /* bg_misc.c */; };
+		2772B8331790EE22004CCF57 /* q_math.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B8301790EE22004CCF57 /* q_math.c */; };
+		2772B8341790EE22004CCF57 /* q_shared.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B8311790EE22004CCF57 /* q_shared.c */; };
+		2772B8391790EE51004CCF57 /* ui_syscalls.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B8381790EE51004CCF57 /* ui_syscalls.c */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		273531D914D1272300EB7BD6 /* ui.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = ui.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		2772B8121790EDA0004CCF57 /* ui_atoms.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_atoms.c; sourceTree = "<group>"; };
+		2772B8131790EDA0004CCF57 /* ui_gameinfo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_gameinfo.c; sourceTree = "<group>"; };
+		2772B8141790EDA0004CCF57 /* ui_local.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ui_local.h; sourceTree = "<group>"; };
+		2772B8151790EDA0004CCF57 /* ui_main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_main.c; sourceTree = "<group>"; };
+		2772B8161790EDA0004CCF57 /* ui_players.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_players.c; sourceTree = "<group>"; };
+		2772B8171790EDA0004CCF57 /* ui_public.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ui_public.h; sourceTree = "<group>"; };
+		2772B8181790EDA0004CCF57 /* ui_shared.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_shared.c; sourceTree = "<group>"; };
+		2772B8191790EDA0004CCF57 /* ui_shared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ui_shared.h; sourceTree = "<group>"; };
+		2772B8261790EDEB004CCF57 /* keycodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keycodes.h; sourceTree = "<group>"; };
+		2772B8281790EE01004CCF57 /* bg_lib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bg_lib.c; sourceTree = "<group>"; };
+		2772B8291790EE01004CCF57 /* bg_lib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bg_lib.h; sourceTree = "<group>"; };
+		2772B82A1790EE01004CCF57 /* bg_misc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bg_misc.c; sourceTree = "<group>"; };
+		2772B82B1790EE01004CCF57 /* bg_public.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bg_public.h; sourceTree = "<group>"; };
+		2772B8301790EE22004CCF57 /* q_math.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = q_math.c; sourceTree = "<group>"; };
+		2772B8311790EE22004CCF57 /* q_shared.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = q_shared.c; sourceTree = "<group>"; };
+		2772B8321790EE22004CCF57 /* q_shared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = q_shared.h; sourceTree = "<group>"; };
+		2772B8361790EE2F004CCF57 /* tr_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tr_types.h; sourceTree = "<group>"; };
+		2772B8381790EE51004CCF57 /* ui_syscalls.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_syscalls.c; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		273531D614D1272300EB7BD6 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		273531CE14D1272300EB7BD6 = {
+			isa = PBXGroup;
+			children = (
+				2772B8101790ED6D004CCF57 /* code */,
+				273531DA14D1272300EB7BD6 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		273531DA14D1272300EB7BD6 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				273531D914D1272300EB7BD6 /* ui.dylib */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		2772B8101790ED6D004CCF57 /* code */ = {
+			isa = PBXGroup;
+			children = (
+				2772B8251790EDCC004CCF57 /* client */,
+				2772B8241790EDC6004CCF57 /* game */,
+				2772B8231790EDC1004CCF57 /* qcommon */,
+				2772B8221790EDA7004CCF57 /* renderercommon */,
+				2772B8111790ED78004CCF57 /* ui */,
+			);
+			name = code;
+			path = ../../code;
+			sourceTree = SOURCE_ROOT;
+		};
+		2772B8111790ED78004CCF57 /* ui */ = {
+			isa = PBXGroup;
+			children = (
+				2772B8121790EDA0004CCF57 /* ui_atoms.c */,
+				2772B8131790EDA0004CCF57 /* ui_gameinfo.c */,
+				2772B8141790EDA0004CCF57 /* ui_local.h */,
+				2772B8151790EDA0004CCF57 /* ui_main.c */,
+				2772B8161790EDA0004CCF57 /* ui_players.c */,
+				2772B8171790EDA0004CCF57 /* ui_public.h */,
+				2772B8181790EDA0004CCF57 /* ui_shared.c */,
+				2772B8191790EDA0004CCF57 /* ui_shared.h */,
+				2772B8381790EE51004CCF57 /* ui_syscalls.c */,
+			);
+			path = ui;
+			sourceTree = "<group>";
+		};
+		2772B8221790EDA7004CCF57 /* renderercommon */ = {
+			isa = PBXGroup;
+			children = (
+				2772B8361790EE2F004CCF57 /* tr_types.h */,
+			);
+			path = renderercommon;
+			sourceTree = "<group>";
+		};
+		2772B8231790EDC1004CCF57 /* qcommon */ = {
+			isa = PBXGroup;
+			children = (
+				2772B8301790EE22004CCF57 /* q_math.c */,
+				2772B8311790EE22004CCF57 /* q_shared.c */,
+				2772B8321790EE22004CCF57 /* q_shared.h */,
+			);
+			path = qcommon;
+			sourceTree = "<group>";
+		};
+		2772B8241790EDC6004CCF57 /* game */ = {
+			isa = PBXGroup;
+			children = (
+				2772B8281790EE01004CCF57 /* bg_lib.c */,
+				2772B8291790EE01004CCF57 /* bg_lib.h */,
+				2772B82A1790EE01004CCF57 /* bg_misc.c */,
+				2772B82B1790EE01004CCF57 /* bg_public.h */,
+			);
+			path = game;
+			sourceTree = "<group>";
+		};
+		2772B8251790EDCC004CCF57 /* client */ = {
+			isa = PBXGroup;
+			children = (
+				2772B8261790EDEB004CCF57 /* keycodes.h */,
+			);
+			path = client;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		273531D814D1272300EB7BD6 /* ui */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 273531DD14D1272300EB7BD6 /* Build configuration list for PBXNativeTarget "ui" */;
+			buildPhases = (
+				273531D514D1272300EB7BD6 /* Sources */,
+				273531D614D1272300EB7BD6 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = ui;
+			productName = ui;
+			productReference = 273531D914D1272300EB7BD6 /* ui.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		273531D014D1272300EB7BD6 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0460;
+			};
+			buildConfigurationList = 273531D314D1272300EB7BD6 /* Build configuration list for PBXProject "ui" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 273531CE14D1272300EB7BD6;
+			productRefGroup = 273531DA14D1272300EB7BD6 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				273531D814D1272300EB7BD6 /* ui */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		273531D514D1272300EB7BD6 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2772B81A1790EDA0004CCF57 /* ui_atoms.c in Sources */,
+				2772B81B1790EDA0004CCF57 /* ui_gameinfo.c in Sources */,
+				2772B81D1790EDA0004CCF57 /* ui_main.c in Sources */,
+				2772B81E1790EDA0004CCF57 /* ui_players.c in Sources */,
+				2772B8201790EDA0004CCF57 /* ui_shared.c in Sources */,
+				2772B82C1790EE01004CCF57 /* bg_lib.c in Sources */,
+				2772B82E1790EE01004CCF57 /* bg_misc.c in Sources */,
+				2772B8331790EE22004CCF57 /* q_math.c in Sources */,
+				2772B8341790EE22004CCF57 /* q_shared.c in Sources */,
+				2772B8391790EE51004CCF57 /* ui_syscalls.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		273531DB14D1272300EB7BD6 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					MISSIONPACK,
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		273531DC14D1272300EB7BD6 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = MISSIONPACK;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		273531DE14D1272300EB7BD6 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				EXECUTABLE_PREFIX = "";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		273531DF14D1272300EB7BD6 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				EXECUTABLE_PREFIX = "";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		273531D314D1272300EB7BD6 /* Build configuration list for PBXProject "ui" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				273531DB14D1272300EB7BD6 /* Debug */,
+				273531DC14D1272300EB7BD6 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		273531DD14D1272300EB7BD6 /* Build configuration list for PBXNativeTarget "ui" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				273531DE14D1272300EB7BD6 /* Debug */,
+				273531DF14D1272300EB7BD6 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 273531D014D1272300EB7BD6 /* Project object */;
+}
--- a/misc/xcode/xcode-readme.txt
+++ b/misc/xcode/xcode-readme.txt
@ -0,0 +1,51 @@
+ioquake3 Xcode Projects
+Created & Maintained by Jeremiah Sypult & Contributors
+Updated: 2013/07/13
+
+
+GENERAL:
+From the ioquake3 root, navigate to misc/xcode and open the ioquake3.xcworkspace. The workspace embeds all the projects and currently builds universal (fat) binaries supporting i386 and x86_64.
+
+An older version of Xcode may be able to add support for PowerPC, but it is not currently supported in the Xcode version I produced these projects with (4.6.3).
+
+Hopefully people working with ioquake3 on OS X will benefit from using Xcodes IDE for building, hacking and debugging.
+
+
+LIBRARIES:
+- Game libraries (cgame, game, ui) compile to universal binary dylib for native (versus qvm bytecode/interpreted).
+- Renderer libraries also compile to universal binary dylib. The OpenGL 2 renderer project will normally show missing .c files in code/renderergl2/glsl. This is normal, as these .c files are automatically generated during the build process and deleted when building completes. This step is required in order for the renderer to link due to symbol dependencies in tr_glsl.c for fallback shaders.
+- ioquake3 searches for game & renderer libraries with an abbreviated architecture suffix in the filename. Xcode scripts handle symlink creation for the appropriate architectures at build time in order to support universal (fat) binaries.
+- Static libraries are used for botlib, jpeg and speex.
+- Currently links OS X system libcurl.dylib and libz.dylib.
+- SDL binary dylib is included.
+
+
+TODO:
+- dedicated support
+- missionpack support
+- curl.xcodeproj
+- ogg.xcodeproj (ogg vorbis support)
+- opusfile.xcodeproj
+- zlib.xcodeproj
+- q3asm.xcodeproj
+- q3cpp.xcodeproj
+- q3lcc.xcodeproj
+- q3rcc.xcodeproj
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+NO CARRIER
+