From 1dc7e94283f026b17c1e793cbf7542872812ffda Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Wed, 28 Dec 2005 02:32:43 +0000 Subject: * Added master server to source, based on dpmaster * Removed gametype, fraglimit and dmflags cvars * Removed CD key authentication stuff * Implemented a means to save and restore cmd context * Bumped protocol version up to 69 (same as 68) * Removed various references to punkbuster * Maps on create server menu now sorted by name * Fixed some warnings --- src/unix/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/unix') diff --git a/src/unix/Makefile b/src/unix/Makefile index 69b3826c..6070a846 100644 --- a/src/unix/Makefile +++ b/src/unix/Makefile @@ -588,6 +588,9 @@ else # ifeq SunOS SHLIBLDFLAGS=-shared TARGETS=\ + $(B)/base/cgame$(ARCH).$(SHLIBEXT) \ + $(B)/base/qagame$(ARCH).$(SHLIBEXT) \ + $(B)/base/ui$(ARCH).$(SHLIBEXT) \ $(B)/$(PLATFORM)tremded endif #Linux @@ -650,11 +653,13 @@ release: build_release build_debug: B=$(BD) build_debug: makedirs tools - $(MAKE) targets B=$(BD) CFLAGS="$(CFLAGS) $(DEBUG_CFLAGS) $(DEPEND_CFLAGS)" + $(MAKE) targets B=$(BD) CFLAGS="$(CFLAGS) $(DEBUG_CFLAGS) $(DEPEND_CFLAGS)" + $(MAKE) -C ../master debug build_release: B=$(BR) build_release: makedirs tools - $(MAKE) targets B=$(BR) CFLAGS="$(CFLAGS) $(RELEASE_CFLAGS) $(DEPEND_CFLAGS)" + $(MAKE) targets B=$(BR) CFLAGS="$(CFLAGS) $(RELEASE_CFLAGS) $(DEPEND_CFLAGS)" + $(MAKE) -C ../master release #Build both debug and release builds all:build_debug build_release @@ -1558,6 +1563,7 @@ copyfiles: build_release clean:clean-debug clean-release $(MAKE) -C setup clean + $(MAKE) -C ../master clean clean2: if [ -d $(B) ];then (find $(B) -name '*.d' -exec rm {} \;)fi -- cgit