Skip to content

Commit e9a8f99

Browse files
bnoordhuisbnoordhuis
committed
Fix include paths.
1 parent f2b1d38 commit e9a8f99

27 files changed

+48
-48
lines changed

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ CC=gcc
1212
BASE_CFLAGS=-Dstricmp=strcasecmp
1313

1414
#use these cflags to optimize it
15-
CFLAGS=$(BASE_CFLAGS) -O3 -ffast-math -DLINUX -DBSPC
15+
CFLAGS=$(BASE_CFLAGS) -Ideps -O3 -ffast-math -DLINUX -DBSPC
1616
#use these when debugging
1717
#CFLAGS=$(BASE_CFLAGS) -g
1818

‎aas_areamerging.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2121
*/
2222

2323
#include "qbsp.h"
24-
#include "../botlib/aasfile.h"
24+
#include "botlib/aasfile.h"
2525
#include "aas_create.h"
2626
#include "aas_store.h"
2727

‎aas_cfg.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2222

2323
#include "qbsp.h"
2424
#include "float.h"
25-
#include "../botlib/aasfile.h"
25+
#include "botlib/aasfile.h"
2626
#include "aas_store.h"
2727
#include "aas_cfg.h"
28-
#include "../botlib/l_precomp.h"
29-
#include "../botlib/l_struct.h"
30-
#include "../botlib/l_libvar.h"
28+
#include "botlib/l_precomp.h"
29+
#include "botlib/l_struct.h"
30+
#include "botlib/l_libvar.h"
3131

3232
//structure field offsets
3333
#define BBOX_OFS(x) (int)&(((aas_bbox_t *)0)->x)

‎aas_create.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2121
*/
2222

2323
#include "qbsp.h"
24-
#include "../botlib/aasfile.h"
24+
#include "botlib/aasfile.h"
2525
#include "aas_create.h"
2626
#include "aas_store.h"
2727
#include "aas_gsubdiv.h"
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
3030
#include "aas_edgemelting.h"
3131
#include "aas_prunenodes.h"
3232
#include "aas_cfg.h"
33-
#include "../game/surfaceflags.h"
33+
#include "qcommon/surfaceflags.h"
3434

3535
//#define AW_DEBUG
3636
//#define L_DEBUG

‎aas_edgemelting.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2121
*/
2222

2323
#include "qbsp.h"
24-
#include "../botlib/aasfile.h"
24+
#include "botlib/aasfile.h"
2525
#include "aas_create.h"
2626

2727
//===========================================================================

‎aas_facemerging.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2121
*/
2222

2323
#include "qbsp.h"
24-
#include "../botlib/aasfile.h"
24+
#include "botlib/aasfile.h"
2525
#include "aas_create.h"
2626

2727
//===========================================================================

‎aas_file.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2121
*/
2222

2323
#include "qbsp.h"
24-
#include "../botlib/aasfile.h"
24+
#include "botlib/aasfile.h"
2525
#include "aas_file.h"
2626
#include "aas_store.h"
2727
#include "aas_create.h"

‎aas_gsubdiv.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2121
*/
2222

2323
#include "qbsp.h"
24-
#include "../botlib/aasfile.h"
24+
#include "botlib/aasfile.h"
2525
#include "aas_create.h"
2626
#include "aas_store.h"
2727
#include "aas_cfg.h"

‎aas_map.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2222

2323
#include "qbsp.h"
2424
#include "l_mem.h"
25-
#include "../botlib/aasfile.h" //aas_bbox_t
25+
#include "botlib/aasfile.h" //aas_bbox_t
2626
#include "aas_store.h" //AAS_MAX_BBOXES
2727
#include "aas_cfg.h"
28-
#include "../game/surfaceflags.h"
28+
#include "qcommon/surfaceflags.h"
2929

3030
#define SPAWNFLAG_NOT_EASY 0x00000100
3131
#define SPAWNFLAG_NOT_MEDIUM 0x00000200

‎aas_prunenodes.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2121
*/
2222

2323
#include "qbsp.h"
24-
#include "../botlib/aasfile.h"
24+
#include "botlib/aasfile.h"
2525
#include "aas_create.h"
2626

2727
int c_numprunes;

‎aas_store.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2121
*/
2222

2323
#include "qbsp.h"
24-
#include "../botlib/aasfile.h"
24+
#include "botlib/aasfile.h"
2525
#include "aas_file.h"
2626
#include "aas_store.h"
2727
#include "aas_create.h"

‎aas_store.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
3636
#define AAS_MAX_CLUSTERS 65536
3737

3838
#define BSPCINCLUDE
39-
#include "../game/be_aas.h"
40-
#include "../botlib/be_aas_def.h"
39+
#include "botlib/be_aas.h"
40+
#include "botlib/be_aas_def.h"
4141

4242
/*
4343
typedef struct bspc_aas_s

‎be_aas_bspc.c

+12-12
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2020
===========================================================================
2121
*/
2222

23-
#include "../game/q_shared.h"
24-
#include "../bspc/l_log.h"
25-
#include "../bspc/l_qfiles.h"
26-
#include "../botlib/l_memory.h"
27-
#include "../botlib/l_script.h"
28-
#include "../botlib/l_precomp.h"
29-
#include "../botlib/l_struct.h"
30-
#include "../botlib/aasfile.h"
31-
#include "../game/botlib.h"
32-
#include "../game/be_aas.h"
33-
#include "../botlib/be_aas_def.h"
34-
#include "../qcommon/cm_public.h"
23+
#include "qcommon/q_shared.h"
24+
#include "bspc/l_log.h"
25+
#include "bspc/l_qfiles.h"
26+
#include "botlib/l_memory.h"
27+
#include "botlib/l_script.h"
28+
#include "botlib/l_precomp.h"
29+
#include "botlib/l_struct.h"
30+
#include "botlib/aasfile.h"
31+
#include "botlib/botlib.h"
32+
#include "botlib/be_aas.h"
33+
#include "botlib/be_aas_def.h"
34+
#include "qcommon/cm_public.h"
3535

3636
//#define BSPC
3737

‎brushbsp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2222

2323
#include "qbsp.h"
2424
#include "l_mem.h"
25-
#include "../botlib/aasfile.h"
25+
#include "botlib/aasfile.h"
2626
#include "aas_store.h"
2727
#include "aas_cfg.h"
2828

‎bspc.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
3333
#endif
3434
#include "qbsp.h"
3535
#include "l_mem.h"
36-
#include "../botlib/aasfile.h"
37-
#include "../botlib/be_aas_cluster.h"
38-
#include "../botlib/be_aas_optimize.h"
36+
#include "botlib/aasfile.h"
37+
#include "botlib/be_aas_cluster.h"
38+
#include "botlib/be_aas_optimize.h"
3939
#include "aas_create.h"
4040
#include "aas_store.h"
4141
#include "aas_file.h"

‎l_bsp_ent.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2424
#include "l_math.h"
2525
#include "l_mem.h"
2626
#include "l_log.h"
27-
#include "../botlib/l_script.h"
27+
#include "botlib/l_script.h"
2828
#include "l_bsp_ent.h"
2929

3030
#define MAX_KEY 32

‎l_bsp_hl.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2323
#include "l_math.h"
2424
#include "l_mem.h"
2525
#include "l_log.h"
26-
#include "../botlib/l_script.h"
26+
#include "botlib/l_script.h"
2727
#include "l_bsp_hl.h"
2828
#include "l_bsp_ent.h"
2929

‎l_bsp_q1.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2424
#include "l_math.h"
2525
#include "l_mem.h"
2626
#include "l_log.h"
27-
#include "../botlib/l_script.h"
27+
#include "botlib/l_script.h"
2828
#include "l_bsp_q1.h"
2929
#include "l_bsp_ent.h"
3030

‎l_bsp_q2.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2525
#include "l_mem.h"
2626
#include "l_log.h"
2727
#include "l_poly.h"
28-
#include "../botlib/l_script.h"
28+
#include "botlib/l_script.h"
2929
#include "q2files.h"
3030
#include "l_bsp_q2.h"
3131
#include "l_bsp_ent.h"

‎l_bsp_q3.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2525
#include "l_mem.h"
2626
#include "l_log.h"
2727
#include "l_poly.h"
28-
#include "../botlib/l_script.h"
28+
#include "botlib/l_script.h"
2929
#include "l_qfiles.h"
3030
#include "l_bsp_q3.h"
3131
#include "l_bsp_ent.h"

‎l_bsp_sin.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2525
#include "l_mem.h"
2626
#include "l_log.h"
2727
#include "l_poly.h"
28-
#include "../botlib/l_script.h"
28+
#include "botlib/l_script.h"
2929
#include "l_bsp_ent.h"
3030
#include "l_bsp_sin.h"
3131

‎l_qfiles.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2020
===========================================================================
2121
*/
2222

23-
#include "../qcommon/unzip.h"
23+
#include "qcommon/unzip.h"
2424

2525
#define QFILETYPE_UNKNOWN 0x8000
2626
#define QFILETYPE_PAK 0x0001

‎map.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2727
#include "l_bsp_q3.h"
2828
#include "l_bsp_sin.h"
2929
#include "l_mem.h"
30-
#include "../botlib/aasfile.h" //aas_bbox_t
30+
#include "botlib/aasfile.h" //aas_bbox_t
3131
#include "aas_store.h" //AAS_MAX_BBOXES
3232
#include "aas_cfg.h"
3333

‎map_q2.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2727

2828
#include "qbsp.h"
2929
#include "l_mem.h"
30-
#include "../botlib/aasfile.h" //aas_bbox_t
30+
#include "botlib/aasfile.h" //aas_bbox_t
3131
#include "aas_store.h" //AAS_MAX_BBOXES
3232
#include "aas_cfg.h"
3333
#include "aas_map.h" //AAS_CreateMapBrushes

‎map_q3.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2222

2323
#include "qbsp.h"
2424
#include "l_mem.h"
25-
#include "../botlib/aasfile.h" //aas_bbox_t
25+
#include "botlib/aasfile.h" //aas_bbox_t
2626
#include "aas_store.h" //AAS_MAX_BBOXES
2727
#include "aas_cfg.h"
2828
#include "aas_map.h" //AAS_CreateMapBrushes
2929
#include "l_bsp_q3.h"
30-
#include "../qcommon/cm_patch.h"
31-
#include "../game/surfaceflags.h"
30+
#include "qcommon/cm_patch.h"
31+
#include "qcommon/surfaceflags.h"
3232

3333
#define NODESTACKSIZE 1024
3434

‎qbsp.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2929
#include "l_math.h"
3030
#include "l_poly.h"
3131
#include "l_threads.h"
32-
#include "../botlib/l_script.h"
32+
#include "botlib/l_script.h"
3333
#include "l_bsp_ent.h"
3434
#include "q2files.h"
3535
#include "l_mem.h"

‎tetrahedron.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2222

2323
#include "qbsp.h"
2424
#include "l_mem.h"
25-
#include "../botlib/aasfile.h"
25+
#include "botlib/aasfile.h"
2626
#include "aas_store.h"
2727
#include "aas_cfg.h"
2828
#include "aas_file.h"

0 commit comments

Comments
 (0)