Jeff Teunissen
e489bb2b00
Makefile.in cleanups. Software targets are once again built before GL
...
targets. A few .o's changed to .@OBJEXT@, although most Unix-based systems
won't care about that. :)
2000-01-29 10:08:02 +00:00
Bill Currie
6f213c8342
common/quakefs.c:
...
make pak3 support dependent on /both/ _EXPERIMENTAL_ and GENERATIONS
qw_client/Makefile.in:
move gl files into cleint/gl so thay can have their own build rules
conditionally added -lasound to LIBS if building for ALSA
2000-01-29 02:31:47 +00:00
Joseph Carter
25f297ded2
A little more work trying to get the tree back to normal..
2000-01-28 03:19:57 +00:00
Jeff Teunissen
6ccfe788c9
Removed unnecessary #include "glquake.h"
2000-01-27 19:05:44 +00:00
Zephaniah E. Hull
75731706a0
Whoops, included glquake.h instead of cvars.h..
2000-01-27 17:28:49 +00:00
Zephaniah E. Hull
f18b3bcf02
HUGE changes..
...
Basicly, sound_lib.a is built, and is compiled into the clients..
Note, uquake is SERIOUSLY FSCKED..
2000-01-27 17:06:02 +00:00
Loring Holden
88344ef21a
glquake.h now included from only the files that use OpenGL, and not from
...
common_quakedef.h (and thus all files)
This solves a build break when the OpenGL includes are not in /usr/include,
since the OpenGL include path is only used when compiling files that use
OpenGL.
2000-01-26 19:00:36 +00:00
Jeff Teunissen
9be70be1b0
Preliminary (probably nonfunctional) support for QW's HUD in UQ. Beware!
2000-01-22 22:21:46 +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
Jeff Teunissen
35169e2b94
Merged r_main.c -- it wasn't the chore it looked like it was going to be.
...
It's still #ifdef'ed all over the place, but there are max. 100 lines that
aren't common.
2000-01-22 10:51:27 +00:00
Marcus Sundberg
c156232c95
Link the *-gl binaries with @DYN_LIBS@.
2000-01-19 01:24:41 +00:00
Marcus Sundberg
7f6a114dd9
Removed bogus checks on unused variable.
2000-01-18 22:41:06 +00:00
Zephaniah E. Hull
0391657e6b
We now have two versions, what we first identify ourselves as, which is
...
2.40, and the quakeforge version, fixes the annoying spectator bug..
2000-01-16 12:19:30 +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
a3c55dc1cf
Added dga_check.c to qw-client-gl
2000-01-15 03:33:10 +00:00
Marcus Sundberg
8f29fd21f1
Incorporated the VID_ExtraOption* stuff from uquake/menu.c
2000-01-15 03:31:37 +00:00
Marcus Sundberg
a43852a7d7
Ops, should be tab instead of spaces...
2000-01-12 21:36:45 +00:00
Marcus Sundberg
95c0a50665
Added the not-so-useless ifneqs back - they prevents warnings from make
2000-01-12 21:18:44 +00:00
Marcus Sundberg
3866cc3771
Removed useless ifndefs.
...
Added rule for gl/dga_check.@OBJEXT@
2000-01-11 01:17:16 +00:00
Nelson Rush
7560771b16
beginnings of IPv6 support by Pontus Lidman
...
(pali) i had to personally fix this so that it's optional, if anyone wants to enable this (it's not ready yet, it's just a star) you have to uncomment the line\
for QW_NET_SRC in qw_client/Makefile.in and qw_server/Makefile.in, you also have to uncomment LINUX_IPV6 definition in qw_common/net.h
here's an excerpt of Pontus's explaination:
I've started to work on IPv6 support. I guess it's not a top priority, as
the intersections of quake players and people with 6bone access is pretty
small, but at least I'm one of them ;)
If anyone else is interested in working on IPv6 support, or have
opinions/advice on how to go about it, I'd like to get in touch.
2000-01-09 22:11:12 +00:00
Loring Holden
131086c25c
{uquake,qw_client}/glquake.h combined and moved to common
2000-01-09 19:42:33 +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
Marcus Sundberg
a0c6d434ec
Removed includes
2000-01-09 02:28:12 +00:00
Marcus Sundberg
9bc4ef12af
Call VID_Init() before IN_Init().
...
Removed ifdef __linux__
2000-01-09 02:14:48 +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
Nelson Rush
aa00566766
added additional copyright information
...
Copyright (C) 1999,2000 contributors of the QuakeForge project
Please see the file "AUTHORS" for a list of contributors
2000-01-08 22:02:43 +00:00
Marcus Sundberg
219acb9ce1
Fixed install target
2000-01-08 21:35:03 +00:00
Marcus Sundberg
754215066b
Fix warnings.
2000-01-08 17:37:36 +00:00
Marcus Sundberg
f2d4e5f06a
#pragmas are for som Windows compiler. Until we know what compiler we #ifdef them out like this.
2000-01-08 17:37:08 +00:00
Zephaniah E. Hull
67f8201590
Applied patch from Roger Sen Montero <rogersm@tau.uab.es> to switch to
...
using vsnprintf/snprintf..
2000-01-08 13:55:33 +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
Jeff Teunissen
092d32cd23
Fixed gl_doubleeyes and made it common, whitesize cleanup to gl_warp.c
2000-01-08 07:42:14 +00:00
Marcus Sundberg
775a02fbce
Fixed a nasty bug that only showed up on 64-bit platforms (or platforms where sizeof(float) != sizof(float*) to be precise)
2000-01-08 07:14:08 +00:00
Marcus Sundberg
dada532112
Removed pointless #ifdef __alpha__
...
Fixed alignment of size in D_SCAlloc() for 64-bit platforms.
2000-01-08 05:57:44 +00:00
Marcus Sundberg
0a9edb73c5
Removed pointless #ifdef __alpha__
2000-01-08 05:55:20 +00:00
Marcus Sundberg
64e8e448e1
Convert map checksums to little endian format - now QW client works on big endian machines.
2000-01-08 05:47:55 +00:00
Nelson Rush
dfbfbb6711
readded a copyright notice that somehow got removed
...
added "Portions" statement to the copyright statement
Please note, if you want to put a copyright notice on a source file stating that a portion of it is copyright yourself or another author please put "Portions Copyright...", if adding a seperate .c file that contains otherwise author(s) this doesn't apply.
2000-01-08 04:50:26 +00:00
Marcus Sundberg
19fd8a6816
A '&' before an array variable is at best ignored, at worst it could do
...
weird stuff.
2000-01-07 21:31:20 +00:00
Nelson Rush
2151636145
added copyrights for buffer overrun fixes
2000-01-07 05:47:53 +00:00
Zephaniah E. Hull
acc475fa16
Typo fix, and adding a chunk in authors which apparently got lost..
2000-01-06 21:59:55 +00:00
Marcus Sundberg
983243b577
Moved Sys_mkdir() and Sys_DoubleTime() into common/sys_common.c
2000-01-06 18:36:14 +00:00
Marcus Sundberg
859cdee6a5
Define INADDR_LOOPBACK in a clean way.
2000-01-06 17:49:39 +00:00
Marcus Sundberg
3dc80e29b7
Moved Sys_FileTime() into common/sys_common.c
2000-01-06 17:46:47 +00:00
Nelson Rush
b794e155b0
applied tim's patch
...
The following patch allows Quakeforge to be compiled with the
native compilers on Solaris, Irix, and AIX.
2000-01-06 17:29:23 +00:00
Marcus Sundberg
6e9074153f
Moved Sys_Printf into common/sys_common.c
2000-01-06 16:56:38 +00:00
Marcus Sundberg
99291808d9
This was identical to common/sys_dosa.s
2000-01-06 16:26:36 +00:00
Nelson Rush
6e69591b3f
added loring's patch to fix non-linux platform problems
...
Solaris stuff:
* vid_sunx.c - Added missing S_Init() so sounds works
* vid_sunx.c - Don't XCloseDisplay() if x_disp is 0
* vid_sunx.c - ClientMessage references only apropos for QuakeWorld
Non-linux stuff:
* qw_client/Makefile.in - use QW_CL_SYS_SRC instead of SYS_SRC
2000-01-06 04:33:34 +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
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
e3c4261ea5
Moved old_headers/qwcl/resource.h to qw_client/resource.h
2000-01-05 01:48: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
4d03867938
Fix includes.
...
filelength() is unused and breaks compile on mingw32.
2000-01-04 23:34:36 +00:00
Marcus Sundberg
b8d1dd372a
Added @NET_LIBS@ to LDFLAGS.
2000-01-04 22:59:57 +00:00
Marcus Sundberg
8b4503ff05
Made building outside the source dir possible again.
2000-01-04 21:26:22 +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
19b2728495
Applied prototype fix to vid_svgalib.c and removed unused variable from qw_client/cl_main.c
2000-01-04 05:52:00 +00:00
Joseph Carter
740177b2c0
Another merge from BigM
2000-01-04 03:34:56 +00:00
Joseph Carter
244297cedc
Added cvs2cl.pl to tools, added a changelog target to the makefile, and
...
removed the ChangeLog.
2000-01-04 03:26:19 +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
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
c61b284f58
Missed an adivtab.h, pardon my fuckup.
2000-01-03 22:21:42 +00:00
Jeff Teunissen
a6a29bdb63
Moved skin.c to common/ -- it doesn't conflict with UQ, so it might as
...
well be moved now.
2000-01-03 16:53:06 +00:00
Jeff Teunissen
c8339f5d3a
Moved buildnum.c to common/ -- we don't use it any more, but we could.
...
Also changed it so that the starting build number would be 21 Dec 1999,
the date of the Q1 source release. Today would be build number 13. :)
2000-01-03 16:49:28 +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
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