Commit graph

211 commits

Author SHA1 Message Date
Nelson Rush
8da551b601 i've added cesarb's fix:
top-level Makefile has @src_dir@, right thing is @srcdir@, and some tabs seem tohave been converted to spaces.
1999-12-30 23:50:31 +00:00
Eric Windisch
b5c66ceb00 *** empty log message *** 1999-12-30 19:58:41 +00:00
Joseph Carter
37dab64154 Made the Makefile checks ifeq(VAR,yes) rather than ifneq(VAR,) to make
things more robust.  Fixed HAS_TDFX in configure.in for real this time.
1999-12-30 16:08:34 +00:00
Joseph Carter
120e2e9252 make sure that HAVE_TDFX="no" if we don't find it 1999-12-30 15:53:52 +00:00
Joseph Carter
1db5e324de Removed note for Utah GLX users that no longer applies 1999-12-30 15:33:21 +00:00
Joseph Carter
27c3b62efc use AC_DEFINE() instead of the confdefs.h hack 1999-12-30 15:25:45 +00:00
Jeff Teunissen
4769e7e583 More GLAPIENTRY fallout...earlier search/replace methods had left some
stuff out...all better now.
1999-12-30 15:25:28 +00:00
Jeff Teunissen
0c8a460868 Repaired my own fix...that'll teach me to use #error without putting the
error text in quotes... :)
1999-12-30 14:35:25 +00:00
Jeff Teunissen
2520a3361c Fixed up screwy GLAPIENTRY fix for older Mesa versions. We can support
Mesa 3.0 again.
1999-12-30 14:33:15 +00:00
Joseph Carter
f7cb194142 autoconf updates, several autoconf options have changed how they are run,
please run ./configure --help to see what's what.  Also made --help output
worth looking at.
1999-12-30 14:26:53 +00:00
Joseph Carter
ee9f745b14 Unrolled all the {client,post,pre,rules,srcfiles}.in files into the proper
places in the various Makefile.in's.  Having them all in the module root
like that may make it easy to make a change that affects everything all
at once but it's real bitch to try and maintain those files.  They're all
gone now and we'll just have to maintain the seperate makefiles.
1999-12-30 13:40:47 +00:00
Joseph Carter
042104ce25 This file should be here. 1999-12-30 13:37:04 +00:00
Joseph Carter
b3c951d26b INDEX8 fix--doh! 1999-12-30 12:33:53 +00:00
Joseph Carter
4a75740f5f autoconf support is just about complete now! the -3dfx targets build and
were tested successfully.  There are a few hardwired LDFLAGS to clean up
(-lm, -ldl, -lvga, and -lGL) in various targets still.  In order to build
with Mesa versions  prior to 3.1 you'll need to change -lGL to -lMesaGL.        I'll teach autoconf how to do this tonight.  It's safe to come out from         behind your pre_autoconf branch now guys.  ;>
1999-12-30 11:58:44 +00:00
Nelson Rush
31cca7e205 Fixed the target line. 1999-12-30 10:57:57 +00:00
Joseph Carter
195ac96784 autoconf now looks for lib3dfxgl.so to figure out whether or not to build
the -glide targets (now named -3dfx..)  Thid doesn't mean that I have
actually written the makefile stuff for these targets, but rather that I
have written the foundation needed to create them.
1999-12-30 10:35:52 +00:00
Joseph Carter
36b6af4cd2 Another commit from hell! Fixes to autoconf for Utah GLX and the base of
support for the return of a glide target.  Things are still a bit broken
however as I need to write glide build rules.  I probably have more to do
in configure.in, I want to make libGL detection work more like Glide's
does now.  The Glide detection rule was lifted almost wholesale from Mesa
because it works and I couldn't write anything that would work better.
1999-12-30 08:23:07 +00:00
Joseph Carter
46c70038b4 Ryan C. Gordon provided a small cleanup for snd_dma.c which fixes a crash
if sound could not be started properly for some reason.
1999-12-30 06:46:29 +00:00
Zephaniah E. Hull
8a2e473014 Squashed a QW showstopper, last one I hope!
Fixed a rare chance of a buffer overflow attack in the display code.
1999-12-29 14:09:12 +00:00
Joseph Carter
e3ac6357dc Loring Holden's autoconf support. {qw-client,quake}-glide is currently not built since neither of us has the hardware available at the moment to test the 3dfx MiniGL target. Someone who does (Mercury?) will have to fix that. Bins all build in odd places for the moment. Thanks for staying up so late to help get this working Loring, you rock! 1999-12-29 13:58:47 +00:00
Zephaniah E. Hull
55891f5a7e s/APIENTRY/GLAPIENTRY/
We now REQUIRE mesa 3.1 to compile the GL stuff....
1999-12-29 05:38:57 +00:00
Joseph Carter
6eb0af1efd Treat all ia32 archs the same in the QW makefiles to match UQ 1999-12-29 05:14:40 +00:00
Jeff Teunissen
4a5ba0bcb1 Repaired undefined VID_UpdatePlanarScreen. 1999-12-29 04:58:08 +00:00
Joseph Carter
552bda13be the obsolete standalone tree is now gone, be sure to use -P when you update. 1999-12-29 03:36:52 +00:00
Joseph Carter
20df0b3bbc clean rules are fixed. I promise this time. 1999-12-29 03:30:22 +00:00
Joseph Carter
66fb88d573 :%s/SourceForge/QuakeForge/g, a matter of life and death fix! ;> 1999-12-29 03:20:25 +00:00
Zephaniah E. Hull
2cc5bfe775 Fixing 'make clean' 1999-12-29 02:50:14 +00:00
Jeff Teunissen
e8bb818c0d Fixed miscellaneous Makefile problems: $(ARCH) fixed, clean target fixed,
libraries added to GL_X11_LDFLAGS, GL_GLIDE_LDFLAGS repaired to include
$(LDFLAGS)
1999-12-29 02:44:42 +00:00
Zephaniah E. Hull
10d6962af3 :%s/GLAPIENTRY/APIENTRY/g
Again, who changed it back?

Also undid my change to the changelog..
1999-12-29 02:21:17 +00:00
Zephaniah E. Hull
e6e779b80b Doh! This should fix the gl texture problem... 1999-12-29 02:14:24 +00:00
Jeff Teunissen
b0bf08dad6 Nothing of note... 1999-12-28 11:39:14 +00:00
Joseph Carter
0781aaaf8c Pardon my fuckup. 1999-12-28 07:59:49 +00:00
Joseph Carter
7de13ab69f Added -O3 to non-i386 release CFLAGS, don't assume arch is i386 just b/c
it's not alpha.  qw_server should build on most archs now, qw_client and
uquake apparently have endian issues still.  (Not to mention the lack of
software renderers for anything but i386...)
1999-12-28 07:11:16 +00:00
Joseph Carter
e49dfa37d3 Updated the makefiles:
- MesaGL is no more, use a newer mesa that provides libGL.so.1
 - The suffix for software X11 renderer is now -x11 for consistancy with
   other software that build -x11 and -svga versions
 - Unified build is here!  Everything goes into $(BUILD_DIR) now
 - $(BUILD_DIR) is used for both debug and release, override it for now
   if you need to build seperate release and debug objects.  The option to
   build them in different places should probably go into the autoconf
   stuff so Mercury doesn't have to kill me.

Deek told me to remove S_Init() references from host.c to fix a sound bug,
I did so.  The difference should be limited to whitespace since I changed
nothing else.
1999-12-28 06:44:26 +00:00
Jeff Teunissen
33efb22b49 Pre-merge code commit. This bug will die. 1999-12-28 00:05:59 +00:00
Jeff Teunissen
f1cc8a1187 Couple of fixes for GL 1999-12-27 22:00:21 +00:00
Zephaniah E. Hull
20ebd99a48 s/APIENTRY/GLAPIENTRY/, and some tweaking with uquake.. 1999-12-27 17:57:03 +00:00
Zephaniah E. Hull
2e65feec71 The GL stuff compiles now, but has some, err, issues.. 1999-12-27 17:18:40 +00:00
Jeff Teunissen
85bd509bfc Adding files moved from main UQuake directory. 1999-12-27 08:16:05 +00:00
Joseph Carter
2a010c0334 Cleaned up the standalone Linux makefile a bit. Things are currently
still being put into subdirs of debug-${ARCH} or release-${ARCH} but the
subdirs used have changed.  They're now svga, x11, and gl.  Binaries are
all named in the form quake-* where * is svga, x11, gl, or glide.
1999-12-27 01:13:38 +00:00
Jeff Teunissen
4d62631449 Initialize TODO with help request from Mercury to fix possible (perhaps
likely) buffer overruns; add some docs to doc hierarchy.
1999-12-26 15:45:51 +00:00
Jeff Teunissen
e4364806e9 More silly changes to makefile 1999-12-26 14:12:31 +00:00
Jeff Teunissen
4c6c82c5e5 Fixed UQ Makefile 1999-12-26 14:10:49 +00:00
Jeff Teunissen
c3f5581b0a Created new subdir: uquake. Pick your favorite U word for the meaning --
Unchained, Ultimate, Ultra, Up Yours, Underworld, Underground, Unified,
Unity, etc. You know the drill.

This takes care of the "standalone" problem with the wrong name, and the
recent snafu with multiple developers working on the same files
simultaneously...expect me (and probably others) to start locking dirs when
updates are taking place.

And yes, this update is really as large as it looks. Software only at the
moment, but I will have the makefile updated to build the GL builds as
well.
1999-12-26 13:51:52 +00:00
Zephaniah E. Hull
d322adc60d POQ now actually works!! 1999-12-26 11:40:24 +00:00
Zephaniah E. Hull
7e9e2f177a QW Server, QW Client, and POQ all compile now..
(Provided you don't run out of disk space well compiling..)
1999-12-26 10:07:10 +00:00
Zephaniah E. Hull
13fbae68ce Erm, frogot to cvs add something.. 1999-12-26 07:36:21 +00:00
Zephaniah E. Hull
f2d9450d96 Fix for POQ.. 1999-12-26 07:26:23 +00:00
Zephaniah E. Hull
1058a4cdd7 QW compiles again.. 1999-12-26 07:05:55 +00:00
Zephaniah E. Hull
5765f7fe5d BIG merge work, POQ now compiles, though at least glquake.3dfx has, err, issues..
Hopefully QW will still compile and work, thats the next commit I think..
1999-12-26 06:37:28 +00:00