diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-08-22 22:47:26 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-08-22 22:47:26 +0000 |
| commit | 599347b9c9b448d03dc58fc95df88267c744aa29 (patch) | |
| tree | 75a70a2c16d7fcc77a747d532b7be4a38709cf0a /Makefile | |
| parent | 6e6bab9af628a899fca58dffc42c2ebb09eceb69 (diff) | |
| download | ioquake3-aero-599347b9c9b448d03dc58fc95df88267c744aa29.tar.gz ioquake3-aero-599347b9c9b448d03dc58fc95df88267c744aa29.zip | |
* (bug #3729) server dependencies on client.h (Ben Millwood)
* (bug #3731) BUILD_MISSIONPACK flag in Makefile (Gabriel Schnoering
<gabriel.schnoering@gmail.com>)
* (bug #3756) Q3VM crashes on unaligned block copy with SIGBUS (Patrick Baggett
<baggett.patrick@figglesoftware.com>) and...
* (bug #3755) IOQuake3 shouldn't use GCC-specific __FUNCTION__
git-svn-id: svn://svn.icculus.org/quake3/trunk@1456 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 13 insertions, 2 deletions
@@ -41,6 +41,9 @@ endif ifndef BUILD_GAME_QVM BUILD_GAME_QVM = endif +ifndef BUILD_MISSIONPACK + BUILD_MISSIONPACK= +endif ifneq ($(PLATFORM),darwin) BUILD_CLIENT_SMP = 0 @@ -786,10 +789,13 @@ ifneq ($(BUILD_GAME_SO),0) TARGETS += \ $(B)/baseq3/cgame$(ARCH).$(SHLIBEXT) \ $(B)/baseq3/qagame$(ARCH).$(SHLIBEXT) \ - $(B)/baseq3/ui$(ARCH).$(SHLIBEXT) \ + $(B)/baseq3/ui$(ARCH).$(SHLIBEXT) + ifneq ($(BUILD_MISSIONPACK),0) + TARGETS += \ $(B)/missionpack/cgame$(ARCH).$(SHLIBEXT) \ $(B)/missionpack/qagame$(ARCH).$(SHLIBEXT) \ $(B)/missionpack/ui$(ARCH).$(SHLIBEXT) + endif endif ifneq ($(BUILD_GAME_QVM),0) @@ -797,10 +803,13 @@ ifneq ($(BUILD_GAME_QVM),0) TARGETS += \ $(B)/baseq3/vm/cgame.qvm \ $(B)/baseq3/vm/qagame.qvm \ - $(B)/baseq3/vm/ui.qvm \ + $(B)/baseq3/vm/ui.qvm + ifneq ($(BUILD_MISSIONPACK),0) + TARGETS += \ $(B)/missionpack/vm/qagame.qvm \ $(B)/missionpack/vm/cgame.qvm \ $(B)/missionpack/vm/ui.qvm + endif endif endif @@ -2048,6 +2057,7 @@ ifneq ($(BUILD_GAME_SO),0) $(COPYDIR)/baseq3/. $(INSTALL) -s -m 0755 $(BR)/baseq3/ui$(ARCH).$(SHLIBEXT) \ $(COPYDIR)/baseq3/. + ifneq ($(BUILD_MISSIONPACK),0) -$(MKDIR) -p -m 0755 $(COPYDIR)/missionpack $(INSTALL) -s -m 0755 $(BR)/missionpack/cgame$(ARCH).$(SHLIBEXT) \ $(COPYDIR)/missionpack/. @@ -2055,6 +2065,7 @@ ifneq ($(BUILD_GAME_SO),0) $(COPYDIR)/missionpack/. $(INSTALL) -s -m 0755 $(BR)/missionpack/ui$(ARCH).$(SHLIBEXT) \ $(COPYDIR)/missionpack/. + endif endif clean: clean-debug clean-release |