*** /home/reaster/q1source/QW/Makefile.Linux	Wed Apr 21 20:16:24 1999
--- Makefile	Tue Nov 28 09:36:47 2000
***************
*** 8,59 ****
  # ELF only
  #
! # RPM release number
! RPM_RELEASE=1
! VERSION=2.30$(GLIBC)
!
! ifneq (,$(findstring libc6,$(shell if [ -e /lib/libc.so.6* ];then echo libc6;fi)))
! GLIBC=-glibc
! else
! GLIBC=
! endif
!
! ifneq (,$(findstring alpha,$(shell uname -m)))
! ARCH=axp
! RPMARCH=alpha
! else
! ARCH=i386
! RPMARCH=i386
! endif
!
! MAINDIR=/grog/Projects/QW
!
! BUILD_DEBUG_DIR=debug$(ARCH)$(GLIBC)
! BUILD_RELEASE_DIR=release$(ARCH)$(GLIBC)
  CLIENT_DIR=$(MAINDIR)/client
  SERVER_DIR=$(MAINDIR)/server
- MESA_DIR=/usr/local/src/Mesa-3.0
-
  CC=gcc
  BASE_CFLAGS=-Wall -Dstricmp=strcasecmp -I$(CLIENT_DIR) -I$(SERVER_DIR)
! DEBUG_CFLAGS=$(BASE_CFLAGS) -g
! ifeq ($(ARCH),axp)
! RELEASE_CFLAGS=$(BASE_CFLAGS) -ffast-math -funroll-loops \
! 	-fomit-frame-pointer -fexpensive-optimizations
! else
! RELEASE_CFLAGS=$(BASE_CFLAGS) -m486 -O6 -ffast-math -funroll-loops \
! 	-fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \
! 	-malign-jumps=2 -malign-functions=2
! endif
! GLCFLAGS=-DGLQUAKE -I/usr/local/src/Mesa-3.0/include -I/usr/include/glide
  LDFLAGS=-lm
- SVGALDFLAGS=-lvga
  XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext
! GL_SVGA_LDFLAGS=-L/usr/X11/lib -L/usr/local/src/Mesa-3.0/lib -lm -lMesaGL -lglide2x -lX11 -lXext -lvga
! GL_X11_LDFLAGS=-L/usr/X11/lib -L/usr/local/src/Mesa-3.0/lib -lm -lGL -lX11 -lXext
  DO_CC=$(CC) $(CFLAGS) -o $@ -c $<
  DO_O_CC=$(CC) -O $(CFLAGS) -o $@ -c $<
--- 8,27 ----
  # ELF only
  #
! MAINDIR=.
! BUILD_RELEASE_DIR=bin
  CLIENT_DIR=$(MAINDIR)/client
  SERVER_DIR=$(MAINDIR)/server
  CC=gcc
  BASE_CFLAGS=-Wall -Dstricmp=strcasecmp -I$(CLIENT_DIR) -I$(SERVER_DIR)
! RELEASE_CFLAGS=$(BASE_CFLAGS) -m486 -ffast-math -fexpensive-optimizations
! GLCFLAGS=-DGLQUAKE -DGL_EXT_SHARED
  LDFLAGS=-lm
  XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext
! GL_X11_LDFLAGS=-L/usr/X11R6/lib -lm -lGL -lX11 -lXext
  DO_CC=$(CC) $(CFLAGS) -o $@ -c $<
  DO_O_CC=$(CC) -O $(CFLAGS) -o $@ -c $<
***************
*** 67,85 ****
  # SETUP AND BUILD
  #############################################################################
! ifeq ($(ARCH),axp)
! TARGETS=$(BUILDDIR)/qwsv
! #$(BUILDDIR)/qwcl.x11
! else
! TARGETS=$(BUILDDIR)/qwsv $(BUILDDIR)/qwcl $(BUILDDIR)/qwcl.x11 $(BUILDDIR)/glqwcl $(BUILDDIR)/glqwcl.glx
! endif
!
! build_debug:
! 	@-mkdir $(BUILD_DEBUG_DIR) \
! 		$(BUILD_DEBUG_DIR)/client \
! 		$(BUILD_DEBUG_DIR)/glclient \
! 		$(BUILD_DEBUG_DIR)/server
! 	$(MAKE) targets BUILDDIR=$(BUILD_DEBUG_DIR) CFLAGS="$(DEBUG_CFLAGS)"
  build_release:
  	@-mkdir $(BUILD_RELEASE_DIR) \
--- 35,41 ----
  # SETUP AND BUILD
  #############################################################################
! TARGETS=$(BUILDDIR)/qwsv $(BUILDDIR)/glqwcl.glx $(BUILDDIR)/qwcl.x11
  build_release:
  	@-mkdir $(BUILD_RELEASE_DIR) \
***************
*** 88,94 ****
  		$(BUILD_RELEASE_DIR)/server
  	$(MAKE) targets BUILDDIR=$(BUILD_RELEASE_DIR) CFLAGS="$(RELEASE_CFLAGS)"
! all: build_debug build_release
  targets: $(TARGETS)
--- 44,50 ----
  		$(BUILD_RELEASE_DIR)/server
  	$(MAKE) targets BUILDDIR=$(BUILD_RELEASE_DIR) CFLAGS="$(RELEASE_CFLAGS)"
! all: build_release
  targets: $(TARGETS)
***************
*** 273,279 ****
  	$(BUILDDIR)/client/sys_linux.o \
  	$(BUILDDIR)/client/snd_linux.o \
- ifeq ($(ARCH),i386)
  	QWCL_AS_OBJS = \
  	$(BUILDDIR)/client/d_copy.o \
  	$(BUILDDIR)/client/d_draw.o \
--- 229,234 ----
***************
*** 293,309 ****
  	$(BUILDDIR)/client/surf16.o \
  	$(BUILDDIR)/client/surf8.o \
  	$(BUILDDIR)/client/sys_dosa.o
- else
- 	QWCL_AS_OBJS=
- endif
- QWCL_SVGA_OBJS = $(BUILDDIR)/client/vid_svgalib.o
  QWCL_X11_OBJS = $(BUILDDIR)/client/vid_x.o
- $(BUILDDIR)/qwcl : $(QWCL_OBJS) $(QWCL_AS_OBJS) $(QWCL_SVGA_OBJS)
- 	$(CC) $(CFLAGS) -o $@ $(QWCL_OBJS) $(QWCL_AS_OBJS) $(QWCL_SVGA_OBJS) \
- 		$(LDFLAGS) $(SVGALDFLAGS)
-
  $(BUILDDIR)/qwcl.x11 : $(QWCL_OBJS) $(QWCL_AS_OBJS) $(QWCL_X11_OBJS)
  	$(CC) $(CFLAGS) -o $@ $(QWCL_OBJS) $(QWCL_AS_OBJS) $(QWCL_X11_OBJS) \
  		$(LDFLAGS) $(XLDFLAGS)
--- 248,256 ----
***************
*** 548,556 ****
  $(BUILDDIR)/client/sys_dosa.o :       $(CLIENT_DIR)/sys_dosa.s
  	$(DO_AS)
- $(BUILDDIR)/client/vid_svgalib.o : $(CLIENT_DIR)/vid_svgalib.c
- 	$(DO_O_CC)
-
  $(BUILDDIR)/client/vid_x.o : $(CLIENT_DIR)/vid_x.c
  	$(DO_CC)
--- 495,500 ----
***************
*** 610,621 ****
  	$(BUILDDIR)/glclient/snd_mixa.o \
  	$(BUILDDIR)/glclient/sys_dosa.o
- GLQWCL_SVGA_OBJS = $(BUILDDIR)/glclient/gl_vidlinux.o
  GLQWCL_X11_OBJS = $(BUILDDIR)/glclient/gl_vidlinuxglx.o
- $(BUILDDIR)/glqwcl : $(GLQWCL_OBJS) $(GLQWCL_SVGA_OBJS)
- 	$(CC) $(CFLAGS) -o $@ $(GLQWCL_OBJS) $(GLQWCL_SVGA_OBJS) $(LDFLAGS) $(GL_SVGA_LDFLAGS)
-
  $(BUILDDIR)/glqwcl.glx : $(GLQWCL_OBJS) $(GLQWCL_X11_OBJS)
  	$(CC) $(CFLAGS) -o $@ $(GLQWCL_OBJS) $(GLQWCL_X11_OBJS) $(LDFLAGS) $(GL_X11_LDFLAGS)
--- 554,561 ----
***************
*** 772,930 ****
  $(BUILDDIR)/glclient/sys_dosa.o :      $(CLIENT_DIR)/sys_dosa.s
  	$(DO_GL_AS)
- #############################################################################
- # RPM
- #############################################################################
-
- # Make RPMs.  You need to be root to make this work
- RPMROOT=/usr/src/redhat
- RPM = rpm
- RPMFLAGS = -bb
- INSTALLDIR = /usr/local/games/quake
-
- ifeq ($(ARCH),axp)
- rpm: rpm-qwsv
- tar: tar-qwsv
- else
- rpm: rpm-qwcl rpm-qwsv
- tar: tar-qwcl tar-qwsv
- endif
-
- QWCL_RPMDIR=/var/tmp/qwcl-$(VERSION)
- TDFXGL_DIR=/home/zoid/3dfxgl
-
- QWPROGS = \
- 	$(MAINDIR)/progs/buttons.qc \
- 	$(MAINDIR)/progs/client.qc \
- 	$(MAINDIR)/progs/combat.qc \
- 	$(MAINDIR)/progs/defs.qc \
- 	$(MAINDIR)/progs/doors.qc \
- 	$(MAINDIR)/progs/items.qc \
- 	$(MAINDIR)/progs/misc.qc \
- 	$(MAINDIR)/progs/models.qc \
- 	$(MAINDIR)/progs/plats.qc \
- 	$(MAINDIR)/progs/player.qc \
- 	$(MAINDIR)/progs/progdefs.h \
- 	$(MAINDIR)/progs/progs.src \
- 	$(MAINDIR)/progs/qwprogs.dat \
- 	$(MAINDIR)/progs/server.qc \
- 	$(MAINDIR)/progs/spectate.qc \
- 	$(MAINDIR)/progs/sprites.qc \
- 	$(MAINDIR)/progs/subs.qc \
- 	$(MAINDIR)/progs/triggers.qc \
- 	$(MAINDIR)/progs/weapons.qc \
- 	$(MAINDIR)/progs/world.qc
-
- rpm-qwcl: qwcl.spec \
- 		$(BUILD_RELEASE_DIR)/qwcl \
- 		$(BUILD_RELEASE_DIR)/glqwcl \
- 		$(BUILD_RELEASE_DIR)/glqwcl.glx \
- 		$(BUILD_RELEASE_DIR)/qwcl.x11
- 	touch $(RPMROOT)/SOURCES/qwcl-$(VERSION).tar.gz
- 	if [ ! -d archives ];then mkdir archives;fi
- 	$(MAKE) copyfiles-qwcl DESTDIR=$(QWCL_RPMDIR)/$(INSTALLDIR)
- 	cp qwcl.spec $(RPMROOT)/SPECS/qwcl.spec
- 	cp $(MAINDIR)/quake.gif $(RPMROOT)/SOURCES/quake.gif
- 	cd $(RPMROOT)/SPECS; $(RPM) $(RPMFLAGS) qwcl.spec
- 	cp $(RPMROOT)/RPMS/$(RPMARCH)/qwcl-$(VERSION)-$(RPM_RELEASE).$(RPMARCH).rpm archives/.
- 	rm -rf $(QWCL_RPMDIR)
-
- tar-qwcl: $(BUILD_RELEASE_DIR)/qwcl \
- 		$(BUILD_RELEASE_DIR)/glqwcl \
- 		$(BUILD_RELEASE_DIR)/glqwcl.glx \
- 		$(BUILD_RELEASE_DIR)/qwcl.x11
- 	if [ ! -d archives ];then mkdir archives;fi
- 	$(MAKE) copyfiles-qwcl DESTDIR=$(QWCL_RPMDIR)/$(INSTALLDIR)
- 	cd $(QWCL_RPMDIR)/$(INSTALLDIR); tar czvf qwcl-$(VERSION)-$(RPMARCH)-unknown-linux2.0.tar.gz *
- 	mv $(QWCL_RPMDIR)/$(INSTALLDIR)/*.tar.gz archives/.
- 	rm -rf $(QWCL_RPMDIR)
-
- copyfiles-qwcl:
- 	-mkdirhier $(DESTDIR)
- 	-mkdirhier $(DESTDIR)/qw
- 	-mkdirhier $(DESTDIR)/qw/skins
- 	cp $(BUILD_RELEASE_DIR)/qwcl $(DESTDIR)/.
- 	strip $(DESTDIR)/qwcl
- 	chmod 4755 $(DESTDIR)/qwcl
- 	cp $(BUILD_RELEASE_DIR)/qwcl.x11 $(DESTDIR)/.
- 	strip $(DESTDIR)/qwcl.x11
- 	chmod 755 $(DESTDIR)/qwcl.x11
- 	cp $(BUILD_RELEASE_DIR)/glqwcl $(DESTDIR)/.
- 	strip $(DESTDIR)/glqwcl
- 	chmod 4755 $(DESTDIR)/glqwcl
- 	cp $(BUILD_RELEASE_DIR)/glqwcl.glx $(DESTDIR)/.
- 	strip $(DESTDIR)/glqwcl.glx
- 	chmod 4755 $(DESTDIR)/glqwcl.glx
- 	cp $(TDFXGL_DIR)/release$(ARCH)/lib3dfxgl.so $(DESTDIR)/.
- 	chmod 755 $(DESTDIR)/lib3dfxgl.so
- 	cp $(MAINDIR)/glqwcl.3dfxgl $(DESTDIR)/.
- 	chmod 755 $(DESTDIR)/glqwcl.3dfxgl
- 	cp $(MAINDIR)/docs/README.qwcl $(DESTDIR)/.
- 	chmod 644 $(DESTDIR)/README.qwcl
- 	cp $(MAINDIR)/fixskins.sh $(DESTDIR)/qw/skins/.
- 	chmod 755 $(DESTDIR)/qw/skins/fixskins.sh
- 	cp $(MESA_DIR)/lib/libMesaGL.so.2.6 $(DESTDIR)
- 	chmod 755 $(DESTDIR)/libMesaGL.so.2.6
- 	cd $(DESTDIR); ln -sf libMesaGL.so.2.6 libMesaGL.so.2
- 	cd $(DESTDIR); ln -sf libMesaGL.so.2 libMesaGL.so
- 	cd $(DESTDIR); ln -sf libMesaGL.so libGL.so
-
- qwcl.spec : $(MAINDIR)/qwcl.spec.sh $(BUILD_RELEASE_DIR)/qwcl
- 	sh $< $(VERSION) $(RPM_RELEASE) $(INSTALLDIR) > $@
-
- QWSV_RPMDIR=/var/tmp/qwsv-$(VERSION)
- rpm-qwsv: qwsv.spec $(BUILD_RELEASE_DIR)/qwsv $(QWPROGS)
- 	touch $(RPMROOT)/SOURCES/qwsv-$(VERSION).tar.gz
- 	if [ ! -d archives ];then mkdir archives;fi
- 	$(MAKE) copyfiles-qwsv DESTDIR=$(QWSV_RPMDIR)/$(INSTALLDIR)
- 	cp qwsv.spec $(RPMROOT)/SPECS/qwsv.spec
- 	cp $(MAINDIR)/quake.gif $(RPMROOT)/SOURCES/quake.gif
- 	cd $(RPMROOT)/SPECS; $(RPM) $(RPMFLAGS) qwsv.spec
- 	cp $(RPMROOT)/RPMS/$(RPMARCH)/qwsv-$(VERSION)-$(RPM_RELEASE).$(RPMARCH).rpm archives/.
- 	rm -rf $(QWSV_RPMDIR)
-
- tar-qwsv: $(BUILD_RELEASE_DIR)/qwsv $(QWPROGS)
- 	if [ ! -d archives ];then mkdir archives;fi
- 	$(MAKE) copyfiles-qwsv DESTDIR=$(QWSV_RPMDIR)/$(INSTALLDIR)
- 	cd $(QWSV_RPMDIR)/$(INSTALLDIR); tar czvf qwsv-$(VERSION)-$(RPMARCH)-unknown-linux2.0.tar.gz *
- 	mv $(QWSV_RPMDIR)/$(INSTALLDIR)/*.tar.gz archives/.
- 	rm -rf $(QWSV_RPMDIR)
-
- copyfiles-qwsv:
- 	-mkdirhier $(DESTDIR)
- 	-mkdirhier $(DESTDIR)/qw
- 	-mkdirhier $(DESTDIR)/qw/skins
- 	cp $(BUILD_RELEASE_DIR)/qwsv $(DESTDIR)/.
- 	strip $(DESTDIR)/qwsv
- 	chmod 755 $(DESTDIR)/qwsv
- 	cp $(MAINDIR)/docs/README.qwsv $(DESTDIR)/.
- 	chmod 644 $(DESTDIR)/README.qwsv
- 	cp $(QWPROGS) $(DESTDIR)/qw/.
- 	cd $(DESTDIR)/qw; chmod 644 *
- 	chmod 755 $(DESTDIR)/qw/skins
- 	cp $(MAINDIR)/fixskins.sh $(DESTDIR)/qw/skins/.
- 	chmod 755 $(DESTDIR)/qw/skins/fixskins.sh
-
- qwsv.spec : $(MAINDIR)/qwsv.spec.sh $(BUILD_RELEASE_DIR)/qwsv
- 	sh $< $(VERSION) $(RPM_RELEASE) $(INSTALLDIR) > $@
  #############################################################################
  # MISC
  #############################################################################
! clean: clean-debug clean-release
!
! clean-debug:
! 	$(MAKE) clean2 BUILDDIR=$(BUILD_DEBUG_DIR) CFLAGS="$(DEBUG_CFLAGS)"
!
! clean-release:
! 	$(MAKE) clean2 BUILDDIR=$(BUILD_RELEASE_DIR) CFLAGS="$(DEBUG_CFLAGS)"
- clean2:
- 	-rm -f $(QWSV_OBJS) \
- 		$(QWCL_OBJS) \
- 		$(QWCL_AS_OBJS) \
- 		$(QWCL_SVGA_OBJS) \
- 		$(QWCL_X11_OBJS) \
- 		$(GLQWCL_OBJS) \
--- 712,725 ----
  $(BUILDDIR)/glclient/sys_dosa.o :      $(CLIENT_DIR)/sys_dosa.s
  	$(DO_GL_AS)
  #############################################################################
  # MISC
  #############################################################################
! clean:
! 	rm -fr bin/client
! 	rm -fr bin/glclient
! 	rm -fr bin/server
     |