ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2024-11-13 00:24:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Applied https://bugzilla.icculus.org/show_bug.cgi?id=2464

Browse source 
* Removed rule to build C++ (for splines) from the Makefile
This commit is contained in:
Tim Angus 2005-10-30 14:36:49 +00:00
parent c41483634c
commit 3647cca9f7
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
code/unix/Makefile
View file

@ -854,10 +854,6 @@ endif #FreeBSD
$(B)/$(PLATFORM)quake3$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(B)/$(PLATFORM)quake3$(BINEXT): $(Q3OBJ) $(Q3POBJ)
$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(GLLDFLAGS) $(LDFLAGS) $(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(GLLDFLAGS) $(LDFLAGS)
# TTimo: splines code requires C++ linking, but splines have
# not been officially included in the codebase
# $(CXX) -o $@ $(Q3OBJ) $(Q3POBJ) $(GLLDFLAGS) $(LDFLAGS)
$(B)/$(PLATFORM)quake3-smp$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(B)/$(PLATFORM)quake3-smp$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP)
$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(GLLDFLAGS) \ $(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(GLLDFLAGS) \
$(THREAD_LDFLAGS) $(LDFLAGS) $(THREAD_LDFLAGS) $(LDFLAGS)
@ -1534,12 +1530,11 @@ $(B)/missionpack/qcommon/%.asm: $(CMDIR)/%.c $(Q3LCC)
# MISC # MISC
############################################################################# #############################################################################
copyfiles: copyfiles: build_release
@if [ ! -d $(COPYDIR) ]; then echo "You need to set COPYDIR to where you installed Quake III!"; false; fi @if [ ! -d $(COPYDIR)/baseq3 ]; then echo "You need to set COPYDIR to where you installed Quake III!"; false; fi
-mkdir -p -m 0755 $(COPYDIR) install -s -m 0755 $(BR)/$(PLATFORM)quake3$(BINEXT) $(COPYDIR)/quake3
install -s -m 0755 $(BR)/linuxquake3 $(COPYDIR)/quake3 #install -s -m 0755 $(BR)/$(PLATFORM)quake3-smp$(BINEXT) $(COPYDIR)/quake3-smp
#install -s -m 0755 $(BR)/linuxquake3-smp $(COPYDIR)/quake3-smp install -s -m 0755 $(BR)/$(PLATFORM)q3ded$(BINEXT) $(COPYDIR)/q3ded
install -s -m 0755 $(BR)/linuxq3ded $(COPYDIR)/q3ded
-mkdir -p -m 0755 $(COPYDIR)/baseq3 -mkdir -p -m 0755 $(COPYDIR)/baseq3
install -s -m 0755 $(BR)/baseq3/cgame$(ARCH).$(SHLIBEXT) \ install -s -m 0755 $(BR)/baseq3/cgame$(ARCH).$(SHLIBEXT) \
$(COPYDIR)/baseq3/. $(COPYDIR)/baseq3/.