Commit graph

82 commits

Author SHA1 Message Date
Zephaniah E. Hull
39e01df55e Makefile overhaul!
If I broke something, yell at me, /AFTER/ I've had some sleep..
2000-03-06 13:26:42 +00:00
Bill Currie
5e15698777 This is the fix I promised in my previous checkin. I hope it works, I have no
means of testing it at the moment.
2000-03-06 03:26:59 +00:00
Bill Currie
c917237c77 revert knghtbrd's `fix'. It was fine for systems with GL/*.h in either
/usr/include or /usr/local/include, but not when they are in /usr/X11R6/include.

I'll look into fixing this in a way that doesn't break any builds and hopefully
stops  redundant builds.
2000-03-06 03:22:48 +00:00
Joseph Carter
56fd8d964a new cvar: gl_conalpha, defaults to 0.6, guess what it does?
Speaking of conalpha, it works again, even in Mesa 3.1(!)
Don't build half of qw-client twice!  I thought I fixed that already?
UQuake-style quit dialogs in qw-client, beginnings of a menu.[ch] merge
2000-03-05 15:48:23 +00:00
Zephaniah E. Hull
41c969c2ac LoadPCX has been rewritten and now functions!! 2000-03-04 20:32:38 +00:00
Joseph Carter
75001e947c I think this works, but maybe not.. skins will be very broken if I didn't
but I'll undo this mess if that happens.
2000-03-04 16:43:53 +00:00
Bill Currie
54e2cafda8 --enambe-generations now builds (include unzip.c) 2000-03-04 03:06:46 +00:00
Dan Olson
5d66aa274c A couple small fixes thanks to Dan Nelson 2000-02-29 00:00:51 +00:00
Marcus Sundberg
10cc5228c5 Remove redundant shared stuff from Makefiles. 2000-02-19 13:53:08 +00:00
Zephaniah E. Hull
1e9f882fee Whoops, minor compile fixes.. 2000-02-19 08:44:02 +00:00
Zephaniah E. Hull
0fae0e01d3 Reverting away from modules in the main branch..
-3dfx, -x11, and -glx all work, at least for qw-client, no promices on uquake.
I can't test any other targets at the moment, so....
2000-02-19 08:24:15 +00:00
Loring Holden
6b9563b880 Until we use libtool, we need to specify in configure.in how to create and
use shared libraries (-rdynamic and -shared does not work everywhere)

We also have to use this information in */Makefile.in
2000-02-17 16:21:23 +00:00
Bill Currie
9ed247178f common/plugin.c:
add path searching. currently unix style only (ie ':') and defaults to
	".:${LIBDIR}/quakeforge".
*/Makefile.in:
	fix up the clean targets a little, so they actually work
2000-02-14 11:30:37 +00:00
Joseph Carter
f11f71d8a7 we now define LIBDIR when we build targets 2000-02-14 00:35:13 +00:00
Joseph Carter
1d7260195f Renamed vid_x.c -> vid_x11.c, also renamed *-gl to *-glx, it it'll cause
less confusion that way (even if I have to type an extra letter..)
2000-02-13 09:06:11 +00:00
Zephaniah E. Hull
3b1494b153 Fixed some little errors with the plugin code.. 2000-02-12 11:42:56 +00:00
Zephaniah E. Hull
0e8ba8d814 Sledge hammer applied..
The input stuff is now somewhat modular, I'll get everything working
soon enough, right now things are hardwired to svgalib, but its ok..
2000-02-12 05:34:22 +00:00
Bill Currie
e3d564905d put REQUIRED worlda.s back in. it will not cause probelms for non-x86 archs as
generates an empty .o file if id386 is 0 or undefined
2000-02-11 11:07:04 +00:00
Loring Holden
0442e797e4 Remove redundant worlda.s that caused problems on non-x86 systems 2000-02-11 06:50:15 +00:00
Bill Currie
ce9580f237 sufflin' shufflin' shuflin'.. raaw-source
qw-client now links, but qw-server won't compile (yet)
2000-02-11 04:21:10 +00:00
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
fa875465d7 add host.c 2000-02-10 05:29:45 +00:00
Pontus Lidman
d608249a38 Added --enable-ipv6 option to configure to enable IPv6 networking.
It substitutes @NET_SOURCE@ for net_udp.c or net_udp6.c.
2000-02-08 21:23:06 +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
3357d40344 Explicitly list patterns instead of using the following:
$(shell echo $(BUILD_DIR)/{client,common_lib}/%.d)

That does not work properly on various platforms (AIX, SGI, Solaris)
2000-01-29 23:18:26 +00:00
Jeff Teunissen
ad90a0508d Added part of what we'll require for automatically generating dependency
information. This is not activated yet, and will be quite annoying at the
very least to activate before we are in a more traditional build tree,
with a single source directory and self-contained (except for headers, of
course) subdirs for modules.
2000-01-29 15:02:45 +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
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
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
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
a3c55dc1cf Added dga_check.c to qw-client-gl 2000-01-15 03:33:10 +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
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
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
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
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