Skip to content

Commit

Permalink
Convert Windows line endings to UNIX line endings.
Browse files Browse the repository at this point in the history
  • Loading branch information
@bnoordhuis
bnoordhuis committed Nov 6, 2010
1 parent 6b5cfd9 commit 796b185
Show file tree
Hide file tree
Showing 84 changed files with 39,039 additions and 39,039 deletions.
150 changes: 75 additions & 75 deletions Conscript
View file
Original file line number Original file line Diff line number Diff line change
@@ -1,75 +1,75 @@
# bspc compile # bspc compile

Import qw( BSPC_BASE_CFLAGS BUILD_DIR INSTALL_DIR CC CXX LINK ); Import qw( BSPC_BASE_CFLAGS BUILD_DIR INSTALL_DIR CC CXX LINK );

@BSPC_FILES = qw( @BSPC_FILES = qw(
aas_areamerging.c aas_areamerging.c
aas_cfg.c aas_cfg.c
aas_create.c aas_create.c
aas_edgemelting.c aas_edgemelting.c
aas_facemerging.c aas_facemerging.c
aas_file.c aas_file.c
aas_gsubdiv.c aas_gsubdiv.c
aas_map.c aas_map.c
aas_prunenodes.c aas_prunenodes.c
aas_store.c aas_store.c
be_aas_bspc.c be_aas_bspc.c
../botlib/be_aas_bspq3.c ../botlib/be_aas_bspq3.c
../botlib/be_aas_cluster.c ../botlib/be_aas_cluster.c
../botlib/be_aas_move.c ../botlib/be_aas_move.c
../botlib/be_aas_optimize.c ../botlib/be_aas_optimize.c
../botlib/be_aas_reach.c ../botlib/be_aas_reach.c
../botlib/be_aas_sample.c ../botlib/be_aas_sample.c
brushbsp.c brushbsp.c
bspc.c bspc.c
../qcommon/cm_load.c ../qcommon/cm_load.c
../qcommon/cm_patch.c ../qcommon/cm_patch.c
../qcommon/cm_test.c ../qcommon/cm_test.c
../qcommon/cm_trace.c ../qcommon/cm_trace.c
csg.c csg.c
glfile.c glfile.c
l_bsp_ent.c l_bsp_ent.c
l_bsp_hl.c l_bsp_hl.c
l_bsp_q1.c l_bsp_q1.c
l_bsp_q2.c l_bsp_q2.c
l_bsp_q3.c l_bsp_q3.c
l_bsp_sin.c l_bsp_sin.c
l_cmd.c l_cmd.c
../botlib/l_libvar.c ../botlib/l_libvar.c
l_log.c l_log.c
l_math.c l_math.c
l_mem.c l_mem.c
l_poly.c l_poly.c
../botlib/l_precomp.c ../botlib/l_precomp.c
l_qfiles.c l_qfiles.c
../botlib/l_script.c ../botlib/l_script.c
../botlib/l_struct.c ../botlib/l_struct.c
l_threads.c l_threads.c
l_utils.c l_utils.c
leakfile.c leakfile.c
map.c map.c
map_hl.c map_hl.c
map_q1.c map_q1.c
map_q2.c map_q2.c
map_q3.c map_q3.c
map_sin.c map_sin.c
../qcommon/md4.c ../qcommon/md4.c
nodraw.c nodraw.c
portals.c portals.c
textures.c textures.c
tree.c tree.c
../qcommon/unzip.c ../qcommon/unzip.c
); );
$BSPC_REF = \@BSPC_FILES; $BSPC_REF = \@BSPC_FILES;

$env = new cons( $env = new cons(
CC => $CC, CC => $CC,
CXX => $CXX, CXX => $CXX,
LINK => $LINK, LINK => $LINK,
CFLAGS => $BSPC_BASE_CFLAGS, CFLAGS => $BSPC_BASE_CFLAGS,
LIBS => '-ldl -lm -lpthread' LIBS => '-ldl -lm -lpthread'
); );

Program $env 'bspc', @$BSPC_REF; Program $env 'bspc', @$BSPC_REF;
# this should install to Q3 or something? # this should install to Q3 or something?
Install $env $INSTALL_DIR, 'bspc'; Install $env $INSTALL_DIR, 'bspc';
228 changes: 114 additions & 114 deletions Makefile
View file
Original file line number Original file line Diff line number Diff line change
@@ -1,114 +1,114 @@
# #
# Makefile for the BSPC tool for the Gladiator Bot # Makefile for the BSPC tool for the Gladiator Bot
# Intended for gcc/Linux # Intended for gcc/Linux
# #
# TTimo 5/15/2001 # TTimo 5/15/2001
# some cleanup .. only used on i386 for GtkRadiant setups AFAIK .. removing the i386 tag # 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 # TODO: the intermediate object files should go into their own directory
# specially for ../botlib and ../qcommon, the compilation flags on those might not be what you expect # specially for ../botlib and ../qcommon, the compilation flags on those might not be what you expect


#ARCH=i386 #ARCH=i386
CC=gcc CC=gcc
BASE_CFLAGS=-Dstricmp=strcasecmp BASE_CFLAGS=-Dstricmp=strcasecmp


#use these cflags to optimize it #use these cflags to optimize it
CFLAGS=$(BASE_CFLAGS) -m486 -O6 -ffast-math -funroll-loops \ CFLAGS=$(BASE_CFLAGS) -m486 -O6 -ffast-math -funroll-loops \
-fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \ -fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \
-malign-jumps=2 -malign-functions=2 -DLINUX -DBSPC -malign-jumps=2 -malign-functions=2 -DLINUX -DBSPC
#use these when debugging #use these when debugging
#CFLAGS=$(BASE_CFLAGS) -g #CFLAGS=$(BASE_CFLAGS) -g


LDFLAGS=-ldl -lm -lpthread LDFLAGS=-ldl -lm -lpthread


DO_CC=$(CC) $(CFLAGS) -o $@ -c $< DO_CC=$(CC) $(CFLAGS) -o $@ -c $<


############################################################################# #############################################################################
# SETUP AND BUILD BSPC # SETUP AND BUILD BSPC
############################################################################# #############################################################################


.c.o: .c.o:
$(DO_CC) $(DO_CC)


GAME_OBJS = \ GAME_OBJS = \
_files.o\ _files.o\
aas_areamerging.o\ aas_areamerging.o\
aas_cfg.o\ aas_cfg.o\
aas_create.o\ aas_create.o\
aas_edgemelting.o\ aas_edgemelting.o\
aas_facemerging.o\ aas_facemerging.o\
aas_file.o\ aas_file.o\
aas_gsubdiv.o\ aas_gsubdiv.o\
aas_map.o\ aas_map.o\
aas_prunenodes.o\ aas_prunenodes.o\
aas_store.o\ aas_store.o\
be_aas_bspc.o\ be_aas_bspc.o\
../botlib/be_aas_bspq3.o\ ../botlib/be_aas_bspq3.o\
../botlib/be_aas_cluster.o\ ../botlib/be_aas_cluster.o\
../botlib/be_aas_move.o\ ../botlib/be_aas_move.o\
../botlib/be_aas_optimize.o\ ../botlib/be_aas_optimize.o\
../botlib/be_aas_reach.o\ ../botlib/be_aas_reach.o\
../botlib/be_aas_sample.o\ ../botlib/be_aas_sample.o\
brushbsp.o\ brushbsp.o\
bspc.o\ bspc.o\
../qcommon/cm_load.o\ ../qcommon/cm_load.o\
../qcommon/cm_patch.o\ ../qcommon/cm_patch.o\
../qcommon/cm_test.o\ ../qcommon/cm_test.o\
../qcommon/cm_trace.o\ ../qcommon/cm_trace.o\
csg.o\ csg.o\
glfile.o\ glfile.o\
l_bsp_ent.o\ l_bsp_ent.o\
l_bsp_hl.o\ l_bsp_hl.o\
l_bsp_q1.o\ l_bsp_q1.o\
l_bsp_q2.o\ l_bsp_q2.o\
l_bsp_q3.o\ l_bsp_q3.o\
l_bsp_sin.o\ l_bsp_sin.o\
l_cmd.o\ l_cmd.o\
../botlib/l_libvar.o\ ../botlib/l_libvar.o\
l_log.o\ l_log.o\
l_math.o\ l_math.o\
l_mem.o\ l_mem.o\
l_poly.o\ l_poly.o\
../botlib/l_precomp.o\ ../botlib/l_precomp.o\
l_qfiles.o\ l_qfiles.o\
../botlib/l_script.o\ ../botlib/l_script.o\
../botlib/l_struct.o\ ../botlib/l_struct.o\
l_threads.o\ l_threads.o\
l_utils.o\ l_utils.o\
leakfile.o\ leakfile.o\
map.o\ map.o\
map_hl.o\ map_hl.o\
map_q1.o\ map_q1.o\
map_q2.o\ map_q2.o\
map_q3.o\ map_q3.o\
map_sin.o\ map_sin.o\
../qcommon/md4.o\ ../qcommon/md4.o\
nodraw.o\ nodraw.o\
portals.o\ portals.o\
textures.o\ textures.o\
tree.o\ tree.o\
../qcommon/unzip.o ../qcommon/unzip.o


#tetrahedron.o #tetrahedron.o


bspc : $(GAME_OBJS) bspc : $(GAME_OBJS)
$(CC) $(CFLAGS) -o $@ $(GAME_OBJS) $(LDFLAGS) $(CC) $(CFLAGS) -o $@ $(GAME_OBJS) $(LDFLAGS)
strip $@ strip $@




############################################################################# #############################################################################
# MISC # MISC
############################################################################# #############################################################################


clean: clean:
-rm -f $(GAME_OBJS) -rm -f $(GAME_OBJS)


depend: depend:
gcc -MM $(GAME_OBJS:.o=.c) gcc -MM $(GAME_OBJS:.o=.c)


#install: #install:
# cp bspci386 .. # cp bspci386 ..


# #
# From "make depend" # From "make depend"
# #


Loading

0 comments on commit 796b185

Please sign in to comment.