qbsp: move remaining headers to include directory

qbsp/CMakeLists.txt

@@ -2,12 +2,12 @@ cmake_minimum_required (VERSION 2.8)
 project (qbsp CXX)
 
 set(QBSP_INCLUDES
-	bspfile.hh
-	file.hh
-	parser.hh
-	qbsp.hh
-	wad.hh
-	warnerr.hh
+	${CMAKE_SOURCE_DIR}/include/qbsp/bspfile.hh
+	${CMAKE_SOURCE_DIR}/include/qbsp/file.hh
+	${CMAKE_SOURCE_DIR}/include/qbsp/parser.hh
+	${CMAKE_SOURCE_DIR}/include/qbsp/qbsp.hh
+	${CMAKE_SOURCE_DIR}/include/qbsp/wad.hh
+	${CMAKE_SOURCE_DIR}/include/qbsp/warnerr.hh
 	${CMAKE_SOURCE_DIR}/include/qbsp/brush.hh
 	${CMAKE_SOURCE_DIR}/include/qbsp/cmdlib.hh
 	${CMAKE_SOURCE_DIR}/include/qbsp/csg4.hh

qbsp/brush.cc

@@ -21,7 +21,7 @@
 
 #include <string.h>
 
-#include "qbsp.hh"
+#include <qbsp/qbsp.hh>
 
 /*
  * Beveled clipping hull can generate many extra faces

qbsp/bspfile.cc

@@ -21,8 +21,8 @@
 
 #include <stddef.h>
 
-#include "file.hh"
-#include "qbsp.hh"
+#include <qbsp/file.hh>
+#include <qbsp/qbsp.hh>
 
 static dheader_t *header;
 

qbsp/cmdlib.cc

@@ -20,7 +20,7 @@
 */
 // cmdlib.c
 
-#include "qbsp.hh"
+#include <qbsp/qbsp.hh>
 
 #include <sys/types.h>
 #include <string.h>

qbsp/csg4.cc

@@ -20,7 +20,7 @@
 */
 // csg4.c
 
-#include "qbsp.hh"
+#include <qbsp/qbsp.hh>
 
 /*
 

qbsp/exportobj.cc

@@ -18,8 +18,8 @@
     See file, 'COPYING', for details.
 */
 
-#include "qbsp.hh"
-#include "wad.hh"
+#include <qbsp/qbsp.hh>
+#include <qbsp/wad.hh>
 
 static FILE *
 InitObjFile(void)

qbsp/file.cc

@@ -22,8 +22,8 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#include "qbsp.hh"
-#include "file.hh"
+#include <qbsp/qbsp.hh>
+#include <qbsp/file.hh>
 
 /*
 ==============

qbsp/globals.cc

@@ -20,7 +20,7 @@
 */
 // globals.c
 
-#include "qbsp.hh"
+#include <qbsp/qbsp.hh>
 
 /*
  * MemSize is used by the memory manager to allocate and track data

qbsp/map.cc

@@ -27,9 +27,9 @@
 #include <ctype.h>
 #include <string.h>
 
-#include "qbsp.hh"
-#include "parser.hh"
-#include "wad.hh"
+#include <qbsp/qbsp.hh>
+#include <qbsp/parser.hh>
+#include <qbsp/wad.hh>
 
 #include <glm/glm.hpp>
 

qbsp/mathlib.cc

@@ -20,7 +20,7 @@
 */
 // mathlib.c -- math primitives
 
-#include "qbsp.hh"
+#include <qbsp/qbsp.hh>
 
 vec_t
 VectorLengthSq(const vec3_t v)

qbsp/merge.cc

@@ -20,7 +20,7 @@
 */
 // merge.c
 
-#include "qbsp.hh"
+#include <qbsp/qbsp.hh>
 
 #ifdef PARANOID
 static void

qbsp/outside.cc

@@ -19,7 +19,7 @@
     See file, 'COPYING', for details.
 */
 
-#include "qbsp.hh"
+#include <qbsp/qbsp.hh>
 
 typedef struct {
     bool header;                /* Flag true once header has been written */

qbsp/parser.cc

@@ -19,8 +19,8 @@
     See file, 'COPYING', for details.
 */
 
-#include "qbsp.hh"
-#include "parser.hh"
+#include <qbsp/qbsp.hh>
+#include <qbsp/parser.hh>
 
 void
 ParserInit(parser_t *p, const char *data)

qbsp/portals.cc

@@ -20,7 +20,7 @@
 */
 // portals.c
 
-#include "qbsp.hh"
+#include <qbsp/qbsp.hh>
 
 node_t outside_node;    // portals outside the world face this
 

qbsp/qbsp.cc

@@ -21,9 +21,9 @@
 
 #include <string.h>
 
-#include "common/log.hh"
-#include "qbsp.hh"
-#include "wad.hh"
+#include <common/log.hh>
+#include <qbsp/qbsp.hh>
+#include <qbsp/wad.hh>
 
 static const char *IntroString =
     "---- qbsp / TyrUtils " stringify(TYRUTILS_VERSION) " ----\n";

qbsp/solidbsp.cc

@@ -21,7 +21,7 @@
 
 #include <limits.h>
 
-#include "qbsp.hh"
+#include <qbsp/qbsp.hh>
 
 int splitnodes;
 

qbsp/surfaces.cc

@@ -19,7 +19,7 @@
     See file, 'COPYING', for details.
 */
 
-#include "qbsp.hh"
+#include <qbsp/qbsp.hh>
 
 static hashvert_t *pHashverts;
 static int needlmshifts;

qbsp/tjunc.cc

@@ -20,7 +20,7 @@
 */
 // tjunc.c
 
-#include "qbsp.hh"
+#include <qbsp/qbsp.hh>
 
 static int numwedges, numwverts;
 static int tjuncs;

qbsp/util.cc

@@ -23,10 +23,10 @@
 #include <stdarg.h>
 #include <stdlib.h>
 
-#include "common/threads.hh"
-#include "common/log.hh"
+#include <common/threads.hh>
+#include <common/log.hh>
 
-#include "qbsp.hh"
+#include <qbsp/qbsp.hh>
 
 static int rgMemTotal[GLOBAL + 1];
 static int rgMemActive[GLOBAL + 1];

qbsp/wad.cc

@@ -22,8 +22,8 @@
 #include <string.h>
 #include <string>
 
-#include "qbsp.hh"
-#include "wad.hh"
+#include <qbsp/qbsp.hh>
+#include <qbsp/wad.hh>
 
 static void WADList_LoadTextures(const wad_t *wadlist, dmiptexlump_t *lump);
 static int WAD_LoadLump(const wad_t *wad, const char *name, byte *dest);

qbsp/winding.cc

@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "qbsp.hh"
+#include <qbsp/qbsp.hh>
 
 /*
 =================

qbsp/writebsp.cc

@@ -20,8 +20,8 @@
 */
 // writebsp.c
 
-#include "qbsp.hh"
-#include "wad.hh"
+#include <qbsp/qbsp.hh>
+#include <qbsp/wad.hh>
 
 static void
 ExportNodePlanes_r(node_t *node, int *planemap)