GLOBAL: Use macros for cleaner platform-header includes; quakedef->nzportable_def (#58)

* GLOBAL: Use macros for cleaner platform-header includes; quakedef->nzportable_def

* GLOBAL: Fix concat macro

* GLOBAL: Remove unused decal.h headers

Makefile.ctr

@@ -30,7 +30,7 @@ CFLAGS	:=	-g -fpermissive -Wall -O3 -mword-relocations \
 			-fomit-frame-pointer -ffunction-sections \
 			$(ARCH)
 
-CFLAGS	+=	$(INCLUDE) -DARM11 -D_3DS -DGLQUAKE
+CFLAGS	+=	$(INCLUDE) -DARM11 -D_3DS -DGLQUAKE -DPLATFORM_DIRECTORY="ctr" -DPLATFORM_RENDERER="gl"
 
 CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
 

Makefile.psp

@@ -115,7 +115,9 @@ NET_LIBS    = -lpspwlan -lpspnet_adhoc -lpspnet_adhocctl
 STD_LIBS	= -lstdc++ -lm -lc
 LIBS		= $(GPROF_LIBS) $(GU_LIBS) $(AUDIO_LIBS) $(MISC_LIBS) $(STD_LIBS) $(NET_LIBS)
 
-CFLAGS = -ffast-math -O3 -Ofast -G0 -Wall $(GPROF_FLAGS) -Did386="0" -DPSP $(MODE) $(HARDWARE_VIDEO_ONLY_FLAGS) -DSWIZZLE32 -DPSP_MP3_HWDECODE -DFULLBRIGHT -DHL_RENDER -Wno-strict-aliasing -DPSP_VFPU
+CFLAGS = -ffast-math -O3 -Ofast -G0 -Wall $(GPROF_FLAGS) -Did386="0" -DPSP $(MODE) $(HARDWARE_VIDEO_ONLY_FLAGS) \
+		-DSWIZZLE32 -DPSP_MP3_HWDECODE -DFULLBRIGHT -DHL_RENDER -Wno-strict-aliasing -DPSP_VFPU -DPLATFORM_DIRECTORY="psp" \
+		-DPLATFORM_RENDERER="gu"
 CXXFLAGS = -fno-rtti -Wcast-qual -Wno-write-strings -Wno-sign-compare -Wno-strict-aliasing
 ASFLAGS = $(CFLAGS) -c
 

Makefile.rvl

@@ -31,7 +31,7 @@ INCLUDES	:=
 
 CFLAGS	=		$(MACHDEP) $(INCLUDE) \
 			-g -Wall -O2 -Wcast-align -fno-merge-constants -fstrict-aliasing -fsingle-precision-constant -fno-aggressive-loop-optimizations \
-			-DGXQUAKE -DNQ_HACK -Wtrigraphs -D__WII__
+			-DGXQUAKE -DNQ_HACK -Wtrigraphs -D__WII__ -DPLATFORM_DIRECTORY="wii" -DPLATFORM_RENDERER="gx"
 
 CXXFLAGS = $(CFLAGS)
 

source/chase.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // chase.c -- chase camera code
 
-#include "quakedef.h"
+#include "nzportable_def.h"
 
 cvar_t	chase_back = {"chase_back", "100"};
 cvar_t	chase_up = {"chase_up", "16"};

source/cl_demo.c

@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "nzportable_def.h"
 
 void CL_FinishTimeDemo (void);
 

source/cl_hud.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // cl_hud.c -- status bar code
 
-#include "quakedef.h"
+#include "nzportable_def.h"
 
 #ifdef __PSP__
 #include <pspgu.h>

source/cl_input.c

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // Quake is a trademark of Id Software, Inc., (c) 1996 Id Software, Inc. All
 // rights reserved.
 
-#include "quakedef.h"
+#include "nzportable_def.h"
 
 /*
 ===============================================================================

source/cl_main.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // cl_main.c  -- client main loop
 
-#include "quakedef.h"
+#include "nzportable_def.h"
 #include "cl_slist.h"
 
 // we need to declare some mouse variables here, because the menu system

source/cl_parse.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // cl_parse.c  -- parse a message received from the server
 
-#include "quakedef.h"
+#include "nzportable_def.h"
 
 extern double hud_maxammo_starttime;
 extern double hud_maxammo_endtime;

source/cl_slist.c

@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "nzportable_def.h"
 #include "cl_slist.h"
 
 server_entry_t	slist[MAX_SERVER_LIST];

source/cl_tent.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // cl_tent.c -- client side temporary entities
 
-#include "quakedef.h"
+#include "nzportable_def.h"
 
 static	vec3_t	playerbeam_end;		// added by joe
 

source/cmd.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // cmd.c -- Quake script command processing module
 
-#include "quakedef.h"
+#include "nzportable_def.h"
 
 void Cmd_ForwardToServer (void);
 

source/console.c

@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <unistd.h>
 #endif
 #include <fcntl.h>
-#include "quakedef.h"
+#include "nzportable_def.h"
 
 int 		con_linewidth;
 

source/crc.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 /* crc.c */
 
-#include "quakedef.h"
+#include "nzportable_def.h"
 #include "crc.h"
 #include <ctype.h>
 

source/ctr/cd_null.c

@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 
 void CDAudio_Play(byte track, qboolean looping)
 {

source/ctr/common.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // common.c -- misc functions used in client and server
 
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 
 #define NUM_SAFE_ARGVS  7
 

source/ctr/gl/gl_decal.c

@@ -1,5 +1,5 @@
 
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 
 void R_SpawnDecal (vec3_t center, vec3_t normal, vec3_t tangent, int tex, int size, int isbsp)
 {

source/ctr/gl/gl_decal.h

@@ -1,2 +0,0 @@
-void R_SpawnDecal (vec3_t center, vec3_t normal, vec3_t tangent, int tex, int size, int isbsp);
-void R_SpawnDecalStatic (vec3_t org, int tex, int size);

source/ctr/gl/gl_draw.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // draw.c -- this is the only file outside the refresh that touches the
 // vid buffer
 
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 
 #define GL_COLOR_INDEX8_EXT     0x80E5
 

source/ctr/gl/gl_fog.c

@@ -5,7 +5,7 @@ Now with Quakespasm bits thrown into it!
 
 */
 
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 
 //==============================================================================
 //

source/ctr/gl/gl_main.h

@@ -364,4 +364,7 @@ void QMB_Q3Gunshot (vec3_t org, int skinnum, float alpha);
 void QMB_Q3Teleport (vec3_t org, float alpha);
 void QMB_Q3TorchFlame (vec3_t org, float size);
 
+void R_SpawnDecal (vec3_t center, vec3_t normal, vec3_t tangent, int tex, int size, int isbsp);
+void R_SpawnDecalStatic (vec3_t org, int tex, int size);
+
 extern	qboolean	qmb_initialized;

source/ctr/gl/gl_mesh.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // gl_mesh.c: triangle model functions
 
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 
 /*
 =================================================================

source/ctr/gl/gl_model.c

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // models are the only shared resource between a client and server running
 // on the same machine.
 
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 
 model_t	*loadmodel;
 char	loadname[32];	// for hunk tags

source/ctr/gl/gl_qmb.c

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // gl_rpart.c
 
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 
 //#define	DEFAULT_NUM_PARTICLES		8192
 #define	ABSOLUTE_MIN_PARTICLES      64

source/ctr/gl/gl_refrag.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // r_efrag.c
 
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 
 mnode_t	*r_pefragtopnode;
 

source/ctr/gl/gl_rlight.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // r_light.c
 
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 
 int	r_dlightframecount;
 

source/ctr/gl/gl_rmain.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // r_main.c
 
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 
 entity_t	r_worldentity;
 

source/ctr/gl/gl_rmisc.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // r_misc.c
 
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 
 extern cvar_t r_flatlightstyles;
 

source/ctr/gl/gl_rsurf.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // r_surf.c: surface-related refresh code
 
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 
 #ifndef GL_RGBA4
 #define	GL_RGBA4	0

source/ctr/gl/gl_screen.c

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // screen.c -- master for refresh, status bar, console, chat, notify, etc
 
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 
 /*
 

source/ctr/gl/gl_test.c

@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 
 #ifdef GLTEST
 

source/ctr/gl/gl_vidctr.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 #include <3ds.h>
 #include <GL/picaGL.h>
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 
 unsigned	d_8to24table[256];
 unsigned char d_15to8table[65536];

source/ctr/gl/gl_warp.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // gl_warp.c -- sky and water polygons
 
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 
 extern	model_t	*loadmodel;
 

source/ctr/in_ctr.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // in_ctr.c -- for the Nintendo 3DS
 
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 #include <GL/picaGL.h>
 #include <3ds.h>
 

source/ctr/keys.c

@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 
 /*
 

source/ctr/menu.c

@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 #include <sys/dirent.h>
 
 extern cvar_t	r_wateralpha;

source/ctr/net_bsd.c

@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 
 #include "../net_loop.h"
 #include "net_dgrm.h"

source/ctr/net_dgrm.c

@@ -52,7 +52,7 @@ unsigned long inet_addr(const char *cp);
 #endif
 #endif	// BAN_TEST
 
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 #include "net_dgrm.h"
 
 // these two macros are to make the code more readable

source/ctr/net_main.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // net_main.c
 
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 #include "../net_vcr.h"
 
 qsocket_t	*net_activeSockets = NULL;

source/ctr/net_udpctr.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // net_udp.c
 
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 #include "net_udp.h"
 
 #include <sys/socket.h>

source/ctr/r_part.c

@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 
 #define MAX_PARTICLES			2048	// default max # of particles at one
 										//  time

source/ctr/sbar.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sbar.c -- status bar code
 
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 
 
 int			sb_updates;		// if >= vid.numpages, no update needed

source/ctr/snd_ctr.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <stdio.h>
 #include <3ds.h>
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 
 #define SAMPLE_RATE   	22050
 #define NUM_SAMPLES 	2048

source/ctr/sys_ctr.c

@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 #include "errno.h"
 #include "touch_ctr.h"
 

source/ctr/touch_ctr.c

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 //FIX ME: load all hardcoded values from file
 
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 
 #include <3ds.h>
 #include "touch_ctr.h"

source/cvar.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // cvar.c -- dynamic variable tracking
 
-#include "quakedef.h"
+#include "nzportable_def.h"
 
 static cvar_t	*cvar_vars;
 static char	cvar_null_string[] = "";

source/host.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // host.c -- coordinates spawning and killing of local servers
 
-#include "quakedef.h"
+#include "nzportable_def.h"
 
 #ifdef __PSP__
 #include "psp/thread.h"

source/host_cmd.c

@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "nzportable_def.h"
 
 extern cvar_t	pausable;
 

source/mathlib.c

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // mathlib.c -- math primitives
 
 #include <math.h>
-#include "quakedef.h"
+#include "nzportable_def.h"
 
 #ifdef PSP_VFPU
 #include <pspmath.h>

source/matrixlib.c

@@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 */
 
-#include "quakedef.h"
+#include "nzportable_def.h"
 
 
 const matrix3x4 matrix3x4_identity =

source/net_loop.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // net_loop.c
 
-#include "quakedef.h"
+#include "nzportable_def.h"
 #include "net_loop.h"
 
 qboolean	localconnectpending = false;

source/net_vcr.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // net_vcr.c
 
-#include "quakedef.h"
+#include "nzportable_def.h"
 #include "net_vcr.h"
 
 extern int vcrFile;

source/nzportable_def.h

@@ -17,10 +17,26 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-// quakedef.h -- primary header for client
+// nzportable_def.h -- primary header for client
 
 //#define	GLTEST			// experimental stuff
 
+#ifndef PLATFORM_DIRECTORY
+#error "Unknown platform! (Please build with -DPLATFORM_DIRECTORY='your_platform')"
+#endif // PLATFORM_DIRECTORY
+
+#ifndef PLATFORM_RENDERER
+#error "Unknown renderer! (Please build with -DPLATFORM_RENDERER='your_renderer')"
+#endif // PLATFORM_RENDERER
+
+#define STRINGIFY_MACRO(x) STR(x)
+#define STR(x) #x
+#define EXPAND(x) x
+#define CONCAT(n1, n2, n3) STRINGIFY_MACRO(EXPAND(n1)EXPAND(n2)EXPAND(n3))
+#define CONCAT7(n1, n2, n3, n4, n5, n6, n7) STRINGIFY_MACRO(EXPAND(n1)EXPAND(n2)EXPAND(n3)EXPAND(n4)EXPAND(n5)EXPAND(n6)EXPAND(n7))
+#define PLATFORM_FILE(file) CONCAT(PLATFORM_DIRECTORY,/,file)
+#define RENDERER_FILE(file) CONCAT7(PLATFORM_DIRECTORY,/,PLATFORM_RENDERER,/,PLATFORM_RENDERER,_,file)
+
 #ifndef __PSP__
 #define qtrue 1
 #define qfalse 0
@@ -205,20 +221,10 @@ extern int psp_system_model;
 
 #define	SOUND_CHANNELS		8
 
+#include PLATFORM_FILE(common.h)
+#include PLATFORM_FILE(vid.h)
+#include PLATFORM_FILE(sys.h)
 
-#ifdef _3DS
-#include "ctr/common.h"
-#include "ctr/vid.h"
-#include "ctr/sys.h"
-#elif __PSP__
-#include "psp/common.h"
-#include "psp/vid.h"
-#include "psp/sys.h"
-#elif __WII__
-#include "wii/common.h"
-#include "wii/vid.h"
-#include "wii/sys.h"
-#endif // _3DS, __PSP__, __WII__
 #include "zone.h"
 #include "mathlib.h"
 #include "bspfile.h"
@@ -243,79 +249,38 @@ typedef struct
 #include "wad.h"
 #include "draw.h"
 #include "cvar.h"
-#ifdef _3DS
-#include "ctr/screen.h"
-#include "ctr/net.h"
-#elif __PSP__
-#include "psp/screen.h"
-#include "psp/net.h"
-#elif __WII__
-#include "wii/screen.h"
-#include "wii/net.h"
-#endif // _3DS
+
+#include PLATFORM_FILE(screen.h)
+#include PLATFORM_FILE(net.h)
+
 #include "protocol.h"
 #include "cmd.h"
-#ifdef _3DS
-#include "ctr/sbar.h"
-#endif // _3DS
+
+#include PLATFORM_FILE(render.h)
+#include PLATFORM_FILE(client.h)
+
 #include "cl_hud.h"
 #include "sound.h"
-#ifdef _3DS
-#include "ctr/render.h"
-#include "ctr/client.h"
-#elif __PSP__
-#include "psp/render.h"
-#include "psp/client.h"
-#elif __WII__
-#include "wii/render.h"
-#include "wii/client.h"
-#endif // _3DS
-#include "progs.h"
-#ifdef _3DS
-#include "ctr/server.h"
-#elif __PSP__
-#include "psp/server.h"
-#elif __WII__
-#include "wii/server.h"
-#endif // _3DS
 
-#ifdef _3DS
-#include "ctr/gl/gl_model.h"
-#include "ctr/gl/gl_decal.h"
-#elif __WII__
-#include "wii/gx/gx_model.h"
-#else
-#include "psp/gu/gu_model.h"
-#endif
+#include "progs.h"
+
+#include PLATFORM_FILE(server.h)
+#include RENDERER_FILE(model.h)
 
 #include "input.h"
 #include "world.h"
-#ifdef _3DS
-#include "ctr/keys.h"
-#elif __PSP__
-#include "psp/keys.h"
-#elif __WII__
-#include "wii/keys.h"
-#endif
+
+#include PLATFORM_FILE(keys.h)
+
 #include "console.h"
 #include "view.h"
-#ifdef _3DS
-#include "ctr/menu.h"
-#elif __PSP__
-#include "psp/menu.h"
-#elif __WII__
-#include "wii/menu.h"
-#endif
+
+#include PLATFORM_FILE(menu.h)
+
 #include "crc.h"
 #include "cdaudio.h"
 
-#ifdef _3DS
-#include "ctr/glquake.h"
-#elif __WII__
-#include "wii/gx/gxquake.h"
-#else
-#include "psp/gu/gu_psp.h"
-#endif
+#include RENDERER_FILE(main.h)
 
 //=============================================================================
 

source/pr_cmds.c

@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "nzportable_def.h"
 
 #ifdef _3DS
 extern bool new3ds_flag;

source/pr_edict.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sv_edict.c -- entity dictionary
 
-#include "quakedef.h"
+#include "nzportable_def.h"
 
 dprograms_t		*progs;
 dfunction_t		*pr_functions;

source/pr_exec.c

@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "nzportable_def.h"
 
 /*
 

source/psp/battery.cpp

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern "C"
 {
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 }
 
 extern cvar_t show_bat;

source/psp/cd.cpp

@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern "C"
 {
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 }
 
 extern 	cvar_t bgmtype;

source/psp/clipping.cpp

@@ -37,7 +37,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern "C"
 {
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 }
 
 namespace quake

source/psp/common.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // common.c -- misc functions used in client and server
 
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 
 #define NUM_SAFE_ARGVS  7
 

source/psp/gu/gu_QMB.cpp

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern "C"
 {
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 //entity_t *CL_NewTempEntity (void);
 }
 

source/psp/gu/gu_colorquant.cpp

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern "C"
 {
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 }
 #include <pspgu.h>
 #include <malloc.h>

source/psp/gu/gu_decals_QMB.cpp

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // gl_decals.c
 extern "C"
 {
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 }
 #include <pspgu.h>
 

source/psp/gu/gu_draw.cpp

@@ -34,7 +34,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern "C"
 {
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 }
 
 #include "gu_dxtn.h"

source/psp/gu/gu_entity_fragment.cpp

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern "C"
 {
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 }
 
 mnode_t	*r_pefragtopnode;

source/psp/gu/gu_fog.cpp

@@ -6,7 +6,7 @@ Fogging system based on FitzQuake's implementation
 
 extern "C"
 {
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 }
 
 #include <pspgu.h>

source/psp/gu/gu_fullbright.cpp

@@ -2,7 +2,7 @@
 
 extern "C"
 {
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 }
 #include <pspgu.h>
 

source/psp/gu/gu_hlmdl.cpp

@@ -1,7 +1,7 @@
 
 extern"C"
 {
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 }
 
 /*

source/psp/gu/gu_images.cpp

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 extern "C"
 {
 #include <jpeglib.h>
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 }
 
 #include <pspgu.h>

source/psp/gu/gu_light.cpp

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern "C"
 {
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 }
 #include <pspgu.h>
 

source/psp/gu/gu_main.cpp

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern "C"
 {
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 float TraceLine (vec3_t start, vec3_t end, vec3_t impact, vec3_t normal);
 }
 

source/psp/gu/gu_mesh.cpp

@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern "C"
 {
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 }
 
 /*

source/psp/gu/gu_mhex2.cpp

@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern "C"
 {
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 }
 
 /*

source/psp/gu/gu_misc.cpp

@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern "C"
 {
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 void CL_CopyPlayerInfo (entity_t *ent, entity_t *player);
 }
 

source/psp/gu/gu_model.cpp

@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern "C"
 {
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 }
 #include <malloc.h>
 #include <pspgu.h>

source/psp/gu/gu_part.cpp

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern "C"
 {
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 }
 
 #define MAX_PARTICLES			2048	// default max # of particles at one

source/psp/gu/gu_psp.cpp

@@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <limits.h>
 extern "C"
 {
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 }
 
 #include <vram.h>

source/psp/gu/gu_resample.cpp

@@ -2,7 +2,7 @@
 
 extern "C"
 {
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 }
 
 #define LERPBYTE(i) r = row1[i]; out[i] = (byte) ((((row2[i] - r) * lerp) >> 16) + r)

source/psp/gu/gu_screen.cpp

@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern "C"
 {
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 }
 
 #include <pspdisplay.h>

source/psp/gu/gu_surface.cpp

@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern "C"
 {
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 }
 
 #ifdef PSP_VFPU

source/psp/gu/gu_warp.cpp

@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern "C"
 {
-#include "../../quakedef.h"
+#include "../../nzportable_def.h"
 }
 
 #include "../clipping.hpp"

source/psp/input.cpp

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern "C"
 {
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 }
 
 namespace quake

source/psp/keys.c

@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 
 /*
 

source/psp/main.cpp

@@ -38,7 +38,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern "C"
 {
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 #include "thread.h"
 #include "m33libs/kubridge.h"
 void VramSetSize(int kb);

source/psp/menu.c

@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 
 #include <pspgu.h>
 #include <pspkernel.h>

source/psp/net_dgrm.c

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "pspkernel.h"
 
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 #include "net_dgrm.h"
 
 // these two macros are to make the code more readable

source/psp/net_main.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // net_main.c
 
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 #include "../net_vcr.h"
 
 qsocket_t	*net_activeSockets = NULL;

source/psp/network_infrastructure.hpp

@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern "C"
 {
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 }
 
 namespace quake

source/psp/network_psp.hpp

@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern "C"
 {
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 }
 
 namespace quake

source/psp/sound.cpp

@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern "C"
 {
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 }
 
 namespace quake

source/psp/system.cpp

@@ -51,7 +51,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 extern "C"
 {
 #include "sys.h"
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 }
 #include "fnmatch.h"
 

source/psp/thread.c

@@ -1,6 +1,6 @@
 #include <pspkernel.h>
 
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 #include "thread.h"
 
 SceUID sound_thread;

source/psp/vram.cpp

@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern "C"
 {
-#include "../quakedef.h"
+#include "../nzportable_def.h"
 }
 
 namespace quake

source/snd_dma.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // snd_dma.c -- main control for any streaming sound output device
 
-#include "quakedef.h"
+#include "nzportable_def.h"
 
 
 

source/snd_mem.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // snd_mem.c: sound caching
 
-#include "quakedef.h"
+#include "nzportable_def.h"
 
 int			cache_full_cycle;
 

source/snd_mix.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // snd_mix.c -- portable code to mix sounds for snd_dma.c
 
-#include "quakedef.h"
+#include "nzportable_def.h"
 
 #define DWORD	unsigned long
 

source/sv_main.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sv_main.c -- server main program
 
-#include "quakedef.h"
+#include "nzportable_def.h"
 
 server_t		sv;
 server_static_t	svs;

source/sv_move.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sv_move.c -- monster movement
 
-#include "quakedef.h"
+#include "nzportable_def.h"
 
 #define	STEPSIZE	18
 

source/sv_phys.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sv_phys.c
 
-#include "quakedef.h"
+#include "nzportable_def.h"
 
 /*