Commit Graph

35 Commits

Author SHA1 Message Date
Joseph Carter 8d017e3875 Removed a (resolved) conflict in this file that was commented out. 1999-12-31 06:51:43 +00:00
Nelson Rush 60be1a206d pandr reworked marcus's MME Digital UNIX sound support to fit with out changes.
just have to add snd_mme.c next
1999-12-31 05:53:52 +00:00
Eric Windisch 67b65279a3 Fixed up some of the "ugly fog code" and removed an obsolete comment 1999-12-31 04:44:04 +00:00
Zephaniah E. Hull f5c91c88af Compile fix on some stuff..
Mass movement of completely common files between qw_client and uquake.
1999-12-31 04:39:06 +00:00
Eric Windisch 18446beeca Ok. now it compiles svgalib and 3dfx.. at least on my system :) 1999-12-31 04:18:13 +00:00
Zephaniah E. Hull 1c68f5aa28 VERSION and HAVE_GL_COLOR_INDEX8_EXT fixes.. 1999-12-31 03:11:54 +00:00
Joseph Carter d9d937cd66 ./configure is actually included this time. If DJGPP has autoconf we
should remove that file and just have people regenerate it.  Also update
the Makefile.in's to put bins right in targets rather than subdirs under
targets.  Removed stale uquake/Makefile.extra.
1999-12-31 02:40:35 +00:00
Nelson Rush 57def3e264 Added Marcus's patch to align surfcache_t structs for 64-bit platforms. 1999-12-31 02:31:14 +00:00
Joseph Carter 69168b6695 pandr's autoconf cleanup. Now uses common/cd_wrapper.c to replace some of
the things autoconf was doing before but really shouldn't have been.
1999-12-31 02:10:33 +00:00
Nelson Rush 68058bef7c uquake/sys_sun.c has been moved to uquake/sys_unix.c which is the proper filename 1999-12-31 01:54:23 +00:00
Nelson Rush 20070cbe3a added mackan@stacken.kth.se 's patch 1999-12-31 00:55:13 +00:00
Nelson Rush 9b080c5e91 sys_sun.c renamed to sys_unix.c, Makefile should recognize it now. 1999-12-31 00:37:47 +00:00
Nelson Rush 426ed2e36d Added loring's 1999/12/30 menu.c patch for AIX - level_t -> quakelevel_t 1999-12-31 00:32:22 +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 27c3b62efc use AC_DEFINE() instead of the confdefs.h hack 1999-12-30 15:25:45 +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 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
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 66fb88d573 :%s/SourceForge/QuakeForge/g, a matter of life and death fix! ;> 1999-12-29 03:20:25 +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
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 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