diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-10-30 14:36:49 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-10-30 14:36:49 +0000 |
| commit | 5385e0b6874e8a9145e015582cc75f9f6e1cee7b (patch) | |
| tree | 211ad230722cef72069f2aa0f1f0140ccd32ecfe | |
| parent | ce25a7def5dc658d78c06016494b90972f1cf973 (diff) | |
| download | ioquake3-aero-5385e0b6874e8a9145e015582cc75f9f6e1cee7b.tar.gz ioquake3-aero-5385e0b6874e8a9145e015582cc75f9f6e1cee7b.zip | |
* Applied https://bugzilla.icculus.org/show_bug.cgi?id=2464
* Removed rule to build C++ (for splines) from the Makefile
git-svn-id: svn://svn.icculus.org/quake3/trunk@202 edf5b092-35ff-0310-97b2-ce42778d08ea
| -rw-r--r-- | code/unix/Makefile | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/code/unix/Makefile b/code/unix/Makefile index 46abd59..98d487f 100644 --- a/code/unix/Makefile +++ b/code/unix/Makefile @@ -854,10 +854,6 @@ endif #FreeBSD $(B)/$(PLATFORM)quake3$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(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) $(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(GLLDFLAGS) \ $(THREAD_LDFLAGS) $(LDFLAGS) @@ -1534,12 +1530,11 @@ $(B)/missionpack/qcommon/%.asm: $(CMDIR)/%.c $(Q3LCC) # MISC ############################################################################# -copyfiles: - @if [ ! -d $(COPYDIR) ]; 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)/linuxquake3 $(COPYDIR)/quake3 - #install -s -m 0755 $(BR)/linuxquake3-smp $(COPYDIR)/quake3-smp - install -s -m 0755 $(BR)/linuxq3ded $(COPYDIR)/q3ded +copyfiles: build_release + @if [ ! -d $(COPYDIR)/baseq3 ]; then echo "You need to set COPYDIR to where you installed Quake III!"; false; fi + install -s -m 0755 $(BR)/$(PLATFORM)quake3$(BINEXT) $(COPYDIR)/quake3 + #install -s -m 0755 $(BR)/$(PLATFORM)quake3-smp$(BINEXT) $(COPYDIR)/quake3-smp + install -s -m 0755 $(BR)/$(PLATFORM)q3ded$(BINEXT) $(COPYDIR)/q3ded -mkdir -p -m 0755 $(COPYDIR)/baseq3 install -s -m 0755 $(BR)/baseq3/cgame$(ARCH).$(SHLIBEXT) \ $(COPYDIR)/baseq3/. |