Marcus Sundberg
6e9074153f
Moved Sys_Printf into common/sys_common.c
2000-01-06 16:56:38 +00:00
Marcus Sundberg
f816a6dbc1
This was identical to common/sys_dosa.s
2000-01-06 16:33:09 +00:00
Marcus Sundberg
58a561b806
Made MGL target compile again.
2000-01-06 03:13:04 +00:00
Marcus Sundberg
b28fa0a244
Add #ifndef so file is only included once.
2000-01-06 02:29:09 +00:00
Marcus Sundberg
a6460e7bdd
Removed the bogus -DELF statements.
2000-01-06 01:06:17 +00:00
Marcus Sundberg
b86ca17101
Fixed bunch of unused variables.
2000-01-06 00:29:41 +00:00
Marcus Sundberg
9e5e83cc73
Added $(LIBS) to linker command lines.
2000-01-05 22:12:51 +00:00
Marcus Sundberg
04c438c55e
Check return code from mmap() properly.
2000-01-05 21:22:48 +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
Zephaniah E. Hull
dbbeff44fc
We now have fullbright textures for GL!
...
This is going in as a bug fix after talking it over with Knghtbrd and Deek..
2000-01-05 15:23:12 +00:00
Joseph Carter
c90b93d0b7
Cleaned the clean targets a bit
2000-01-05 12:09:29 +00:00
Marcus Sundberg
b2bd0774e0
Moved resource.h and conproc.h from uquake/do_not_include to uquake.
2000-01-05 01:41:36 +00:00
Marcus Sundberg
65094e2a35
_windowed_mouse needs to be declared.
2000-01-05 01:26:09 +00:00
Marcus Sundberg
048b8393f3
Reportedly the #undef sa_family is really needed on SGIs.
2000-01-05 01:14:30 +00:00
Nelson Rush
705c1d0e3b
fixed some problems
2000-01-05 00:11:02 +00:00
Nelson Rush
a77bb35db6
Fixed buffer overflow problems, changed sprintf to snprintf don't use this yet, i have a few things that need to be fixed.
2000-01-05 00:05:48 +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
26c0d830b2
Fix includes.
...
filelength() is unused and breaks compile on mingw32.
Copied Sys_FileOpenRead() and Sys_DoubleTime() from qw_client/sys_win.c
2000-01-04 23:36:31 +00:00
Marcus Sundberg
54f4335a8a
Autoconf network headers.
2000-01-04 23:06:13 +00:00
Marcus Sundberg
0a99e0d5fe
Include ctype.h for is*() functions.
...
Removed unused variables from InitConProc().
2000-01-04 23:02:02 +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
Nelson Rush
5f20ff0bd7
added loring's multi-platform, non-mesa OpenGL patch.
2000-01-04 05:33:00 +00:00
Joseph Carter
740177b2c0
Another merge from BigM
2000-01-04 03:34:56 +00:00
Zephaniah E. Hull
6006adda7c
Backported and merged the qw_client/keys.c to uquake.
...
Added support for the KP_* keysyms..
2000-01-04 01:53:31 +00:00
Joseph Carter
3e71009f2a
uquake/crc.c is common
2000-01-04 01:05:52 +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
fbc21a8c5e
* Merged d_polyse.c from qw_client, _unchanged_ -- current data suggest it
...
works properly with UQ.
* Repaired my FIXME in r_alias.c (caused UQ's software targets to segfault)
2000-01-03 23:27:17 +00:00
Joseph Carter
55a4e4e01c
Fixed register_check(), renamed a couple of non-headers to the "standard"
...
naming of .-c, also the very beginnings of the eventual source reformat.
2000-01-03 21:54: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
Jeff Teunissen
978ccb3cc8
Merged nonintel.c into common/
2000-01-03 13:45:02 +00:00
Jeff Teunissen
71b8dc4cad
Merged r_bsp.c into common/
2000-01-03 13:35:09 +00:00
Jeff Teunissen
a671482dd5
sys_linux.c merged and moved into common/
2000-01-03 12:12:13 +00:00
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
Joseph Carter
68785812de
More BSD fixes from Darius
2000-01-03 08:00:46 +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
d0674e837c
pandr's pr_* merge..
2000-01-03 04:45:54 +00:00
Joseph Carter
d5217418ec
QW's crosshair 2 and crosshaircolor now work in UQ. Also because I felt
...
like adding a gratuitious feature, GL target users can crosshair 3 for a
completely new crosshair and higher resolution crosshair (oooh!) Software
renderer doesn't have it because...well look at Draw_Crosshair() in
draw.c, it's truly a nightmare! You have to plot each pixel individually,
makes you feel like you're coding in Applesoft BASIC. If you want it,
figure out how to do it sanely.
2000-01-03 04:33:43 +00:00
Joseph Carter
cfa702ec38
pr_comp.h's identical, moved to common
2000-01-03 02:24:26 +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
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
Joseph Carter
b75354555d
chase_active in uquake is now cl_chasecam like in qw-client
2000-01-02 05:46:52 +00:00
Joseph Carter
4a291f544e
fixed VERSION not getting defined/used properly hopefully once and for all
2000-01-02 05:34:27 +00:00
Joseph Carter
c7f95dda2d
Removed _all_ references to the define IDGODS. It was turned off anyway,
...
but still a glaring security hole waiting for someone to abuse.
2000-01-02 05:00:54 +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
797b93f871
Taniwha pointed out that qw didn't compile, i put cvar_t r_waterwarp in a non-common file. I moved it to r_glmain.c, everything _SHOULD_ work now (I hope!).
2000-01-02 04:04:17 +00:00
Eric Windisch
88058a06c6
I thank Mao for pointing out to me the bootscrap script (which runs autoheader and autoconf). I removed the #version from quakedef.h and changed the version to "0.1.0-pre" within acconfig.h
2000-01-02 03:56:55 +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
e7b423b68c
Someone deleted #define VERSION, readded it.. uquake now compiles again.
...
Version reports as 0.1.0, the next planed unstable release.
2000-01-02 03:26:36 +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
0cc234c445
Removed two Windows header files that we are not allowed to distribute.
2000-01-01 11:22:20 +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
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
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