Commits

Jake Todd committed 0225065

include file changes. qbsp doesn't build, fix qbsp/(bsp5 map)^.h

Comments (0)

Files changed (12)

+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <ctype.h>
+#include <time.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include "../common/cmdlib.h"
+#include "../common/mathlib.h"
+#include "../common/bspfile.h"
 #include "bsp5.h"
+#include "map.h"
 
 int numbrushplanes;
 plane_t planes[MAX_MAP_PLANES];
-/* cmdlib.h mathlib.h bspfile.h must be included before this file */
-#include "cmdlib.h"
-#include "mathlib.h"
-#include "bspfile.h"
+/* cmdlib.h mathlib.h bspfile.h map.h must be included before this file */
 
 typedef struct {
 	vec3_t	normal;
 	int		type;
 } plane_t;
 
-#include "map.h"
-
 #define	MAX_THREADS	4
 
 #define	ON_EPSILON	0.05
 extern	int			numbrushplanes;
 extern	plane_t		planes[MAX_MAP_PLANES];
 
-brushset_t *Brush_LoadEntity (entity_t *ent, int hullnum);
+brushset_t* Brush_LoadEntity(entity_t *ent, int hullnum);
 int	PlaneTypeForNormal (vec3_t normal);
 int	FindPlane (plane_t *dplane, int *side);
 
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <ctype.h>
+#include <time.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include "../common/cmdlib.h"
+#include "../common/mathlib.h"
+#include "../common/bspfile.h"
 #include "bsp5.h"
+#include "map.h"
 
 /*
 
+#include <math.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <ctype.h>
+#include <time.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include "../common/cmdlib.h"
+#include "../common/mathlib.h"
+#include "../common/bspfile.h"
 #include "bsp5.h"
-#include <math.h>
+#include "map.h"
 
 int nummapbrushes;
 mbrush_t mapbrushes[MAX_MAP_BRUSHES];
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <ctype.h>
+#include <time.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include "../common/cmdlib.h"
+#include "../common/mathlib.h"
+#include "../common/bspfile.h"
 #include "bsp5.h"
+#include "map.h"
 
 #define CONTINUOUS_EPSILON	0.001
 
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <ctype.h>
+#include <time.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include "../common/cmdlib.h"
+#include "../common/mathlib.h"
+#include "../common/bspfile.h"
 #include "bsp5.h"
+#include "map.h"
 
 // command line flags
 qboolean drawflag;
+#include <math.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <ctype.h>
+#include <time.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include "../common/cmdlib.h"
+#include "../common/mathlib.h"
+#include "../common/bspfile.h"
 #include "bsp5.h"
-#include <math.h>
+#include "map.h"
 
 surface_t newcopy_t;
 
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <ctype.h>
+#include <time.h>
+#include <stdarg.h>
+#include <unistd.h>
+include "../common/cmdlib.h"
+#include "../common/mathlib.h"
+#include "../common/bspfile.h"
 #include "bsp5.h"
+#include "map.h"
 
 
 typedef struct wvert_s {
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <ctype.h>
+#include <time.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include "../common/cmdlib.h"
+#include "../common/mathlib.h"
+#include "../common/bspfile.h"
 #include "bsp5.h"
+#include "map.h"
 
 int headclipnode;
 int firstface;
+EXE = qcc
 
-EXES = qcc
-NTEXES = qcc.exe
-
-#==============================================================================
-
-EXT=	.o
+EXT = .o
 
 all: $(EXES)
 
 clean:
-	rm *.o *.obj $(EXES) $(NTEXES)
-
-next:
-	make "CFLAGS = -g -Wall -I.."
-
-nextinstall:
-	make "CFLAGS = -O4 -g -Wall  -I.. -arch i386 -arch hppa"
-	cp $(EXES) /LocalApps
-
-alpha:
-	make "CFLAGS = -g  -I.." "LDFLAGS = -lm"
-
-alphainstall:
-	make "CFLAGS = -O4  -I.." "LDFLAGS = -lm"
-	cp $(EXES) /LocalApps
-
-nt:
-	nmake /nologo "CFLAGS =  -nologo -Zi -DWIN32 -I.." "LDFLAGS = " "EXT = .obj"
-
-ntinstall:
-	nmake /nologo "CFLAGS =  -nologo -Ox -G5 -DWIN32 -I.." "LDFLAGS = " "EXT = .obj"
-	cp $(NTEXES) f:\nt\id
-
-#==============================================================================
+	rm *.o *.obj $(EXE)
 
 QCCFILES = qcc$(EXT) pr_lex$(EXT) pr_comp$(EXT) cmdlib$(EXT)
 qcc : $(QCCFILES)
 	$(CC) $(CFLAGS) -o qcc $(QCCFILES)
-
-cmdlib$(EXT) : ../cmdlib.c
-	$(CC) $(CFLAGS) -c -o cmdlib$(EXT) ../cmdlib.c
 #include <unistd.h>
 #include "../common/cmdlib.h"
 #include "pr_comp.h"
+#include <setjmp.h>
 #include "qcc.h"
 
 int pr_source_line;
 
 int c_portaltest, c_portalpass, c_portalcheck;
 
-
 qboolean showgetleaf = true;
 
 int leafon;						// the next leaf to be given to a thread to process