Permalink
Browse files

Fix source paths.

  • Loading branch information...
1 parent 9e9282e commit f3c7bb7e9e332559472a6229dfc5a7edeef353ef @bnoordhuis committed Nov 6, 2010
Showing with 19 additions and 19 deletions.
  1. +6 −6 Conscript
  2. +7 −7 Makefile
  3. +6 −6 linux-i386.mak
View
@@ -22,10 +22,10 @@ Import qw( BSPC_BASE_CFLAGS BUILD_DIR INSTALL_DIR CC CXX LINK );
deps/botlib/be_aas_sample.c
brushbsp.c
bspc.c
- ../qcommon/cm_load.c
- ../qcommon/cm_patch.c
- ../qcommon/cm_test.c
- ../qcommon/cm_trace.c
+ deps/qcommon/cm_load.c
+ deps/qcommon/cm_patch.c
+ deps/qcommon/cm_test.c
+ deps/qcommon/cm_trace.c
csg.c
glfile.c
l_bsp_ent.c
@@ -53,12 +53,12 @@ Import qw( BSPC_BASE_CFLAGS BUILD_DIR INSTALL_DIR CC CXX LINK );
map_q2.c
map_q3.c
map_sin.c
- ../qcommon/md4.c
+ deps/qcommon/md4.c
nodraw.c
portals.c
textures.c
tree.c
- ../qcommon/unzip.c
+ deps/qcommon/unzip.c
);
$BSPC_REF = \@BSPC_FILES;
View
@@ -5,7 +5,7 @@
# TTimo 5/15/2001
# some cleanup .. only used on i386 for GtkRadiant setups AFAIK .. removing the i386 tag
# TODO: the intermediate object files should go into their own directory
-# specially for deps/botlib and ../qcommon, the compilation flags on those might not be what you expect
+# specially for deps/botlib and deps/qcommon, the compilation flags on those might not be what you expect
#ARCH=i386
CC=gcc
@@ -48,10 +48,10 @@ GAME_OBJS = \
deps/botlib/be_aas_sample.o\
brushbsp.o\
bspc.o\
- ../qcommon/cm_load.o\
- ../qcommon/cm_patch.o\
- ../qcommon/cm_test.o\
- ../qcommon/cm_trace.o\
+ deps/qcommon/cm_load.o\
+ deps/qcommon/cm_patch.o\
+ deps/qcommon/cm_test.o\
+ deps/qcommon/cm_trace.o\
csg.o\
glfile.o\
l_bsp_ent.o\
@@ -79,12 +79,12 @@ GAME_OBJS = \
map_q2.o\
map_q3.o\
map_sin.o\
- ../qcommon/md4.o\
+ deps/qcommon/md4.o\
nodraw.o\
portals.o\
textures.o\
tree.o\
- ../qcommon/unzip.o
+ deps/qcommon/unzip.o
#tetrahedron.o
View
@@ -46,10 +46,10 @@ GAME_OBJS = \
deps/botlib/be_aas_sample.o\
brushbsp.o\
bspc.o\
- ../qcommon/cm_load.o\
- ../qcommon/cm_patch.o\
- ../qcommon/cm_test.o\
- ../qcommon/cm_trace.o\
+ deps/qcommon/cm_load.o\
+ deps/qcommon/cm_patch.o\
+ deps/qcommon/cm_test.o\
+ deps/qcommon/cm_trace.o\
csg.o\
glfile.o\
l_bsp_ent.o\
@@ -77,13 +77,13 @@ GAME_OBJS = \
map_q2.o\
map_q3.o\
map_sin.o\
- ../qcommon/md4.o\
+ deps/qcommon/md4.o\
nodraw.o\
portals.o\
tetrahedron.o\
textures.o\
tree.o\
- ../qcommon/unzip.o
+ deps/qcommon/unzip.o
bspc$(ARCH) : $(GAME_OBJS)
$(CC) $(CFLAGS) -o $@ $(GAME_OBJS) $(LDFLAGS)

0 comments on commit f3c7bb7

Please sign in to comment.