Jeff Teunissen
202f794fbe
The merge continues...sys_null.c (Portability aid) is common.
2000-01-03 11:14:42 +00:00
Jeff Teunissen
518401c90c
Simplified COM_Block*Checksum (don't worry, it's still compatible -- I
...
tested it), merged r_alias.c (note the FIXME at the end of r_alias.c)
2000-01-03 10:41:24 +00:00
Joseph Carter
5761d2f334
Moved -lm to global LDFLAGS, everything but the GL renderer needs it ajd
...
on at least some platforms the GL renderer needs it too.
2000-01-03 10:25:01 +00:00
Joseph Carter
95dc2c6ebf
Heavy Makefile.in updates. Real install target, clean now removes bins,
...
and make is now a little smarter about knowing when to rerun ./configure
and ./bootstrap
2000-01-03 08:03:01 +00:00
Nelson Rush
a841b90d2d
SDLQuake merge with our tree made possible by Sam Lantinga and Maas van den Berg, currently the video and cdrom audio are supported.
2000-01-03 06:18:32 +00:00
Joseph Carter
768b167927
A couple of FreeBSD fixes from Darius
2000-01-03 05:06:19 +00:00
Zephaniah E. Hull
47e85cdd29
Version cleanup, not completely happy with it yet..
...
Removed the registered game checking, but added a little back for
backword compatibility..
2000-01-03 01:40:54 +00:00
Joseph Carter
590b4c1c58
crosshair 2 now works in UQ, as does crosshaircolor
2000-01-03 00:08:03 +00:00
Joseph Carter
8ee8699d16
Sound cleanups from Marcus: snd_linux.c -> snd_oss.c, the OSS API is used
...
on a lot more than just Linux. Updated Autoconf to check for OSS rather
than check for Linux and just assume OSS is there.
2000-01-02 16:18:22 +00:00
Joseph Carter
6d9ae5f2ef
Merged gl_draw.c! Yes, the version string is unscaled.
2000-01-02 15:53:47 +00:00
Joseph Carter
d7d4a3dcd6
Removed all traces of the useless gl_reporttjunctions cvar
2000-01-02 12:00:43 +00:00
Joseph Carter
ecac4a1474
Marcus' patch for the beginnings of mingw32 support in the tree
2000-01-02 11:32:21 +00:00
Joseph Carter
9ef97ca84c
Whoever put X11_CFLAGS = ... $(X_CFLAGS) in the Makefile.in's was smoking
...
something potent. Should be @X_CFLAGS@, fixed.
2000-01-02 11:23:41 +00:00
Joseph Carter
365a1c144f
draw.[ch] merge
2000-01-02 10:06:17 +00:00
Joseph Carter
247158c517
Marcus' GGI targets added, fear!
2000-01-02 08:50:13 +00:00
Eric Windisch
aaf2545ce2
Removed uquake/gl_rmisc.c and qw_client/gl_rmisc.c
2000-01-02 04:18:38 +00:00
Eric Windisch
88bd46b4b6
Been commiting quite a lot tonight; I forgot to register r_fog and r_waterwarp
...
for qw_client. r_volfog was forgotten for uquake and qw, whoops.
2000-01-02 03:40:10 +00:00
Eric Windisch
2bfc08ccde
Preliminary Volumetric fog :)
...
fixed problem where r_fog, r_waterwarp were not defined for quakeworld.
2000-01-02 03:12:59 +00:00
Joseph Carter
233d0af85f
Added autoheader support. Also added ./bootstrap to go from a freshly
...
checked out tree to something ./configure'able.
2000-01-01 20:45:27 +00:00
Joseph Carter
a48be19a46
LDFLAGS cleanups for -svga and -3dfx
2000-01-01 16:12:25 +00:00
Jeff Teunissen
ee7164d21b
Repaired UQuake gl_rmail.c mess, commented out gl_reporttjunctions refs,
...
since they are apparently unused by either QW or UQuake.
2000-01-01 15:03:44 +00:00
Jeff Teunissen
7d08fbe4fe
Replaced RSA MD4 source with GPLed mdfour.[ch] source, and net_com.c to
...
connect it all. Also modified Makefile.in for qw-(client|server) to use
them.
2000-01-01 11:18:00 +00:00
Joseph Carter
509647ba1d
Added .gitignore files. Added clean-autoconf target to Makefile.in and
...
made distclean remove *~ files
2000-01-01 08:10:02 +00:00
Zephaniah E. Hull
2d821cdda6
Applied patch from Bill Currie to merge gl_rmain.c
2000-01-01 06:26:03 +00:00
Zephaniah E. Hull
a1d7ee772b
More merging work..
2000-01-01 04:41:14 +00:00
Zephaniah E. Hull
555871f7e2
Some GL fixes in configure.in
...
Merged the uquake and qw_client gl_vidlinux.c into common/gl_vidlinux_3dfx.c
2000-01-01 04:21:44 +00:00
Jeff Teunissen
69c2c784f2
Deleted redundant bitmap -- we're not really QuakeWorld any more, are we?
2000-01-01 03:32:40 +00:00
Joseph Carter
84f1730855
The Autoconf Merge from Hell, part II! Rewrote much of the configure.in
...
rules, check out the help for ./configure to see what's changed. Added
the beginnings of autoconf DGA support (it is detected properly though it
isn't yet complete---HAS_DGA isn't getting defined in config.h for some
reason..)
1999-12-31 23:03:00 +00:00
Joseph Carter
94dae8608e
Moved config.h.in to common/, updated Makefile.in's so configure works
...
from any dir, and removed a couple of autoconf errors when extensions that
aren't required happen to be unavailable.
1999-12-31 06:54:05 +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
Zephaniah E. Hull
1def055dcb
Missed a few..
1999-12-31 04:41:57 +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
e468985ee1
Added common/config.h.in, moving the version and a few other variables
...
there, more will be added later as needed..
Added -Wall to the cflags on a few things, may have missed some stuff..
Changed the tests on HAVE_GL_COLOR_INDEX8_EXT to actually function..
(Fixes the GL texture problem..)
Added tests for GLAPIENTRY and APIENTRY, there will alweys be
something..
Fixed the check for the 3dfxgl lib..
Some makefile tweaking..
Changed VERSION into a string so it can easily be 0.1.0..
Removed the generated configure script, does not merge sanely..
1999-12-31 02:59:25 +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
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
7cfd830c1a
removed nested comments
1999-12-31 01:10:44 +00:00
Nelson Rush
c0bf994645
added loring's 1999/12/30 patch for glquake.h, hand edited because he missed some updates.
1999-12-31 00:11:20 +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
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
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
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
Joseph Carter
20df0b3bbc
clean rules are fixed. I promise this time.
1999-12-29 03:30:22 +00:00
Zephaniah E. Hull
2cc5bfe775
Fixing 'make clean'
1999-12-29 02:50:14 +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
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
Zephaniah E. Hull
20ebd99a48
s/APIENTRY/GLAPIENTRY/, and some tweaking with uquake..
1999-12-27 17:57:03 +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
Zephaniah E. Hull
6ba933cf80
Added the KP_* symbols, for the keys on the keypad..
1999-12-25 21:50:55 +00:00
Zephaniah E. Hull
570ede5076
Changed the root makefile so any rule will be passed along, not just 'all'.
...
Removed qw_client/gl_vidlinux_svga.c, nothing uses it and its almost a exact duplicate of gl_vidlinux.c.
Cleaned up ALL the compile time warnings..
1999-12-25 19:37:15 +00:00
Zephaniah E. Hull
cc89add2a4
Moved keys.h to qw_common.
...
Added rules to allow gl-client-glide to compile.
1999-12-25 18:03:05 +00:00
Jeff Teunissen
d3e1572760
Initial revision
1999-12-25 05:22:39 +00:00