diff --git a/qbsp/bspfile.hh b/include/qbsp/bspfile.hh similarity index 100% rename from qbsp/bspfile.hh rename to include/qbsp/bspfile.hh diff --git a/qbsp/file.hh b/include/qbsp/file.hh similarity index 100% rename from qbsp/file.hh rename to include/qbsp/file.hh diff --git a/qbsp/parser.hh b/include/qbsp/parser.hh similarity index 100% rename from qbsp/parser.hh rename to include/qbsp/parser.hh diff --git a/qbsp/qbsp.hh b/include/qbsp/qbsp.hh similarity index 100% rename from qbsp/qbsp.hh rename to include/qbsp/qbsp.hh diff --git a/qbsp/wad.hh b/include/qbsp/wad.hh similarity index 100% rename from qbsp/wad.hh rename to include/qbsp/wad.hh diff --git a/qbsp/warnerr.hh b/include/qbsp/warnerr.hh similarity index 100% rename from qbsp/warnerr.hh rename to include/qbsp/warnerr.hh diff --git a/qbsp/CMakeLists.txt b/qbsp/CMakeLists.txt index 137476e6..3abf410f 100644 --- a/qbsp/CMakeLists.txt +++ b/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 diff --git a/qbsp/brush.cc b/qbsp/brush.cc index 01cf69ff..b6e4e31c 100644 --- a/qbsp/brush.cc +++ b/qbsp/brush.cc @@ -21,7 +21,7 @@ #include -#include "qbsp.hh" +#include /* * Beveled clipping hull can generate many extra faces diff --git a/qbsp/bspfile.cc b/qbsp/bspfile.cc index dde2faf7..d11786f9 100644 --- a/qbsp/bspfile.cc +++ b/qbsp/bspfile.cc @@ -21,8 +21,8 @@ #include -#include "file.hh" -#include "qbsp.hh" +#include +#include static dheader_t *header; diff --git a/qbsp/cmdlib.cc b/qbsp/cmdlib.cc index 69c1a09a..d73f13b5 100644 --- a/qbsp/cmdlib.cc +++ b/qbsp/cmdlib.cc @@ -20,7 +20,7 @@ */ // cmdlib.c -#include "qbsp.hh" +#include #include #include diff --git a/qbsp/csg4.cc b/qbsp/csg4.cc index cc5f1cb4..b9d2f80b 100644 --- a/qbsp/csg4.cc +++ b/qbsp/csg4.cc @@ -20,7 +20,7 @@ */ // csg4.c -#include "qbsp.hh" +#include /* diff --git a/qbsp/exportobj.cc b/qbsp/exportobj.cc index 53f1d507..83caf5fc 100644 --- a/qbsp/exportobj.cc +++ b/qbsp/exportobj.cc @@ -18,8 +18,8 @@ See file, 'COPYING', for details. */ -#include "qbsp.hh" -#include "wad.hh" +#include +#include static FILE * InitObjFile(void) diff --git a/qbsp/file.cc b/qbsp/file.cc index b03139fd..72892408 100644 --- a/qbsp/file.cc +++ b/qbsp/file.cc @@ -22,8 +22,8 @@ #include #include -#include "qbsp.hh" -#include "file.hh" +#include +#include /* ============== diff --git a/qbsp/globals.cc b/qbsp/globals.cc index 07b7ea97..599c4a02 100644 --- a/qbsp/globals.cc +++ b/qbsp/globals.cc @@ -20,7 +20,7 @@ */ // globals.c -#include "qbsp.hh" +#include /* * MemSize is used by the memory manager to allocate and track data diff --git a/qbsp/map.cc b/qbsp/map.cc index 69cbc610..b7f2d064 100644 --- a/qbsp/map.cc +++ b/qbsp/map.cc @@ -27,9 +27,9 @@ #include #include -#include "qbsp.hh" -#include "parser.hh" -#include "wad.hh" +#include +#include +#include #include diff --git a/qbsp/mathlib.cc b/qbsp/mathlib.cc index 12940693..e9c960a8 100644 --- a/qbsp/mathlib.cc +++ b/qbsp/mathlib.cc @@ -20,7 +20,7 @@ */ // mathlib.c -- math primitives -#include "qbsp.hh" +#include vec_t VectorLengthSq(const vec3_t v) diff --git a/qbsp/merge.cc b/qbsp/merge.cc index 918550b3..dc303613 100644 --- a/qbsp/merge.cc +++ b/qbsp/merge.cc @@ -20,7 +20,7 @@ */ // merge.c -#include "qbsp.hh" +#include #ifdef PARANOID static void diff --git a/qbsp/outside.cc b/qbsp/outside.cc index eb32b493..5c456b45 100644 --- a/qbsp/outside.cc +++ b/qbsp/outside.cc @@ -19,7 +19,7 @@ See file, 'COPYING', for details. */ -#include "qbsp.hh" +#include typedef struct { bool header; /* Flag true once header has been written */ diff --git a/qbsp/parser.cc b/qbsp/parser.cc index fb2e93e6..1042bc95 100644 --- a/qbsp/parser.cc +++ b/qbsp/parser.cc @@ -19,8 +19,8 @@ See file, 'COPYING', for details. */ -#include "qbsp.hh" -#include "parser.hh" +#include +#include void ParserInit(parser_t *p, const char *data) diff --git a/qbsp/portals.cc b/qbsp/portals.cc index 936a8c68..6a56f85e 100644 --- a/qbsp/portals.cc +++ b/qbsp/portals.cc @@ -20,7 +20,7 @@ */ // portals.c -#include "qbsp.hh" +#include node_t outside_node; // portals outside the world face this diff --git a/qbsp/qbsp.cc b/qbsp/qbsp.cc index 2bfc98ff..c8b759b2 100644 --- a/qbsp/qbsp.cc +++ b/qbsp/qbsp.cc @@ -21,9 +21,9 @@ #include -#include "common/log.hh" -#include "qbsp.hh" -#include "wad.hh" +#include +#include +#include static const char *IntroString = "---- qbsp / TyrUtils " stringify(TYRUTILS_VERSION) " ----\n"; diff --git a/qbsp/solidbsp.cc b/qbsp/solidbsp.cc index 6a91e7eb..d011089a 100644 --- a/qbsp/solidbsp.cc +++ b/qbsp/solidbsp.cc @@ -21,7 +21,7 @@ #include -#include "qbsp.hh" +#include int splitnodes; diff --git a/qbsp/surfaces.cc b/qbsp/surfaces.cc index 28d2b23a..4b75d121 100644 --- a/qbsp/surfaces.cc +++ b/qbsp/surfaces.cc @@ -19,7 +19,7 @@ See file, 'COPYING', for details. */ -#include "qbsp.hh" +#include static hashvert_t *pHashverts; static int needlmshifts; diff --git a/qbsp/tjunc.cc b/qbsp/tjunc.cc index 22ea07a1..ddebc6e6 100644 --- a/qbsp/tjunc.cc +++ b/qbsp/tjunc.cc @@ -20,7 +20,7 @@ */ // tjunc.c -#include "qbsp.hh" +#include static int numwedges, numwverts; static int tjuncs; diff --git a/qbsp/util.cc b/qbsp/util.cc index 14f3ef99..da55a768 100644 --- a/qbsp/util.cc +++ b/qbsp/util.cc @@ -23,10 +23,10 @@ #include #include -#include "common/threads.hh" -#include "common/log.hh" +#include +#include -#include "qbsp.hh" +#include static int rgMemTotal[GLOBAL + 1]; static int rgMemActive[GLOBAL + 1]; diff --git a/qbsp/wad.cc b/qbsp/wad.cc index 55e5557a..ea59df15 100644 --- a/qbsp/wad.cc +++ b/qbsp/wad.cc @@ -22,8 +22,8 @@ #include #include -#include "qbsp.hh" -#include "wad.hh" +#include +#include static void WADList_LoadTextures(const wad_t *wadlist, dmiptexlump_t *lump); static int WAD_LoadLump(const wad_t *wad, const char *name, byte *dest); diff --git a/qbsp/winding.cc b/qbsp/winding.cc index 105827dc..719a79ea 100644 --- a/qbsp/winding.cc +++ b/qbsp/winding.cc @@ -22,7 +22,7 @@ #include -#include "qbsp.hh" +#include /* ================= diff --git a/qbsp/writebsp.cc b/qbsp/writebsp.cc index 35457ae0..14a1a266 100644 --- a/qbsp/writebsp.cc +++ b/qbsp/writebsp.cc @@ -20,8 +20,8 @@ */ // writebsp.c -#include "qbsp.hh" -#include "wad.hh" +#include +#include static void ExportNodePlanes_r(node_t *node, int *planemap)