Bill Currie
3585aab0eb
merges:
...
qw_server/world.[ch] and uquake/world.[ch] into common/world.[ch]
uquake/chasecam.c into common/cl_cam.c
move physics type defines from server.h to phys.h
2000-02-10 23:38:19 +00:00
Bill Currie
7d7d5faa18
add cl_cam.c to eliminate another undefined sybol. Now all that's left is
...
prediction stuff.
2000-02-10 14:02:36 +00:00
Bill Currie
fabe501768
the merge continues. qw_common/common.c and uquake/common.c have /finally/ been
...
merged with the command line args merged into common/qargs.c. Args rebuilding
in qargs.c should now be totally safe with no limits.
2000-02-10 13:49:39 +00:00
Joseph Carter
dee1dd73ca
-DGLQUAKE in UQ gone---who left that in there? (Probably me...)
2000-02-10 05:43:45 +00:00
Bill Currie
21416b0b94
qw_common/pmove.h:
...
add #include "net.h"
uquake/Makefile.in:
put cl_ents.c back it. might as well make a commitment :)
merge qw_common/protocol.h and uquake/protocol.h into common/protocol.h
2000-02-08 22:25:15 +00:00
Bill Currie
7d5b301d80
common/quakeio.c:
...
support gzipped files
common/quakefs.c:
qw_client/cl_parse.c:
qw_server/sv_ccmds.c:
uquake/host_cmd.c:
uquake/menu.c:
use "z" in mode flags when reading files
uquake/Makefile.in:
take cl_ents.c out again (too much work atm to get it to compile)
2000-02-08 20:59:36 +00:00
Bill Currie
1983cf894b
move cl_ents.c from qw_clent to common
...
uquake/Makefile.in:
add cl_ents.c (doesn't work yet)
qw_client/gl_vidlinux_x11.c:
not used, waste of bandwidth
2000-02-08 07:44:02 +00:00
Bill Currie
edbb589045
merge qw_client/cl_main.c and uquake/cl_main.c into common/cl_main.c
...
For the rest, convert all refs to FILE and gzFile to QFile, and similar for
file functions (eg fprintf, fgets, fread, etc)
2000-02-08 05:06:58 +00:00
Bill Currie
083021da12
no-asm patch from Darius
2000-02-03 02:34:26 +00:00
Bill Currie
0d679d1648
qw_client/Makefile.in:
...
put the gl specific rules back in (some of us have GL in
/usr/X11R6/include rather than /usr/local/include or /usr/include,
nudge, nudge).
2000-01-30 09:36:45 +00:00
Joseph Carter
4f9ce178c1
Merc missed a few things, cleaned the makefiles up a little more
2000-01-30 00:36:41 +00:00
Loring Holden
ff664f9b75
Makefile.in - conditionally run ranlib
...
sys_unix.c - copied Sys_DebugLog() from sys_linux.c
2000-01-29 23:24:16 +00:00
Zephaniah E. Hull
925344be77
uquake now works! All targets I can test!
...
I also merged console.[ch] while I was at it..
2000-01-29 18:46:26 +00:00
Bill Currie
5e4575222d
do alsa (sound in general) lib support the Right Way (tm)
...
missed 3dfx for gl
2000-01-29 10:59:02 +00:00
Zephaniah E. Hull
63978c73c6
uquake compile updates..
2000-01-28 01:03:09 +00:00
Zephaniah E. Hull
427b74299d
No more -DGLQUAKE!!!
...
Took me 9+ hours straight to do it, but its done!
2000-01-22 12:54:51 +00:00
Marcus Sundberg
c156232c95
Link the *-gl binaries with @DYN_LIBS@.
2000-01-19 01:24:41 +00:00
Marcus Sundberg
0206281103
Changed gl_vidlinuxglx.c to gl_vidglx.c as it really doesn't have anything
...
with Linux to do.
2000-01-15 04:14:04 +00:00
Marcus Sundberg
9a1b2d7607
Added dga_check.c to quake-gl
2000-01-15 03:33:27 +00:00
Jeff Teunissen
5f62210608
Added @DGA_LIBS@ to OpenGL target builds
2000-01-09 07:15:41 +00:00
Marcus Sundberg
b6bb5c9190
Added in_svgalib.c to svga and 3dfx targets.
2000-01-09 02:45:58 +00:00
Joseph Carter
8f503d8209
Reverted Neal's GL fullbright patch till we can actually fix it properly
...
after the release
2000-01-08 22:28:07 +00:00
Marcus Sundberg
219acb9ce1
Fixed install target
2000-01-08 21:35:03 +00:00
Bill Currie
ef18af2a9b
common/sound.h:
...
added extern for soundtime. Don't really know wy it wasn't there in the
first place.
qw_client/Makefile.in uquake/Makefile.in:
make the alsa objects say the right thing: snd_dma.c and snd_alsa.c
common/snd_alsa.c:
New file. makes things go.
2000-01-08 12:14:07 +00:00
Marcus Sundberg
ab7585ffa2
Added DOS VGA stuff.
...
Added DOS and Windows network support.
2000-01-07 01:20:15 +00:00
Marcus Sundberg
6e9074153f
Moved Sys_Printf into common/sys_common.c
2000-01-06 16:56:38 +00:00
Marcus Sundberg
58a561b806
Made MGL target compile again.
2000-01-06 03:13:04 +00:00
Marcus Sundberg
a6460e7bdd
Removed the bogus -DELF statements.
2000-01-06 01:06:17 +00:00
Marcus Sundberg
9e5e83cc73
Added $(LIBS) to linker command lines.
2000-01-05 22:12:51 +00:00
Joseph Carter
4ebf133971
Merged the makefile targets as much as is safe to do without a serious
...
code alteration. Cut my build time from 20 minutes down to about 5 from
an autoconf-clean tree.
2000-01-05 19:10:52 +00:00
Zephaniah E. Hull
b68f84619e
Fixes for portability issues..
2000-01-05 16:55:01 +00:00
Joseph Carter
c90b93d0b7
Cleaned the clean targets a bit
2000-01-05 12:09:29 +00:00
Marcus Sundberg
c5de0f10c5
Added MGL target (relax Palisade - it's only compiled on win32 ;)
...
Moved d_copy.s from SWREND_SRC_PLAT to SVGA_VID_SRC as the functions in
there are only used in vid_svgalib.c and vid_vga.c
2000-01-04 23:38:36 +00:00
Marcus Sundberg
b8d1dd372a
Added @NET_LIBS@ to LDFLAGS.
2000-01-04 22:59:57 +00:00
Marcus Sundberg
d576b7c9d1
Made building outside the sourcedir work again.
...
Made top of Makefile look like qw_client/Makefile.in
2000-01-04 21:29:10 +00:00
Joseph Carter
6c74e92dd2
No longer do the makefiles stat the obj dir for every compile! While I
...
experienced almost no visible benefit in terms of compile time, others
with older machines will and the makefiles are generally cleaner now.
2000-01-04 12:02:27 +00:00
Joseph Carter
0b8df448c2
Major configure.in update, applied BigM's gl_rsurf.c merge patch
2000-01-04 01:03:18 +00:00
Jeff Teunissen
6337f34ba1
* Fixed an X11 software renderer crash in vid_x.c, thanks Justin A. McCright
...
* Renamed chase_* to cl_chasecam_* in UQ to match their parent cvar.
* Changed cl_chasecam* in UQ to be saved in config.cfg
* Moved dosasm.s to common, though it doesn't seem to be referenced at _all_
2000-01-03 21:20:01 +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
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
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
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
247158c517
Marcus' GGI targets added, fear!
2000-01-02 08:50:13 +00:00
Joseph Carter
a48be19a46
LDFLAGS cleanups for -svga and -3dfx
2000-01-01 16:12:25 +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
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